dbgate-datalib 6.6.5 → 6.6.6

package/lib/GridConfig.d.ts

@@ -34,6 +34,8 @@ export interface GridConfig extends GridConfigColumns {
     formFilterColumns: string[];
     multiColumnFilter?: string;
     searchInColumns?: string;
+    disabledFilterColumns: string[];
+    disabledMultiColumnFilter?: boolean;
 }
 export interface GridCache {
     refreshTime: number;

package/lib/GridConfig.js

@@ -12,6 +12,7 @@ function createGridConfig() {
         focusedColumns: null,
         grouping: {},
         formFilterColumns: [],
+        disabledFilterColumns: [],
     };
 }
 exports.createGridConfig = createGridConfig;

package/lib/GridDisplay.d.ts

@@ -98,6 +98,10 @@ export declare abstract class GridDisplay {
     showFilter(uniqueName: any): void;
     removeFilter(uniqueName: any): void;
     setFilters(dct: any): void;
+    toggleFilterEnabled(uniqueName: any): void;
+    isFilterDisabled(uniqueName: string): boolean;
+    toggleMultiColumnFilterEnabled(): void;
+    isMultiColumnFilterDisabled(): boolean;
     setSort(uniqueName: any, order: any): void;
     addToSort(uniqueName: any, order: any): void;
     clearSort(): void;

package/lib/GridDisplay.js

@@ -143,6 +143,8 @@ class GridDisplay {
             const column = displayedColumnInfo[uniqueName];
             if (!column)
                 continue;
+            if (this.isFilterDisabled(uniqueName))
+                continue;
             try {
                 const condition = (0, dbgate_filterparser_1.parseFilter)(filter, (_b = (_a = this.driver) === null || _a === void 0 ? void 0 : _a.getFilterBehaviour(column.dataType, dbgate_tools_2.standardFilterBehaviours)) !== null && _b !== void 0 ? _b : (0, dbgate_tools_2.detectSqlFilterBehaviour)(column.dataType));
                 if (condition) {
@@ -163,7 +165,7 @@ class GridDisplay {
                 continue;
             }
         }
-        if (this.baseTableOrView && this.config.multiColumnFilter) {
+        if (this.baseTableOrView && this.config.multiColumnFilter && !this.isMultiColumnFilterDisabled()) {
             const orCondition = {
                 conditionType: 'or',
                 conditions: [],
@@ -298,11 +300,11 @@ class GridDisplay {
         return this.config.filters[uniqueName];
     }
     setFilter(uniqueName, value) {
-        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: Object.assign(Object.assign({}, cfg.filters), { [uniqueName]: value }), formViewRecordNumber: 0 })));
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: Object.assign(Object.assign({}, cfg.filters), { [uniqueName]: value }), formViewRecordNumber: 0, disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName) })));
         this.reload();
     }
     setMutliColumnFilter(value) {
-        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { multiColumnFilter: value, formViewRecordNumber: 0 })));
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { multiColumnFilter: value, formViewRecordNumber: 0, disabledMultiColumnFilter: false })));
         this.reload();
     }
     showFilter(uniqueName) {
@@ -313,13 +315,32 @@ class GridDisplay {
         });
     }
     removeFilter(uniqueName) {
-        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: lodash_1.default.omit(cfg.filters, [uniqueName]), formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName) })));
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: lodash_1.default.omit(cfg.filters, [uniqueName]), formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName), disabledFilterColumns: (cfg.disabledFilterColumns).filter(x => x != uniqueName) })));
         this.reload();
     }
     setFilters(dct) {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: Object.assign(Object.assign({}, cfg.filters), dct) })));
         this.reload();
     }
+    toggleFilterEnabled(uniqueName) {
+        if (this.isFilterDisabled(uniqueName)) {
+            this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName) })));
+        }
+        else {
+            this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { disabledFilterColumns: [...cfg.disabledFilterColumns, uniqueName] })));
+        }
+        this.reload();
+    }
+    isFilterDisabled(uniqueName) {
+        return this.config.disabledFilterColumns.includes(uniqueName);
+    }
+    toggleMultiColumnFilterEnabled() {
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { disabledMultiColumnFilter: !cfg.disabledMultiColumnFilter })));
+        this.reload();
+    }
+    isMultiColumnFilterDisabled() {
+        return this.config.disabledMultiColumnFilter;
+    }
     setSort(uniqueName, order) {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { sort: [{ uniqueName, order }] })));
         this.reload();

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.6.5",
+  "version": "6.6.6",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -15,14 +15,14 @@
   ],
   "dependencies": {
     "date-fns": "^4.1.0",
-    "dbgate-filterparser": "^6.6.5",
-    "dbgate-sqltree": "^6.6.5",
-    "dbgate-tools": "^6.6.5",
+    "dbgate-filterparser": "^6.6.6",
+    "dbgate-sqltree": "^6.6.6",
+    "dbgate-tools": "^6.6.6",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.6.5",
+    "dbgate-types": "^6.6.6",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"