Merge pull request #832 from visualize-admin/fix/unique-values-hierar…

…chies

app/configurator/components/use-hierarchy-parents.spec.ts

@@ -0,0 +1,22 @@
+import hierarchy from "../../test/__fixtures/data/tarrifs-hierarchy.json";
+
+import { groupByParents } from "./use-hierarchy-parents";
+
+describe("grouping hierarchy by parents", () => {
+  it("should work", () => {
+    const archy = hierarchy as Parameters<typeof groupByParents>[0];
+    const groups = groupByParents(archy);
+    const iri =
+      "https://ld.admin.ch/cube/dimension/aussenhandel_warenkoerbe/1_listZT";
+    const ztGroups = groups.filter(
+      ([parents]) =>
+        parents.length > 0 && parents[parents.length - 1].value === iri
+    )!;
+
+    expect(ztGroups.length).toBe(1);
+    const ztGroup = ztGroups[0]!;
+    const [parents, children] = ztGroup;
+    expect(parents.length).toBe(2);
+    expect(children.length).toBe(41);
+  });
+});

app/configurator/components/use-hierarchy-parents.tsx

@@ -1,12 +1,33 @@
 import { groups } from "d3-array";
-import uniqBy from "lodash/uniqBy";
 import { useMemo } from "react";
 
 import { DataSource } from "@/configurator/config-types";
-import { useDimensionHierarchyQuery } from "@/graphql/query-hooks";
+import {
+  DimensionHierarchyQuery,
+  useDimensionHierarchyQuery,
+} from "@/graphql/query-hooks";
 import { DataCubeMetadata } from "@/graphql/types";
 import { dfs } from "@/utils/dfs";
 
+type NN<T> = NonNullable<T>;
+export type DimensionHierarchyQueryHierarchy = NN<
+  NN<
+    NN<DimensionHierarchyQuery["dataCubeByIri"]>["dimensionByIri"]
+  >["hierarchy"]
+>;
+
+export const groupByParents = (hierarchy: DimensionHierarchyQueryHierarchy) => {
+  const allHierarchyValues = [
+    ...dfs(hierarchy, (node, { depth, parents }) => ({
+      node,
+      parents,
+      depth,
+    })),
+  ];
+
+  return groups(allHierarchyValues, (v) => v.parents);
+};
+
 const useHierarchyParents = (
   dataSet: string,
   dataSource: DataSource,
@@ -30,22 +51,40 @@ const useHierarchyParents = (
     if (!hierarchy) {
       return;
     }
-    const values = dimension.values;
-    const valueSet = new Set(values.map((v) => v.value));
-    const dimensionValues = uniqBy(
-      [
-        ...dfs(hierarchy, (node, { depth, parents }) => ({
-          node,
-          parents,
-          depth,
-        })),
-      ].filter(({ node }) => {
-        return valueSet.has(node.value);
-      }),
-      (x) => x.node.value
-    );
-    return groups(dimensionValues, (v) => v.parents);
+    const valueSet = new Set(dimension.values.map((x) => x.value));
+    return groupByParents(hierarchy)
+      .map(
+        ([parents, values]) =>
+          [parents, values.filter((x) => valueSet.has(x.node.value))] as const
+      )
+      .filter(([_parents, values]) => values.length > 0);
   }, [dimension.values, hierarchy]);
 };
 
+/**
+ * Can be used for debugging, pass a hierarchy, and copy the output
+ * to graphviz.
+ *
+ * @see https://dreampuf.github.io/GraphvizOnline/
+ */
+export const hierarchyToGraphviz = (
+  hierarchy: DimensionHierarchyQueryHierarchy
+) => {
+  const lines = [] as string[];
+  dfs(hierarchy, (node, { parents }) => {
+    lines.push(`"${node.value}"[label="${node.label.replace(/"/g, "")}"]`);
+    if (parents.length > 0) {
+      const parent = parents[parents.length - 1];
+      lines.push(`"${parent.value}" -> "${node.value}"`);
+    }
+  });
+  return `
+    digraph G {
+      rankdir=LR
+
+      ${lines.join("\n")}
+    }
+  `;
+};
+
 export default useHierarchyParents;