dbgate-datalib 4.4.3 → 4.5.1

package/lib/FreeTableGridDisplay.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTableGridDisplay = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const GridDisplay_1 = require("./GridDisplay");
 const _1 = require(".");
 class FreeTableGridDisplay extends GridDisplay_1.GridDisplay {
@@ -16,7 +20,7 @@ class FreeTableGridDisplay extends GridDisplay_1.GridDisplay {
     }
     getDisplayColumns(model) {
         var _a, _b, _c;
-        return (((_c = (_b = (_a = model === null || model === void 0 ? void 0 : model.structure) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(col => this.getDisplayColumn(col))) === null || _c === void 0 ? void 0 : _c.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col) })))) || []);
+        return lodash_1.default.uniqBy(((_c = (_b = (_a = model === null || model === void 0 ? void 0 : model.structure) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(col => this.getDisplayColumn(col))) === null || _c === void 0 ? void 0 : _c.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col) })))) || [], col => col.uniqueName);
     }
     getDisplayColumn(col) {
         const uniquePath = [col.columnName];

package/lib/GridConfig.d.ts

@@ -16,7 +16,7 @@ export interface GridConfig extends GridConfigColumns {
     filters: {
         [uniqueName: string]: string;
     };
-    focusedColumn?: string;
+    focusedColumns?: string[];
     columnWidths: {
         [uniqueName: string]: number;
     };

package/lib/GridConfig.js

@@ -9,7 +9,7 @@ function createGridConfig() {
         filters: {},
         columnWidths: {},
         sort: [],
-        focusedColumn: null,
+        focusedColumns: null,
         grouping: {},
         formFilterColumns: [],
     };

package/lib/GridDisplay.d.ts

@@ -1,5 +1,5 @@
 import { GridConfig, GridCache, GridConfigColumns, GroupFunc } from './GridConfig';
-import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo, CollectionInfo, SqlDialect } from 'dbgate-types';
+import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo, CollectionInfo, SqlDialect, ViewInfo } from 'dbgate-types';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
 import { Select, Condition } from 'dbgate-sqltree';
 export interface DisplayColumn {
@@ -40,8 +40,11 @@ export declare abstract class GridDisplay {
     dialect: SqlDialect;
     columns: DisplayColumn[];
     baseTable?: TableInfo;
+    baseView?: ViewInfo;
     baseCollection?: CollectionInfo;
+    get baseTableOrSimilar(): NamedObjectInfo;
     get baseTableOrCollection(): NamedObjectInfo;
+    get baseTableOrView(): TableInfo | ViewInfo;
     changeSetKeyFields: string[];
     sortable: boolean;
     groupable: boolean;
@@ -52,11 +55,12 @@ export declare abstract class GridDisplay {
     isDynamicStructure: boolean;
     setColumnVisibility(uniquePath: string[], isVisible: boolean): void;
     addDynamicColumn(name: string): void;
-    focusColumn(uniqueName: string): void;
+    focusColumns(uniqueNames: string[]): void;
     get hasReferences(): boolean;
-    get focusedColumn(): string;
+    get focusedColumns(): string[];
     get engine(): string;
     get allColumns(): DisplayColumn[];
+    findColumn(uniqueName: string): DisplayColumn;
     getFkTarget(column: DisplayColumn): TableInfo;
     reload(): void;
     includeInColumnSet(field: keyof GridConfigColumns, uniqueName: string, isIncluded: boolean): void;

package/lib/GridDisplay.js

@@ -29,9 +29,15 @@ class GridDisplay {
         this.isDynamicStructure = false;
         this.dialect = ((driver === null || driver === void 0 ? void 0 : driver.dialectByVersion) && (driver === null || driver === void 0 ? void 0 : driver.dialectByVersion(serverVersion))) || (driver === null || driver === void 0 ? void 0 : driver.dialect);
     }
+    get baseTableOrSimilar() {
+        return this.baseTable || this.baseCollection || this.baseView;
+    }
     get baseTableOrCollection() {
         return this.baseTable || this.baseCollection;
     }
+    get baseTableOrView() {
+        return this.baseTable || this.baseView;
+    }
     setColumnVisibility(uniquePath, isVisible) {
         const uniqueName = uniquePath.join('.');
         if (uniquePath.length == 1) {
@@ -46,14 +52,14 @@ class GridDisplay {
     addDynamicColumn(name) {
         this.includeInColumnSet('addedColumns', name, true);
     }
-    focusColumn(uniqueName) {
-        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumn: uniqueName })));
+    focusColumns(uniqueNames) {
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumns: uniqueNames })));
     }
     get hasReferences() {
         return false;
     }
-    get focusedColumn() {
-        return this.config.focusedColumn;
+    get focusedColumns() {
+        return this.config.focusedColumns;
     }
     get engine() {
         var _a;
@@ -62,6 +68,9 @@ class GridDisplay {
     get allColumns() {
         return this.getColumns(null).filter(col => col.isChecked || col.uniquePath.length == 1);
     }
+    findColumn(uniqueName) {
+        return this.getColumns(null).find(x => x.uniqueName == uniqueName);
+    }
     getFkTarget(column) {
         return null;
     }
@@ -252,10 +261,11 @@ class GridDisplay {
         this.reload();
     }
     getGrouping(uniqueName) {
+        var _a, _b;
         if (this.isGrouped) {
             if (this.config.grouping[uniqueName])
                 return this.config.grouping[uniqueName];
-            const column = this.baseTable.columns.find(x => x.columnName == uniqueName);
+            const column = (_b = (_a = (this.baseTable || this.baseView)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.find(x => x.columnName == uniqueName);
             if ((0, dbgate_tools_2.isTypeLogical)(column === null || column === void 0 ? void 0 : column.dataType))
                 return 'COUNT DISTINCT';
             if (column === null || column === void 0 ? void 0 : column.autoIncrement)
@@ -288,21 +298,21 @@ class GridDisplay {
         const col = this.columns.find(x => x.uniqueName == uniqueName);
         if (!col)
             return null;
-        const baseTableOrCollection = this.baseTableOrCollection;
-        if (!baseTableOrCollection)
+        const baseObj = this.baseTableOrSimilar;
+        if (!baseObj)
             return null;
-        if (baseTableOrCollection.pureName != col.pureName || baseTableOrCollection.schemaName != col.schemaName) {
+        if (baseObj.pureName != col.pureName || baseObj.schemaName != col.schemaName) {
             return null;
         }
         return Object.assign(Object.assign({}, this.getChangeSetRow(row, insertedRowIndex)), { uniqueName: uniqueName, columnName: col.columnName });
     }
     getChangeSetRow(row, insertedRowIndex) {
-        const baseTableOrCollection = this.baseTableOrCollection;
-        if (!baseTableOrCollection)
+        const baseObj = this.baseTableOrSimilar;
+        if (!baseObj)
             return null;
         return {
-            pureName: baseTableOrCollection.pureName,
-            schemaName: baseTableOrCollection.schemaName,
+            pureName: baseObj.pureName,
+            schemaName: baseObj.schemaName,
             insertedRowIndex,
             condition: insertedRowIndex == null ? this.getChangeSetCondition(row) : null,
         };

package/lib/JslGridDisplay.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JslGridDisplay = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const GridDisplay_1 = require("./GridDisplay");
 const CollectionGridDisplay_1 = require("./CollectionGridDisplay");
 class JslGridDisplay extends GridDisplay_1.GridDisplay {
@@ -9,7 +13,7 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
         super(config, setConfig, cache, setCache, null);
         this.filterable = true;
         if (structure.columns) {
-            this.columns = (_a = structure.columns
+            this.columns = lodash_1.default.uniqBy((_a = structure.columns
                 .map(col => ({
                 columnName: col.columnName,
                 headerText: col.columnName,
@@ -19,7 +23,7 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
                 autoIncrement: col.autoIncrement,
                 pureName: null,
                 schemaName: null,
-            }))) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col) })));
+            }))) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col) }))), col => col.uniqueName);
         }
         if (structure.__isDynamicStructure) {
             this.columns = (0, CollectionGridDisplay_1.analyseCollectionDisplayColumns)(rows, this);

package/lib/ViewGridDisplay.js

@@ -9,9 +9,10 @@ class ViewGridDisplay extends GridDisplay_1.GridDisplay {
         this.columns = this.getDisplayColumns(view);
         this.filterable = true;
         this.sortable = true;
-        this.groupable = true;
+        this.groupable = false;
         this.editable = false;
         this.supportsReload = true;
+        this.baseView = view;
     }
     getDisplayColumns(view) {
         var _a, _b;

package/lib/deleteCascade.js

@@ -7,15 +7,18 @@ exports.getDeleteCascades = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const ChangeSet_1 = require("./ChangeSet");
 // function getDeleteScript()
-function processDependencies(changeSet, result, allForeignKeys, fkPath, table, baseCmd, dbinfo) {
+function processDependencies(changeSet, result, allForeignKeys, fkPath, table, baseCmd, dbinfo, usedTables) {
     if (result.find(x => x.title == table.pureName))
         return;
     const dependencies = allForeignKeys.filter(x => x.refSchemaName == table.schemaName && x.refTableName == table.pureName);
     for (const fk of dependencies) {
         const depTable = dbinfo.tables.find(x => x.pureName == fk.pureName && x.schemaName == fk.schemaName);
         const subFkPath = [...fkPath, fk];
-        if (depTable && depTable.pureName != baseCmd.pureName) {
-            processDependencies(changeSet, result, allForeignKeys, subFkPath, depTable, baseCmd, dbinfo);
+        if (depTable && !usedTables.includes(depTable.pureName)) {
+            processDependencies(changeSet, result, allForeignKeys, subFkPath, depTable, baseCmd, dbinfo, [
+                ...usedTables,
+                depTable.pureName,
+            ]);
         }
         const refCmd = {
             commandType: 'delete',
@@ -103,7 +106,7 @@ function getDeleteCascades(changeSet, dbinfo) {
         const table = dbinfo.tables.find(x => x.pureName == baseCmd.pureName && x.schemaName == baseCmd.schemaName);
         if (!table.primaryKey)
             continue;
-        processDependencies(changeSet, result, allForeignKeys, [], table, baseCmd, dbinfo);
+        processDependencies(changeSet, result, allForeignKeys, [], table, baseCmd, dbinfo, [table.pureName]);
         // let resItem = result.find(x => x.title == baseCmd.pureName);
         // if (!resItem) {
         //   resItem = {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.4.3",
+  "version": "4.5.1",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -11,11 +11,11 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^4.4.3",
-    "dbgate-filterparser": "^4.4.3"
+    "dbgate-sqltree": "^4.5.1",
+    "dbgate-filterparser": "^4.5.1"
   },
   "devDependencies": {
-    "dbgate-types": "^4.4.3",
+    "dbgate-types": "^4.5.1",
     "@types/node": "^13.7.0",
     "typescript": "^4.4.3"
   }