refactor: Config iri -> id

visualize-admin · Nov 14, 2024 · 7c55a27 · 7c55a27
1 parent f2359a7
commit 7c55a27
Show file tree

Hide file tree

Showing 97 changed files with 2,105 additions and 2,089 deletions.
diff --git a/app/browse/datatable.tsx b/app/browse/datatable.tsx
@@ -15,7 +15,7 @@ import { ascending, descending } from "d3-array";
 import { useCallback, useMemo, useRef, useState } from "react";
 
 import {
-  extractChartConfigComponentIris,
+  extractChartConfigComponentIds,
   useQueryFilters,
 } from "@/charts/shared/chart-helpers";
 import { Loading } from "@/components/hint";
@@ -245,7 +245,7 @@ export const DataSetTable = ({
   sx?: SxProps<Theme>;
 }) => {
   const locale = useLocale();
-  const componentIris = extractChartConfigComponentIris({ chartConfig });
+  const componentIris = extractChartConfigComponentIds({ chartConfig });
   const commonQueryVariables = {
     sourceType: dataSource.type,
     sourceUrl: dataSource.url,

diff --git a/app/charts/area/areas-state.tsx b/app/charts/area/areas-state.tsx
@@ -170,7 +170,7 @@ const useAreasState = (
     fields.segment?.useAbbreviations,
   ]);
 
-  const xKey = fields.x.componentIri;
+  const xKey = fields.x.componentId;
   const sumsByX = useMemo(() => {
     return Object.fromEntries(
       rollup(
@@ -366,7 +366,7 @@ const useAreasState = (
       });
       const yValueFormatter = getStackedTooltipValueFormatter({
         normalize,
-        yMeasureIri: yMeasure.id,
+        yMeasureId: yMeasure.id,
         yMeasureUnit: yMeasure.unit,
         formatters,
         formatNumber,

diff --git a/app/charts/chart-config-ui-options.spec.ts b/app/charts/chart-config-ui-options.spec.ts
@@ -33,7 +33,7 @@ describe("defaultSegmentOnChange", () => {
     expect(Object.keys(chartConfig.fields)).toEqual(["segment"]);
     expect(chartConfig.fields.segment).toEqual(
       expect.objectContaining({
-        componentIri: "iri",
+        componentId: "iri",
         palette: DEFAULT_CATEGORICAL_PALETTE_NAME,
       })
     );