fix: Preferentially choose x dimension as non region for column

visualize-admin · Sep 27, 2022 · 0566a9e · 0566a9e
1 parent d338c3f
commit 0566a9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/charts/index.ts b/app/charts/index.ts
@@ -2,6 +2,7 @@ import { ascending, group } from "d3";
 import produce from "immer";
 import get from "lodash/get";
 import groupBy from "lodash/groupBy";
+import sortBy from "lodash/sortBy";
 
 import { DEFAULT_SYMBOL_LAYER_COLORS } from "@/charts/map/constants";
 import {
@@ -34,6 +35,8 @@ import {
   getCategoricalDimensions,
   getGeoDimensions,
   getTimeDimensions,
+  isGeoCoordinatesDimension,
+  isGeoShapesDimension,
 } from "../domain/data";
 import { DimensionMetadataFragment } from "../graphql/query-hooks";
 import { DataCubeMetadata } from "../graphql/types";
@@ -166,7 +169,9 @@ export const getInitialConfig = ({
         fields: {
           x: {
             componentIri: findPreferredDimension(
-              dimensions,
+              sortBy(dimensions, (x) =>
+                isGeoCoordinatesDimension(x) || isGeoShapesDimension(x) ? 1 : -1
+              ),
               "TemporalDimension"
             ).iri,
             sorting: DEFAULT_SORTING,

diff --git a/cypress/integration/filters.spec.ts b/cypress/integration/filters.spec.ts
@@ -19,8 +19,7 @@ describe("Filters", () => {
       cy.findByText("1. production region");
       cy.findByText("2. stand structure");
       cy.findByText("3. evaluation type");
-      cy.findByText("4. Inventory");
-      cy.findByText("5. unit of evaluation");
+      cy.findByText("4. unit of evaluation");
     });
 
     selectors.edition