feat: Allow most recent filter logic to be applied for TemporalOrdina…

…lDimension
visualize-admin · Jan 19, 2024 · 7669754 · 7669754
1 parent 18125d3
commit 7669754
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 5 deletions.
diff --git a/app/configurator/components/field.tsx b/app/configurator/components/field.tsx
@@ -80,6 +80,7 @@ import {
   HierarchyValue,
   ObservationValue,
   TemporalDimension,
+  isTemporalOrdinalDimension,
 } from "@/domain/data";
 import { useTimeFormatLocale } from "@/formatters";
 import { TimeUnit } from "@/graphql/query-hooks";
@@ -240,11 +241,56 @@ export const DataFilterSelect = ({
     );
   }
 
+  const canUseMostRecentValue = isTemporalOrdinalDimension(dimension);
+  const usesMostRecentValue = isDynamicMaxValue(fieldProps.value);
+  const maxValue = sortedValues[sortedValues.length - 1].value;
+
   return (
     <Select
       id={id}
-      label={<FieldLabel label={label} isOptional={isOptional} />}
-      disabled={disabled}
+      label={
+        canUseMostRecentValue ? (
+          <Flex
+            sx={{
+              width: "100%",
+              justifyContent: "space-between",
+              alignItems: "center",
+            }}
+          >
+            <FieldLabel label={label} isOptional={isOptional} />
+            <FormGroup>
+              <FormControlLabel
+                control={
+                  <MUISwitch
+                    size="small"
+                    checked={usesMostRecentValue}
+                    onChange={() =>
+                      fieldProps.onChange({
+                        target: {
+                          value: usesMostRecentValue
+                            ? `${maxValue}`
+                            : VISUALIZE_MAX_VALUE,
+                        },
+                      })
+                    }
+                  />
+                }
+                label={
+                  <Typography variant="caption">
+                    <Trans id="controls.filter.use-most-recent">
+                      Use most recent
+                    </Trans>
+                  </Typography>
+                }
+                sx={{ mr: 0 }}
+              />
+            </FormGroup>
+          </Flex>
+        ) : (
+          <FieldLabel label={label} isOptional={isOptional} />
+        )
+      }
+      disabled={disabled || usesMostRecentValue}
       options={allValues}
       sortOptions={false}
       controls={controls}
@@ -253,6 +299,7 @@ export const DataFilterSelect = ({
       onOpen={handleOpen}
       loading={loading}
       {...fieldProps}
+      value={usesMostRecentValue ? maxValue : fieldProps.value}
     />
   );
 };
@@ -349,7 +396,6 @@ export const DataFilterTemporal = (props: DataFilterTemporalProps) => {
               </OpenMetadataPanelWrapper>
             }
           />
-          {/* FIXME: adapt to design */}
           <FormGroup>
             <FormControlLabel
               control={

diff --git a/app/rdf/query-dimension-values.ts b/app/rdf/query-dimension-values.ts
@@ -1,3 +1,4 @@
+import RDF from "@rdfjs/data-model";
 import { SELECT, sparql } from "@tpluscode/sparql-builder";
 import keyBy from "lodash/keyBy";
 import mapValues from "lodash/mapValues";
@@ -183,12 +184,22 @@ export async function loadMaxDimensionValue(
     ? getFiltersList(filters, dimensionIri?.value)
     : [];
 
-  const query = SELECT`(MAX(?value) as ?value)`.WHERE`
+  // The following query works both for numeric, date and ordinal dimensions
+  const query = SELECT`?value`.WHERE`
     ${datasetIri} ${cubeNs.observationSet} ?observationSet .
     ?observationSet ${cubeNs.observation} ?observation .
     ?observation ${dimensionIri} ?value .
+    OPTIONAL {
+      ?value <https://www.w3.org/TR/owl-time/hasEnd> ?hasEnd .
+      ?value ${ns.schema.position} ?position .
+    }
     ${getQueryFilters(filterList, cube, dimensionIri?.value)}
-  `.prologue`${pragmas}`;
+  `
+    .ORDER()
+    .BY(RDF.variable("hasEnd"), true)
+    .THEN.BY(RDF.variable("value"), true)
+    .THEN.BY(RDF.variable("position"), true)
+    .LIMIT(1).prologue`${pragmas}`;
 
   let result: Array<DimensionValue> = [];