refactor: Use option object for useHierarchyParents

visualize-admin · Nov 11, 2022 · 8b69780 · 8b69780
1 parent 2bff7a7
commit 8b69780
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/app/charts/shared/chart-data-filters.tsx b/app/charts/shared/chart-data-filters.tsx
@@ -150,13 +150,13 @@ const DataFilter = ({
     },
   });
 
-  const { data: hierarchyParents } = useHierarchyParents(
-    dataSetIri,
+  const { data: hierarchyParents } = useHierarchyParents({
+    datasetIri: dataSetIri,
     dataSource,
-    data?.dataCubeByIri?.dimensionByIri!,
+    dimension: data?.dataCubeByIri?.dimensionByIri!,
     locale,
-    !data?.dataCubeByIri?.dimensionByIri
-  );
+    pause: !data?.dataCubeByIri?.dimensionByIri,
+  });
 
   const optionGroups = React.useMemo(() => {
     return makeOptionGroups(hierarchyParents);

diff --git a/app/configurator/components/chart-configurator.tsx b/app/configurator/components/chart-configurator.tsx
@@ -84,13 +84,13 @@ const DataFilterSelectGeneric = ({
   const locale = useLocale();
   const [pause, setPause] = useState(true);
   const { data: hierarchyParents, fetching: fetchingHierarchy } =
-    useHierarchyParents(
-      state.dataSet,
-      state.dataSource,
+    useHierarchyParents({
+      datasetIri: state.dataSet,
+      dataSource: state.dataSource,
       dimension,
       locale,
-      pause
-    );
+      pause,
+    });
 
   const optionGroups = useMemo(() => {
     return makeOptionGroups(hierarchyParents);

diff --git a/app/configurator/components/use-hierarchy-parents.tsx b/app/configurator/components/use-hierarchy-parents.tsx
@@ -32,19 +32,25 @@ export const groupByParents = (hierarchy: DimensionHierarchyQueryHierarchy) => {
   return groups(allHierarchyValues, (v) => v.parents);
 };
 
-const useHierarchyParents = (
-  dataSet: string,
-  dataSource: DataSource,
-  dimension: DataCubeMetadata["dimensions"][number],
-  locale: string,
-  pause?: boolean
-): {
+const useHierarchyParents = ({
+  datasetIri,
+  dataSource,
+  dimension,
+  locale,
+  pause,
+}: {
+  datasetIri: string;
+  dataSource: DataSource;
+  dimension: DataCubeMetadata["dimensions"][number];
+  locale: string;
+  pause?: boolean;
+}): {
   fetching: boolean;
   data: HierarchyParents | undefined;
 } => {
   const [hierarchyResp] = useDimensionHierarchyQuery({
     variables: {
-      cubeIri: dataSet,
+      cubeIri: datasetIri,
       dimensionIri: dimension?.iri,
       sourceType: dataSource.type,
       sourceUrl: dataSource.url,