Skip to content

Commit f28afc8

Browse files
committed
fix: Datasets count
1 parent 32c4962 commit f28afc8

3 files changed

Lines changed: 23 additions & 8 deletions

File tree

app/configurator/components/filters-badge.tsx renamed to app/configurator/components/badges.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,19 @@ export const FiltersBadge = ({ sx }: { sx?: BadgeProps["sx"] }) => {
2424
/>
2525
);
2626
};
27+
28+
export const DatasetsBadge = ({ sx }: { sx?: BadgeProps["sx"] }) => {
29+
const ctx = useControlSectionContext();
30+
const [state] = useConfiguratorState(isConfiguring);
31+
const chartConfig = getChartConfig(state);
32+
const datasetsCount = chartConfig.cubes.length;
33+
34+
return (
35+
<Badge
36+
invisible={ctx.isOpen}
37+
badgeContent={datasetsCount}
38+
color="secondary"
39+
sx={{ display: "block", ...sx }}
40+
/>
41+
);
42+
};

app/configurator/components/chart-configurator.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ import {
5454
ControlTabField,
5555
DataFilterSelect,
5656
DataFilterTemporal,
57-
dimensionToFieldProps,
5857
OnOffControlTabField,
58+
dimensionToFieldProps,
5959
} from "@/configurator/components/field";
6060
import { canRenderDatePickerField } from "@/configurator/components/field-date-picker";
6161
import {
@@ -66,14 +66,14 @@ import {
6666
} from "@/configurator/configurator-state";
6767
import { useInteractiveDataFilterToggle } from "@/configurator/interactive-filters/interactive-filters-config-state";
6868
import {
69-
InteractiveFiltersConfigurator,
7069
InteractiveFilterToggle,
70+
InteractiveFiltersConfigurator,
7171
} from "@/configurator/interactive-filters/interactive-filters-configurator";
7272
import {
7373
Dimension,
74+
Measure,
7475
isStandardErrorDimension,
7576
isTemporalDimension,
76-
Measure,
7777
} from "@/domain/data";
7878
import { isMostRecentValue } from "@/domain/most-recent-value";
7979
import { truthy } from "@/domain/types";
@@ -91,8 +91,8 @@ import { useLocale } from "@/locales/use-locale";
9191
import { InteractiveFiltersChartProvider } from "@/stores/interactive-filters";
9292
import useEvent from "@/utils/use-event";
9393

94+
import { FiltersBadge } from "./badges";
9495
import { DatasetsControlSection } from "./dataset-control-section";
95-
import { FiltersBadge } from "./filters-badge";
9696

9797
type DataFilterSelectGenericProps = {
9898
rawDimension: Dimension;

app/configurator/components/dataset-control-section.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import { useEffect, useMemo, useRef, useState } from "react";
1515

1616
import { useMetadataPanelStoreActions } from "@/components/metadata-panel-store";
1717
import useDisclosure from "@/components/use-disclosure";
18+
import { DatasetDialog } from "@/configurator/components/add-dataset-dialog";
19+
import { DatasetsBadge } from "@/configurator/components/badges";
1820
import { BetaTag } from "@/configurator/components/beta-tag";
1921
import {
2022
ControlSection,
@@ -35,9 +37,6 @@ import { useLocale } from "@/locales/use-locale";
3537
import { useEventEmitter } from "@/utils/eventEmitter";
3638
import { MaybeTooltip } from "@/utils/maybe-tooltip";
3739

38-
import { DatasetDialog } from "./add-dataset-dialog";
39-
import { FiltersBadge } from "./filters-badge";
40-
4140
const useStyles = makeStyles((theme: Theme) => ({
4241
row: {
4342
borderLeft: "0.25rem solid transparent",
@@ -215,7 +214,7 @@ export const DatasetsControlSection = () => {
215214
},
216215
}}
217216
/>
218-
<FiltersBadge sx={{ ml: "auto", mr: 4 }} />
217+
<DatasetsBadge sx={{ ml: "auto", mr: 4 }} />
219218
</SubsectionTitle>
220219
<ControlSectionContent
221220
aria-labelledby="controls-data"

0 commit comments

Comments
 (0)