Allow disable/re-enable multicolumn filter #1174

packages/datalib/src/GridConfig.ts

@@ -32,6 +32,7 @@ export interface GridConfig extends GridConfigColumns {
   multiColumnFilter?: string;
   searchInColumns?: string;
   disabledFilterColumns: string[];
+  disabledMultiColumnFilter?: boolean;
 }
 
 export interface GridCache {

packages/datalib/src/GridDisplay.ts

@@ -260,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: [],
@@ -427,6 +427,7 @@ export abstract class GridDisplay {
       ...cfg,
       multiColumnFilter: value,
       formViewRecordNumber: 0,
+      disabledMultiColumnFilter: false,
     }));
     this.reload();
   }
@@ -485,6 +486,18 @@ export abstract class GridDisplay {
     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/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}