Merge branch 'main' of github.com:visualize-admin/visualization-tool

CHANGELOG.md

@@ -9,7 +9,9 @@ You can also check the [release page](https://github.com/visualize-admin/visuali
 
 ## Unreleased
 
-Nothing yet.
+Fixes
+
+- Sorting now works correctly for temporal dimensions
 
 # [3.19.20] - 2023-06-08
 

app/utils/sorting-values.spec.ts

@@ -104,6 +104,24 @@ const hierarchicalDimension = {
   ],
 } as unknown as DimensionMetadataWithHierarchiesFragment;
 
+const temporalDimensionYear = {
+  __typename: "TemporalDimension",
+  values: [
+    { value: "2020", label: "2020" },
+    { value: "1996", label: "1996" },
+    { value: "2019", label: "2019" },
+  ],
+} as unknown as DimensionMetadataFragment;
+
+const temporalDimensionFullDate = {
+  __typename: "TemporalDimension",
+  values: [
+    { value: "2020-01-01", label: "2020-01-01" },
+    { value: "1996-05-05", label: "1996-05-05" },
+    { value: "2019-12-12", label: "2019-12-12" },
+  ],
+} as unknown as DimensionMetadataFragment;
+
 describe("makeDimensionValueSorters", () => {
   const sorting: NonNullable<SortingField["sorting"]> = {
     sortingType: "byAuto",
@@ -142,4 +160,30 @@ describe("makeDimensionValueSorters", () => {
       "CH-BE",
     ]);
   });
+
+  it("should correctly sort temporal dimensions (year) byAuto", () => {
+    const values = temporalDimensionYear.values.map((d) => d.value);
+    const sorters = makeDimensionValueSorters(temporalDimensionYear, {
+      sorting,
+    });
+    const sortingOrders = getSortingOrders(sorters, sorting);
+    expect(orderBy(values, sorters, sortingOrders)).toEqual([
+      "1996",
+      "2019",
+      "2020",
+    ]);
+  });
+
+  it("should correctly sort temporal dimensions (full date) byAuto", () => {
+    const values = temporalDimensionFullDate.values.map((d) => d.value);
+    const sorters = makeDimensionValueSorters(temporalDimensionFullDate, {
+      sorting,
+    });
+    const sortingOrders = getSortingOrders(sorters, sorting);
+    expect(orderBy(values, sorters, sortingOrders)).toEqual([
+      "1996-05-05",
+      "2019-12-12",
+      "2020-01-01",
+    ]);
+  });
 });

app/utils/sorting-values.ts

@@ -1,5 +1,9 @@
 import { FilterValue, SortingField } from "@/configurator";
-import { DimensionValue } from "@/domain/data";
+import {
+  DimensionValue,
+  isNumericalMeasure,
+  isTemporalDimension,
+} from "@/domain/data";
 import { DimensionMetadataWithHierarchiesFragment } from "@/graphql/query-hooks";
 
 import { bfs } from "./bfs";
@@ -41,8 +45,13 @@ export const makeDimensionValueSorters = (
     dimensionFilter: undefined,
   }
 ): ((label: string) => string | undefined | number)[] => {
-  if (dimension?.__typename === "NumericalMeasure") {
-    return [(d) => +d];
+  if (isNumericalMeasure(dimension) || isTemporalDimension(dimension)) {
+    return [
+      (d) => {
+        const maybeNumber = +d;
+        return isNaN(maybeNumber) ? d : maybeNumber;
+      },
+    ];
   }
 
   const {