Merge pull request #654 from visualize-admin/chore/general-cleanup

chore: General cleanup
visualize-admin · Aug 24, 2022 · 89f0b2c · 89f0b2c · vercel · Aug 24, 2022
2 parents 3778d5c + fa6b068
commit 89f0b2c
Show file tree

Hide file tree

Showing 117 changed files with 120 additions and 5,724 deletions.
diff --git a/app/charts/area/areas-state.tsx b/app/charts/area/areas-state.tsx
@@ -45,9 +45,9 @@ import {
   useTimeFormatUnit,
 } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
-import { sortByIndex } from "@/lib/array";
-import { estimateTextWidth } from "@/lib/estimate-text-width";
 import { useLocale } from "@/locales/use-locale";
+import { sortByIndex } from "@/utils/array";
+import { estimateTextWidth } from "@/utils/estimate-text-width";
 import { makeOrdinalDimensionSorter } from "@/utils/sorting-values";
 
 export interface AreasState {
@@ -359,13 +359,6 @@ const useAreasState = ({
       getCategory: getSegment,
       sortOrder: "asc",
     });
-    const cumulativeSum = (
-      (sum) => (d: Observation) =>
-        (sum += getY(d) ?? 0)
-    )(0);
-    const cumulativeRulerItemValues = [
-      ...sortedTooltipValues.map(cumulativeSum),
-    ];
 
     const yAnchor = 0;
 

diff --git a/app/charts/area/areas.tsx b/app/charts/area/areas.tsx
@@ -3,12 +3,10 @@ import { memo } from "react";
 
 import { AreasState } from "@/charts/area/areas-state";
 import { useChartState } from "@/charts/shared/use-chart-state";
-import { useTheme } from "@/themes";
 
 export const Areas = () => {
-  const { bounds, getX, xScale, yScale, colors, series, segments } =
+  const { bounds, getX, xScale, yScale, colors, series } =
     useChartState() as AreasState;
-  const theme = useTheme();
   const areaGenerator = area<$FixMe>()
     .defined((d) => d[0] !== null && d[1] !== null)
     .x((d) => xScale(getX(d.data)))

diff --git a/app/charts/area/chart-area.tsx b/app/charts/area/chart-area.tsx
@@ -28,7 +28,6 @@ import {
   DataSource,
   InteractiveFiltersConfig,
 } from "@/configurator";
-import { isNumber } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
 import {
   DimensionMetadataFragment,
@@ -70,7 +69,6 @@ export const ChartAreasVisualization = ({
           observations={observations.data}
           dimensions={dimensions}
           measures={measures}
-          fields={chartConfig.fields}
         />
         <ChartAreas
           observations={observations.data}
@@ -84,8 +82,6 @@ export const ChartAreasVisualization = ({
     ) : (
       <NoDataHint />
     );
-  } else if (observations && !observations.map((obs) => obs.y).some(isNumber)) {
-    return <NoDataHint />;
   } else if (error) {
     return <LoadingDataError />;
   } else {

diff --git a/app/charts/bar/bars-grouped-state.tsx b/app/charts/bar/bars-grouped-state.tsx
@@ -32,8 +32,8 @@ import { Bounds, Observer, useWidth } from "@/charts/shared/use-width";
 import { BarFields, SortingOrder, SortingType } from "@/configurator";
 import { getPalette, mkNumber } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
-import { sortByIndex } from "@/lib/array";
 import { useLocale } from "@/locales/use-locale";
+import { sortByIndex } from "@/utils/array";
 
 export interface GroupedBarsState {
   chartType: string;

diff --git a/app/charts/bar/chart-bar.tsx b/app/charts/bar/chart-bar.tsx
@@ -26,7 +26,6 @@ import {
   FilterValueSingle,
   DataSource,
 } from "@/configurator";
-import { isNumber } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
 import {
   DimensionMetadataFragment,
@@ -68,7 +67,6 @@ export const ChartBarsVisualization = ({
           observations={observations.data}
           dimensions={dimensions}
           measures={measures}
-          fields={chartConfig.fields}
         />
         <ChartBars
           observations={observations.data}
@@ -82,8 +80,6 @@ export const ChartBarsVisualization = ({
     ) : (
       <NoDataHint />
     );
-  } else if (observations && !observations.map((obs) => obs.y).some(isNumber)) {
-    return <NoDataHint />;
   } else if (error) {
     return <LoadingDataError />;
   } else {

diff --git a/app/charts/column/chart-column.tsx b/app/charts/column/chart-column.tsx
@@ -38,7 +38,6 @@ import {
   FilterValueSingle,
   InteractiveFiltersConfig,
 } from "@/configurator";
-import { isNumber } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
 import {
   DimensionMetadataFragment,
@@ -80,7 +79,6 @@ export const ChartColumnsVisualization = ({
           observations={observations.data}
           dimensions={dimensions}
           measures={measures}
-          fields={chartConfig.fields}
         />
         <ChartColumns
           observations={observations.data}
@@ -94,8 +92,6 @@ export const ChartColumnsVisualization = ({
     ) : (
       <NoDataHint />
     );
-  } else if (observations && !observations.map((obs) => obs.y).some(isNumber)) {
-    return <NoDataHint />;
   } else if (error) {
     return <LoadingDataError />;
   } else {

diff --git a/app/charts/column/columns-grouped-state.tsx b/app/charts/column/columns-grouped-state.tsx
@@ -49,8 +49,8 @@ import {
   useFormatNumber,
 } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
-import { sortByIndex } from "@/lib/array";
 import { useLocale } from "@/locales/use-locale";
+import { sortByIndex } from "@/utils/array";
 import { makeOrdinalDimensionSorter } from "@/utils/sorting-values";
 
 export interface GroupedColumnsState {

diff --git a/app/charts/column/columns-stacked-state.tsx b/app/charts/column/columns-stacked-state.tsx
@@ -51,8 +51,8 @@ import {
   useFormatNumber,
 } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
-import { sortByIndex } from "@/lib/array";
 import { useLocale } from "@/locales/use-locale";
+import { sortByIndex } from "@/utils/array";
 import { makeOrdinalDimensionSorter } from "@/utils/sorting-values";
 
 export interface StackedColumnsState {
@@ -143,12 +143,11 @@ const useColumnsStackedState = ({
       sortData({
         data,
         getX,
-        getY,
         sortingType,
         sortingOrder,
         xOrder,
       }),
-    [data, getX, getY, sortingType, sortingOrder, xOrder]
+    [data, getX, sortingType, sortingOrder, xOrder]
   );
 
   // Data for Chart
@@ -560,14 +559,12 @@ export const StackedColumnsChart = ({
 const sortData = ({
   data,
   getX,
-  getY,
   sortingType,
   sortingOrder,
   xOrder,
 }: {
   data: Observation[];
   getX: (d: Observation) => string;
-  getY: (d: Observation) => number | null;
   sortingType: SortingType | undefined;
   sortingOrder: SortingOrder | undefined;
   xOrder: string[];

diff --git a/app/charts/index.ts b/app/charts/index.ts
@@ -34,7 +34,7 @@ import {
 } from "../domain/data";
 import { DimensionMetadataFragment } from "../graphql/query-hooks";
 import { DataCubeMetadata } from "../graphql/types";
-import { unreachableError } from "../lib/unreachable";
+import { unreachableError } from "../utils/unreachable";
 
 export const enabledChartTypes: ChartType[] = [
   // "bar",

diff --git a/app/charts/line/chart-lines.tsx b/app/charts/line/chart-lines.tsx
@@ -30,7 +30,6 @@ import {
   LineConfig,
   LineFields,
 } from "@/configurator";
-import { isNumber } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
 import {
   DimensionMetadataFragment,
@@ -73,7 +72,6 @@ export const ChartLinesVisualization = ({
           observations={observations.data}
           dimensions={dimensions}
           measures={measures}
-          fields={chartConfig.fields}
         />
         <ChartLines
           observations={observations.data}
@@ -87,8 +85,6 @@ export const ChartLinesVisualization = ({
     ) : (
       <NoDataHint />
     );
-  } else if (observations && !observations.map((obs) => obs.y).some(isNumber)) {
-    return <NoDataHint />;
   } else if (error) {
     return <LoadingDataError />;
   } else {
@@ -122,7 +118,6 @@ export const ChartLines = memo(function ChartLines({
         <ChartSvg>
           <AxisHeightLinear /> <AxisTime /> <AxisTimeDomain />
           <Lines />
-          {/* <HoverLine /> <HoverLineValues /> */}
           <InteractionHorizontal />
           {interactiveFiltersConfig?.time.active && <BrushTime />}
         </ChartSvg>
@@ -131,8 +126,6 @@ export const ChartLines = memo(function ChartLines({
 
         <HoverDotMultiple />
 
-        {/* <HoverDot /> */}
-
         <Tooltip type={fields.segment ? "multiple" : "single"} />
       </ChartContainer>
 

diff --git a/app/charts/line/hover-line-values.tsx b/app/charts/line/hover-line-values.tsx
diff --git a/app/charts/line/hover-line.tsx b/app/charts/line/hover-line.tsx
diff --git a/app/charts/line/lines-state.tsx b/app/charts/line/lines-state.tsx
@@ -37,9 +37,9 @@ import {
   useTimeFormatUnit,
 } from "@/configurator/components/ui-helpers";
 import { Observation } from "@/domain/data";
-import { sortByIndex } from "@/lib/array";
-import { estimateTextWidth } from "@/lib/estimate-text-width";
 import { useTheme } from "@/themes";
+import { sortByIndex } from "@/utils/array";
+import { estimateTextWidth } from "@/utils/estimate-text-width";
 import { makeOrdinalDimensionSorter } from "@/utils/sorting-values";
 
 export interface LinesState {

diff --git a/app/charts/line/lines.tsx b/app/charts/line/lines.tsx
@@ -4,12 +4,10 @@ import { Fragment, memo } from "react";
 import { LinesState } from "@/charts/line/lines-state";
 import { useChartState } from "@/charts/shared/use-chart-state";
 import { Observation } from "@/domain/data";
-import { useTheme } from "@/themes";
 
 export const Lines = () => {
   const { getX, xScale, getY, yScale, grouped, colors, bounds } =
     useChartState() as LinesState;
-  const theme = useTheme();
 
   const lineGenerator = line<Observation>()
     .defined((d) => getY(d) !== null)

diff --git a/app/charts/map/helpers.ts b/app/charts/map/helpers.ts
@@ -4,7 +4,7 @@ import { useMemo, useState } from "react";
 import { ViewState } from "react-map-gl";
 
 import { BBox } from "@/configurator/config-types";
-import useEvent from "@/lib/use-event";
+import useEvent from "@/utils/use-event";
 
 import { AreaLayer, SymbolLayer } from "../../domain/data";
 

diff --git a/app/charts/map/map.tsx b/app/charts/map/map.tsx
@@ -20,8 +20,8 @@ import { useInteraction } from "@/charts/shared/use-interaction";
 import { BBox } from "@/configurator/config-types";
 import { GeoFeature, GeoPoint } from "@/domain/data";
 import { Icon, IconName } from "@/icons";
-import useEvent from "@/lib/use-event";
 import { useLocale } from "@/src";
+import useEvent from "@/utils/use-event";
 
 import "maplibre-gl/dist/maplibre-gl.css";
 

diff --git a/app/charts/pie/chart-pie.tsx b/app/charts/pie/chart-pie.tsx
@@ -69,7 +69,6 @@ export const ChartPieVisualization = ({
           observations={observations.data}
           dimensions={dimensions}
           measures={measures}
-          fields={chartConfig.fields}
         />
         <ChartPie
           observations={observations.data}