Skip to content
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

Jump to bottom

fix: Prevents last temporal filter removal #22982

Merged
merged 2 commits into from
Feb 3, 2023
Merged

fix: Prevents last temporal filter removal #22982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a958b
fix: Prevents last temporal filter removal
michael-s-molina Feb 3, 2023
7ac2ac0
Addresses comments
michael-s-molina Feb 3, 2023
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
47 changes: 23 additions & 24 deletions superset-frontend/src/explore/components/ControlPanelsContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
CustomControlItem,
Dataset,
ExpandedControlItem,
isTemporalColumn,
sections,
} from '@superset-ui/chart-controls';
import { useSelector } from 'react-redux';
Expand Down Expand Up @@ -293,13 +294,17 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
const previousXAxis = usePrevious(x_axis);

useEffect(() => {
if (x_axis && x_axis !== previousXAxis) {
if (
x_axis &&
x_axis !== previousXAxis &&
isTemporalColumn(x_axis, props.exploreState.datasource)
) {
const noFilter =
!adhoc_filters ||
!adhoc_filters.find(
filter =>
filter.expressionType === 'SIMPLE' &&
filter.operator === 'TEMPORAL_RANGE' &&
filter.operator === Operators.TEMPORAL_RANGE &&
filter.subject === x_axis,
);
if (noFilter) {
Expand All @@ -314,7 +319,7 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
{
clause: 'WHERE',
subject: x_axis,
operator: 'TEMPORAL_RANGE',
operator: Operators.TEMPORAL_RANGE,
comparator: defaultTimeFilter || NO_TIME_RANGE,
expressionType: 'SIMPLE',
},
Expand All @@ -329,6 +334,7 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
setControlValue,
defaultTimeFilter,
previousXAxis,
props.exploreState.datasource,
]);

useEffect(() => {
Expand Down Expand Up @@ -482,28 +488,21 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
: baseDescription;

if (name === 'adhoc_filters') {
restProps.confirmDeletion = {
triggerCondition: (
valueToBeDeleted: Record<string, any>,
values: Record<string, any>[],
) => {
const isTemporalRange = (filter: Record<string, any>) =>
filter.operator === Operators.TEMPORAL_RANGE;
if (isTemporalRange(valueToBeDeleted)) {
const count = values.filter(isTemporalRange).length;
if (count < 2) {
return true;
}
restProps.canDelete = (
valueToBeDeleted: Record<string, any>,
values: Record<string, any>[],
) => {
const isTemporalRange = (filter: Record<string, any>) =>
filter.operator === Operators.TEMPORAL_RANGE;
if (isTemporalRange(valueToBeDeleted)) {
const count = values.filter(isTemporalRange).length;
if (count < 2) {
michael-s-molina marked this conversation as resolved.
Show resolved Hide resolved
return t(
`You cannot delete the last temporal filter as it's used for time range filters in dashboards.`,
);
}
return false;
},
confirmationTitle: t(
'Are you sure you want to remove the last temporal filter?',
),
confirmationText: t(
`This filter is the last temporal filter. If you proceed,
this chart won't be affected by time range filters in dashboards.`,
),
}
return true;
};
}

Expand Down
33 changes: 11 additions & 22 deletions superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import AdhocFilterControl from '../FilterControl/AdhocFilterControl';
import DndAdhocFilterOption from './DndAdhocFilterOption';
import { useDefaultTimeFilter } from '../DateFilterControl/utils';

const { confirm } = Modal;
const { warning } = Modal;

const EMPTY_OBJECT = {};
const DND_ACCEPTED_TYPES = [
Expand All @@ -78,22 +78,18 @@ export interface DndFilterSelectProps
savedMetrics: Metric[];
selectedMetrics: QueryFormMetric[];
datasource: Datasource;
confirmDeletion?: {
triggerCondition: (
valueToBeDeleted: OptionValueType,
values: OptionValueType[],
) => boolean;
confirmationTitle: string;
confirmationText: string;
};
canDelete?: (
valueToBeDeleted: OptionValueType,
values: OptionValueType[],
) => true | string;
}

const DndFilterSelect = (props: DndFilterSelectProps) => {
const {
datasource,
onChange = () => {},
name: controlName,
confirmDeletion,
canDelete,
} = props;

const propsValues = Array.from(props.value ?? []);
Expand Down Expand Up @@ -217,23 +213,16 @@ const DndFilterSelect = (props: DndFilterSelectProps) => {

const onClickClose = useCallback(
(index: number) => {
if (confirmDeletion) {
const { confirmationText, confirmationTitle, triggerCondition } =
confirmDeletion;
if (triggerCondition(values[index], values)) {
confirm({
title: confirmationTitle,
content: confirmationText,
onOk() {
removeValue(index);
},
});
if (canDelete) {
const result = canDelete(values[index], values);
michael-s-molina marked this conversation as resolved.
Show resolved Hide resolved
if (typeof result === 'string') {
warning({ title: t('Warning'), content: result });
return;
}
}
removeValue(index);
},
[confirmDeletion, removeValue, values],
[canDelete, removeValue, values],
);

const onShiftOptions = useCallback(
Expand Down
26 changes: 7 additions & 19 deletions superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import AdhocFilter, {
import adhocFilterType from 'src/explore/components/controls/FilterControl/adhocFilterType';
import columnType from 'src/explore/components/controls/FilterControl/columnType';

const { confirm } = Modal;
const { warning } = Modal;

const selectedMetricType = PropTypes.oneOfType([
PropTypes.string,
Expand All @@ -74,11 +74,7 @@ const propTypes = {
PropTypes.arrayOf(selectedMetricType),
]),
isLoading: PropTypes.bool,
confirmDeletion: PropTypes.shape({
triggerCondition: PropTypes.func,
confirmationTitle: PropTypes.string,
confirmationText: PropTypes.string,
}),
canDelete: PropTypes.func,
};

const defaultProps = {
Expand Down Expand Up @@ -196,20 +192,12 @@ class AdhocFilterControl extends React.Component {
}

onRemoveFilter(index) {
const { confirmDeletion } = this.props;
const { canDelete } = this.props;
const { values } = this.state;
const { removeFilter } = this;
if (confirmDeletion) {
const { confirmationText, confirmationTitle, triggerCondition } =
confirmDeletion;
if (triggerCondition(values[index], values)) {
confirm({
title: confirmationTitle,
content: confirmationText,
onOk() {
removeFilter(index);
},
});
if (canDelete) {
const result = canDelete(values[index], values);
if (typeof result === 'string') {
warning({ title: t('Warning'), content: result });
return;
}
}
Expand Down