dbgate-datalib 4.4.3 → 4.4.4

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/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;

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) {
@@ -252,10 +258,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 +295,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/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.4.3",
+  "version": "4.4.4",
   "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.4.4",
+    "dbgate-filterparser": "^4.4.4"
   },
   "devDependencies": {
-    "dbgate-types": "^4.4.3",
+    "dbgate-types": "^4.4.4",
     "@types/node": "^13.7.0",
     "typescript": "^4.4.3"
   }