Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ You can also check the

- Features
- Added a way to create a link column in table charts
- Hidden table columns are not forced anymore to have a single filter

### 6.1.3 - 2025-11-12

Expand Down
17 changes: 0 additions & 17 deletions app/charts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
Filters,
GenericChartConfig,
GenericField,
GenericFields,
InteractiveFiltersConfig,
isColorInConfig,
isSegmentInConfig,
Expand Down Expand Up @@ -2959,22 +2958,6 @@ export const getFieldComponentIds = (fields: ChartConfig["fields"]) => {
);
};

export const getGroupedFieldIds = (fields: GenericFields) => {
return new Set(
Object.values(fields).flatMap((f) =>
f && (f as $IntentionalAny).isGroup ? [f.componentId] : []
)
);
};

export const getHiddenFieldIds = (fields: GenericFields) => {
return new Set(
Object.values(fields).flatMap((f) =>
f && (f as $IntentionalAny).isHidden ? [f.componentId] : []
)
);
};

export const getFieldComponentId = (
fields: ChartConfig["fields"],
field: string
Expand Down
32 changes: 0 additions & 32 deletions app/configurator/components/filters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ import {
DRAWER_WIDTH,
} from "@/configurator/components/drawers";
import {
dimensionToFieldProps,
MultiFilterField,
ShowValuesMappingField,
SingleFilterField,
} from "@/configurator/components/field";
import {
canRenderDatePickerField,
Expand Down Expand Up @@ -104,7 +102,6 @@ import {
sortHierarchy,
} from "@/rdf/tree-utils";
import { interlace } from "@/utils/interlace";
import { valueComparator } from "@/utils/sorting-values";
import { getTimeFilterOptions } from "@/utils/time-filter-options";
import { useEvent } from "@/utils/use-event";

Expand Down Expand Up @@ -1419,32 +1416,3 @@ const InteractiveTimeRangeToggle = () => {
/>
);
};

export const DimensionValuesSingleFilter = ({
dimension,
}: {
dimension: Component;
}) => {
const locale = useLocale();
const sortedDimensionValues = useMemo(() => {
const values = dimension.values;
return [...values].sort(valueComparator(locale));
}, [dimension?.values, locale]);

return dimension ? (
<>
{sortedDimensionValues.map((d) => {
return (
<SingleFilterField
key={d.value}
filters={dimensionToFieldProps(dimension)}
label={d.label}
value={`${d.value}`}
/>
);
})}
</>
) : (
<Loading />
);
};
68 changes: 0 additions & 68 deletions app/configurator/configurator-state/reducer.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -378,72 +378,6 @@ describe("applyDimensionToFilters", () => {
});

describe("applyTableDimensionToFilters", () => {
it("should set single value filter for a keyDimension if hidden and not grouped", () => {
const initialFilters = {};
const expectedFilters = {
"https://environment.ld.admin.ch/foen/ubd0104/parametertype": {
type: "single",
value: "E.coli",
},
};

applyTableDimensionToFilters({
filters: initialFilters,
dimension: keyDimension,
isHidden: true,
isGrouped: false,
cubeIri: "https://environment.ld.admin.ch/foen/ubd0104",
});

expect(initialFilters).toEqual(expectedFilters);
});

it("should not modify filter for an optionalDimension if hidden and not grouped", () => {
const initialFilters = {
"https://environment.ld.admin.ch/foen/ubd0104/parametertype": {
type: "multi",
values: { "E.coli": true, Enterokokken: true },
},
} as any;
const expectedFilters = {
"https://environment.ld.admin.ch/foen/ubd0104/parametertype": {
type: "multi",
values: { "E.coli": true, Enterokokken: true },
},
};

applyTableDimensionToFilters({
filters: initialFilters,
dimension: optionalDimension,
isHidden: true,
isGrouped: false,
cubeIri: "https://environment.ld.admin.ch/foen/ubd0104",
});

expect(initialFilters).toEqual(expectedFilters);
});

it("should not set single value filter for a keyDimension if hidden and range", () => {
const initialFilters = {
"https://environment.ld.admin.ch/foen/ubd0104/parametertype": {
from: "2007-05-21",
to: "2020-09-28",
type: "range",
},
} as any;
const expectedFilters = { ...initialFilters };

applyTableDimensionToFilters({
filters: initialFilters,
dimension: keyDimension,
isHidden: true,
isGrouped: false,
cubeIri: "https://environment.ld.admin.ch/foen/ubd0104",
});

expect(initialFilters).toEqual(expectedFilters);
});

it("should not modify filters for a keyDimension if not hidden and grouped", () => {
const initialFilters = {
"https://environment.ld.admin.ch/foen/ubd0104/parametertype": {
Expand All @@ -461,8 +395,6 @@ describe("applyDimensionToFilters", () => {
applyTableDimensionToFilters({
filters: initialFilters,
dimension: keyDimension,
isHidden: false,
isGrouped: true,
cubeIri: "https://environment.ld.admin.ch/foen/ubd0104",
});

Expand Down
40 changes: 6 additions & 34 deletions app/configurator/configurator-state/reducer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import { Reducer } from "use-immer";
import {
getChartConfigAdjustedToChartType,
getFieldComponentIds,
getGroupedFieldIds,
getHiddenFieldIds,
} from "@/charts";
import {
getChartFieldChangeSideEffect,
Expand Down Expand Up @@ -116,20 +114,13 @@ export const deriveFiltersFromFields = produce(
if (draft.chartType === "table") {
// As dimensions in tables behave differently than in other chart types,
// they need to be handled in a different way.
const hiddenFieldIds = getHiddenFieldIds(draft.fields);
const groupedDimensionIds = getGroupedFieldIds(draft.fields);
const isHidden = (dim: Dimension) => hiddenFieldIds.has(dim.id);
const isGrouped = (dim: Dimension) => groupedDimensionIds.has(dim.id);
draft.cubes.forEach((cube) => {
const cubeDimensions = getCubeDimensions(dimensions, cube.iri);
cubeDimensions.forEach((dim) => {
applyTableDimensionToFilters({
cubeIri: cube.iri,
filters: cube.filters,
dimension: dim,
isHidden: isHidden(dim),
isGrouped: isGrouped(dim),
possibleFilter: possibleFilters?.find((f) => f.id === dim.id),
});
});
});
Expand Down Expand Up @@ -159,52 +150,33 @@ export const deriveFiltersFromFields = produce(
}
);

export const applyTableDimensionToFilters = (props: {
export const applyTableDimensionToFilters = ({
cubeIri,
filters,
dimension,
}: {
cubeIri: string;
filters: Filters;
dimension: Dimension;
isHidden: boolean;
isGrouped: boolean;
possibleFilter?: PossibleFilterValue;
}) => {
const { filters, dimension, isHidden, isGrouped, possibleFilter, cubeIri } =
props;
const originalIri = isJoinByComponent(dimension)
? dimension.originalIds.find((c) => c.cubeIri === cubeIri)?.dimensionId
: dimension.id;
assert(originalIri !== undefined, "Dimension should have an IRI");
const currentFilter = filters[originalIri];
const shouldBecomeSingleFilter = isHidden && !isGrouped;

if (currentFilter) {
switch (currentFilter.type) {
case "single":
if (!shouldBecomeSingleFilter) {
delete filters[originalIri];
}
delete filters[originalIri];
break;
case "multi":
if (shouldBecomeSingleFilter && dimension.isKeyDimension) {
filters[originalIri] = {
type: "single",
value:
Object.keys(currentFilter.values)[0] ?? dimension.values[0].value,
};
}
break;
case "range":
break;
default:
const _exhaustiveCheck: never = currentFilter;
return _exhaustiveCheck;
}
} else if (shouldBecomeSingleFilter && dimension.isKeyDimension) {
filters[originalIri] = {
type: "single",
// TODO, possibly in case of join by dimensions, we could get a value that is not part
// of the full range of values
value: possibleFilter?.value ?? dimension.values[0].value,
};
}
};

Expand Down
17 changes: 6 additions & 11 deletions app/configurator/table/table-chart-options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
} from "@/configurator/components/field";
import {
DimensionValuesMultiFilter,
DimensionValuesSingleFilter,
TimeFilter,
} from "@/configurator/components/filters";
import { mapValueIrisToColor } from "@/configurator/components/ui-helpers";
Expand Down Expand Up @@ -340,16 +339,12 @@ export const TableColumnOptions = ({
<legend style={{ display: "none" }}>
<Trans id="controls.section.filter">Filter</Trans>
</legend>
{component.isKeyDimension && isHidden && !isGroup ? (
<DimensionValuesSingleFilter dimension={component} />
) : (
<DimensionValuesMultiFilter
field={component.id}
dimension={component}
colorComponent={component}
colorConfigPath="columnStyle"
/>
)}
<DimensionValuesMultiFilter
field={component.id}
dimension={component}
colorComponent={component}
colorConfigPath="columnStyle"
/>
</ControlSectionContent>
</ControlSection>
) : null}
Expand Down
Loading