Skip to content

feat: Disable an ability to add temporal interactive filters #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bprusinowski merged 1 commit into from
Oct 13, 2021
Merged

feat: Disable an ability to add temporal interactive filters #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions app/charts/shared/chart-data-filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@ const DataFilterDropdown = ({
if (data?.dataCubeByIri?.dimensionByIri) {
const dimension = data?.dataCubeByIri?.dimensionByIri;

// TODO: Un-disable temporal fields
const disabled = dimension.__typename === "TemporalDimension";

const configFilter = chartConfig.filters[dimension.iri];
const configFilterValue =
configFilter && configFilter.type === "single"
Expand All @@ -143,9 +140,7 @@ const DataFilterDropdown = ({
configFilterValue ??
FIELD_VALUE_NONE;

const options = disabled
? [{ value, label: formatDateAuto(value) }]
: dimension.isKeyDimension
const options = dimension.isKeyDimension
? dimension.values
: [
{
Expand Down Expand Up @@ -173,7 +168,6 @@ const DataFilterDropdown = ({
label={dimension.label}
options={options}
value={value}
disabled={disabled}
onChange={setDataFilter}
/>
</Flex>
Expand Down
23 changes: 10 additions & 13 deletions app/configurator/interactive-filters/interactive-filters-config-options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import { t, Trans } from "@lingui/macro";
import { extent } from "d3";
import React, {
ChangeEvent,
ReactNode,
useCallback,
useEffect,
useRef,
} from "react";
import React, { ChangeEvent, useCallback, useEffect, useRef } from "react";
import { Box } from "theme-ui";
import { getFieldComponentIri, getFieldComponentIris } from "../../charts";
import { Checkbox } from "../../components/form";
Expand All @@ -30,8 +24,8 @@ import {
useInteractiveFiltersToggle,
useInteractiveTimeFiltersToggle,
} from "./interactive-filters-config-actions";
import { InteractveFilterType } from "./interactive-filters-configurator";
import { toggleInteractiveFilterDataDimension } from "./interactive-filters-config-state";
import { InteractveFilterType } from "./interactive-filters-configurator";

export const InteractiveFiltersOptions = ({
state,
Expand Down Expand Up @@ -256,9 +250,12 @@ const InteractiveDataFilterOptions = ({
const mappedIris = getFieldComponentIris(state.chartConfig.fields);

// Dimensions that are not encoded in the visualization
const unMappedDimensions = data?.dataCubeByIri.dimensions.filter(
(dim) => !mappedIris.has(dim.iri)
);
// excluding temporal dimensions
const unMappedDimensionsWithoutTemporalDimensions =
data?.dataCubeByIri.dimensions.filter(
(dim) =>
!mappedIris.has(dim.iri) && dim.__typename !== "TemporalDimension"
);

return (
<>
Expand All @@ -270,10 +267,10 @@ const InteractiveDataFilterOptions = ({
path="dataFilters"
defaultChecked={false}
disabled={false}
dimensions={unMappedDimensions}
dimensions={unMappedDimensionsWithoutTemporalDimensions}
></InteractiveDataFiltersToggle>
<Box sx={{ my: 3 }}>
{unMappedDimensions.map((d, i) => (
{unMappedDimensionsWithoutTemporalDimensions.map((d, i) => (
<InteractiveDataFilterOptionsCheckbox
key={i}
label={d.label}
Expand Down