Merge pull request #1230 from dbgate/feature/disable-filter

Feature/disable filter

packages/datalib/src/GridConfig.ts

@@ -31,6 +31,8 @@ export interface GridConfig extends GridConfigColumns {
   formFilterColumns: string[];
   multiColumnFilter?: string;
   searchInColumns?: string;
+  disabledFilterColumns: string[];
+  disabledMultiColumnFilter?: boolean;
 }
 
 export interface GridCache {
@@ -48,6 +50,7 @@ export function createGridConfig(): GridConfig {
     focusedColumns: null,
     grouping: {},
     formFilterColumns: [],
+    disabledFilterColumns: [],
   };
 }
 

packages/datalib/src/GridDisplay.ts

@@ -233,6 +233,7 @@ export abstract class GridDisplay {
       if (!filter) continue;
       const column = displayedColumnInfo[uniqueName];
       if (!column) continue;
+      if (this.isFilterDisabled(uniqueName)) continue;
       try {
         const condition = parseFilter(
           filter,
@@ -259,7 +260,7 @@ export abstract class GridDisplay {
       }
     }
 
-    if (this.baseTableOrView && this.config.multiColumnFilter) {
+    if (this.baseTableOrView && this.config.multiColumnFilter && !this.isMultiColumnFilterDisabled()) {
       const orCondition: CompoudCondition = {
         conditionType: 'or',
         conditions: [],
@@ -416,6 +417,7 @@ export abstract class GridDisplay {
         [uniqueName]: value,
       },
       formViewRecordNumber: 0,
+      disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName),
     }));
     this.reload();
   }
@@ -425,6 +427,7 @@ export abstract class GridDisplay {
       ...cfg,
       multiColumnFilter: value,
       formViewRecordNumber: 0,
+      disabledMultiColumnFilter: false,
     }));
     this.reload();
   }
@@ -448,6 +451,7 @@ export abstract class GridDisplay {
       ...cfg,
       filters: _.omit(cfg.filters, [uniqueName]),
       formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName),
+      disabledFilterColumns: (cfg.disabledFilterColumns).filter(x => x != uniqueName),
     }));
     this.reload();
   }
@@ -463,6 +467,37 @@ export abstract class GridDisplay {
     this.reload();
   }
 
+  toggleFilterEnabled(uniqueName) {
+    if (this.isFilterDisabled(uniqueName)) {
+      this.setConfig(cfg => ({
+        ...cfg,
+        disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName),
+      }));
+    } else {
+      this.setConfig(cfg => ({
+        ...cfg,
+        disabledFilterColumns: [...cfg.disabledFilterColumns, uniqueName],
+      }));
+    }
+    this.reload();
+  }
+
+  isFilterDisabled(uniqueName: string) {
+    return this.config.disabledFilterColumns.includes(uniqueName);
+  }
+
+  toggleMultiColumnFilterEnabled() {
+    this.setConfig(cfg => ({
+      ...cfg,
+      disabledMultiColumnFilter: !cfg.disabledMultiColumnFilter,
+    }));
+    this.reload();
+  }
+
+  isMultiColumnFilterDisabled() {
+    return this.config.disabledMultiColumnFilter;
+  }
+
   setSort(uniqueName, order) {
     this.setConfig(cfg => ({
       ...cfg,

packages/web/src/datagrid/DataFilterControl.svelte

@@ -34,6 +34,7 @@
   export let onCustomCommand = null;
   export let customCommandTooltip = null;
   export let formatterFunction = null;
+  export let filterDisabled = false;
 
   export let pureName = null;
   export let schemaName = null;
@@ -47,6 +48,7 @@
   let isError;
   let isOk;
   let domInput;
+  let isDisabled;
 
   $: if (onGetReference && domInput) onGetReference(domInput);
 
@@ -257,6 +259,7 @@
     try {
       isOk = false;
       isError = false;
+      isDisabled = filterDisabled;
       if (value) {
         parseFilter(value, filterBehaviour);
         isOk = true;
@@ -287,6 +290,7 @@
     on:paste={handlePaste}
     class:isError
     class:isOk
+    class:isDisabled
     {placeholder}
     data-testid={`DataFilterControl_input_${uniqueName}`}
   />
@@ -345,4 +349,8 @@
   input.isOk {
     background-color: var(--theme-bg-green);
   }
+
+  input.isDisabled {
+    text-decoration: line-through;
+  }
 </style>

packages/web/src/datagrid/DataGridCore.svelte

@@ -2059,6 +2059,7 @@
                     selectTopmostCell(col.uniqueName);
                   }}
                   dataType={col.dataType}
+                  filterDisabled={display.isFilterDisabled(col.uniqueName)}
                 />
               </td>
             {/each}

packages/web/src/formview/FormViewFilterColumn.svelte

@@ -6,6 +6,7 @@
   import ColumnLabel from '../elements/ColumnLabel.svelte';
   import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
+  import CheckboxField from '../forms/CheckboxField.svelte';
 
   export let uniqueName;
   export let display;
@@ -42,6 +43,13 @@
       {:else}
         {uniqueName}
       {/if}
+      <div class="flex items-center gap-2">
+        <CheckboxField
+          checked={!display.isFilterDisabled(uniqueName)}
+          on:change={() => {
+            display.toggleFilterEnabled(uniqueName);
+          }}
+        />
         <InlineButton
           square
           narrow
@@ -52,6 +60,7 @@
           <FontIcon icon="icon close" />
         </InlineButton>
       </div>
+    </div>
     <DataFilterControl
       filterBehaviour={computeFilterBehavoir(column, display, isDynamicStructure)}
       filter={filters[uniqueName]}
@@ -64,6 +73,7 @@
       columnName={column ? (column.uniquePath.length == 1 ? column.uniquePath[0] : null) : uniqueName}
       foreignKey={column?.foreignKey}
       dataType={column?.dataType}
+      filterDisabled={display.isFilterDisabled(uniqueName)}
     />
   </div>
 {/if}

packages/web/src/formview/FormViewFilters.svelte

@@ -8,6 +8,7 @@
   import keycodes from '../utility/keycodes';
   import FormViewFilterColumn from './FormViewFilterColumn.svelte';
   import { stringFilterBehaviour } from 'dbgate-tools';
+  import CheckboxField from '../forms/CheckboxField.svelte';
   // import PrimaryKeyFilterEditor from './PrimaryKeyFilterEditor.svelte';
 
   export let managerSize;
@@ -64,6 +65,13 @@
     <div class="space-between">
       <span>Multi column filter</span>
       {#if multiColumnFilter}
+      <div class="flex items-center gap-2">
+        <CheckboxField
+          checked={!display.isMultiColumnFilterDisabled()}
+          on:change={() => {
+            display.toggleMultiColumnFilterEnabled();
+          }}
+        />
         <InlineButton
           square
           narrow
@@ -73,6 +81,7 @@
         >
           <FontIcon icon="icon close" />
         </InlineButton>
+      </div>
       {/if}
     </div>
 
@@ -85,6 +94,7 @@
       {database}
       {schemaName}
       {pureName}
+      filterDisabled={display.isMultiColumnFilterDisabled()}
     />
   </div>
 {/if}