Addresses comments

apache · Feb 3, 2023 · 7ac2ac0 · 7ac2ac0
1 parent 95a958b
commit 7ac2ac0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
@@ -496,7 +496,7 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
           filter.operator === Operators.TEMPORAL_RANGE;
         if (isTemporalRange(valueToBeDeleted)) {
           const count = values.filter(isTemporalRange).length;
-          if (count < 2) {
+          if (count === 1) {
             return t(
               `You cannot delete the last temporal filter as it's used for time range filters in dashboards.`,
             );

diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
@@ -213,12 +213,10 @@ const DndFilterSelect = (props: DndFilterSelectProps) => {
 
   const onClickClose = useCallback(
     (index: number) => {
-      if (canDelete) {
-        const result = canDelete(values[index], values);
-        if (typeof result === 'string') {
-          warning({ title: t('Warning'), content: result });
-          return;
-        }
+      const result = canDelete?.(values[index], values);
+      if (typeof result === 'string') {
+        warning({ title: t('Warning'), content: result });
+        return;
       }
       removeValue(index);
     },

diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
@@ -194,12 +194,10 @@ class AdhocFilterControl extends React.Component {
   onRemoveFilter(index) {
     const { canDelete } = this.props;
     const { values } = this.state;
-    if (canDelete) {
-      const result = canDelete(values[index], values);
-      if (typeof result === 'string') {
-        warning({ title: t('Warning'), content: result });
-        return;
-      }
+    const result = canDelete?.(values[index], values);
+    if (typeof result === 'string') {
+      warning({ title: t('Warning'), content: result });
+      return;
     }
     this.removeFilter(index);
   }