dbgate-datalib 4.4.2 → 4.4.3

package/lib/ChangeSet.d.ts

@@ -40,4 +40,5 @@ export declare function revertChangeSetRowChanges(changeSet: ChangeSet, definiti
 export declare function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetRowDefinition): ChangeSet;
 export declare function getChangeSetInsertedRows(changeSet: ChangeSet, name?: NamedObjectInfo): any[];
 export declare function changeSetInsertNewRow(changeSet: ChangeSet, name?: NamedObjectInfo): ChangeSet;
+export declare function changeSetInsertDocuments(changeSet: ChangeSet, documents: any[], name?: NamedObjectInfo): ChangeSet;
 export declare function changeSetContainsChanges(changeSet: ChangeSet): boolean;

package/lib/ChangeSet.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeSetContainsChanges = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
+exports.changeSetContainsChanges = exports.changeSetInsertDocuments = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 function createChangeSet() {
     return {
@@ -150,7 +150,7 @@ function changeSetInsertToSql(item, dbinfo = null) {
         const table = dbinfo.tables.find(x => x.schemaName == item.schemaName && x.pureName == item.pureName);
         if (table) {
             const autoIncCol = table.columns.find(x => x.autoIncrement);
-            console.log('autoIncCol', autoIncCol);
+            // console.log('autoIncCol', autoIncCol);
             if (autoIncCol && fields.find(x => x.targetColumn == autoIncCol.columnName)) {
                 autoInc = true;
             }
@@ -292,7 +292,7 @@ function getChangeSetInsertedRows(changeSet, name) {
 }
 exports.getChangeSetInsertedRows = getChangeSetInsertedRows;
 function changeSetInsertNewRow(changeSet, name) {
-    console.log('INSERT', name);
+    // console.log('INSERT', name);
     const insertedRows = getChangeSetInsertedRows(changeSet, name);
     return Object.assign(Object.assign({}, changeSet), { inserts: [
             ...changeSet.inserts,
@@ -300,6 +300,14 @@ function changeSetInsertNewRow(changeSet, name) {
         ] });
 }
 exports.changeSetInsertNewRow = changeSetInsertNewRow;
+function changeSetInsertDocuments(changeSet, documents, name) {
+    const insertedRows = getChangeSetInsertedRows(changeSet, name);
+    return Object.assign(Object.assign({}, changeSet), { inserts: [
+            ...changeSet.inserts,
+            ...documents.map((doc, index) => (Object.assign(Object.assign({}, name), { insertedRowIndex: insertedRows.length + index, fields: doc }))),
+        ] });
+}
+exports.changeSetInsertDocuments = changeSetInsertDocuments;
 function changeSetContainsChanges(changeSet) {
     if (!changeSet)
         return false;

package/lib/CollectionGridDisplay.d.ts

@@ -4,5 +4,5 @@ import { GridConfig, GridCache } from './GridConfig';
 export declare function analyseCollectionDisplayColumns(rows: any, display: any): any[];
 export declare class CollectionGridDisplay extends GridDisplay {
     collection: CollectionInfo;
-    constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any);
+    constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any, changeSet: any);
 }

package/lib/CollectionGridDisplay.js

@@ -74,18 +74,27 @@ function getDisplayColumn(basePath, columnName, display) {
     };
 }
 function analyseCollectionDisplayColumns(rows, display) {
+    var _a;
     const res = [];
+    const addedColumns = (_a = display === null || display === void 0 ? void 0 : display.config) === null || _a === void 0 ? void 0 : _a.addedColumns;
     for (const row of rows || []) {
         getColumnsForObject([], row, res, display);
     }
+    for (const added of addedColumns || []) {
+        if (res.find(x => x.uniqueName == added))
+            continue;
+        res.push(getDisplayColumn([], added, display));
+    }
     return (res.map(col => (Object.assign(Object.assign({}, col), { isChecked: display.isColumnChecked(col) }))) || []);
 }
 exports.analyseCollectionDisplayColumns = analyseCollectionDisplayColumns;
 class CollectionGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(collection, driver, config, setConfig, cache, setCache, loadedRows) {
+    constructor(collection, driver, config, setConfig, cache, setCache, loadedRows, changeSet) {
         super(config, setConfig, cache, setCache, driver);
         this.collection = collection;
-        this.columns = analyseCollectionDisplayColumns(loadedRows, this);
+        const changedDocs = lodash_1.default.compact(changeSet.updates.map(chs => chs.document));
+        const insertedDocs = lodash_1.default.compact(changeSet.inserts.map(chs => chs.fields));
+        this.columns = analyseCollectionDisplayColumns([...(loadedRows || []), ...changedDocs, ...insertedDocs], this);
         this.filterable = true;
         this.sortable = true;
         this.editable = true;

package/lib/FreeTableGridDisplay.js

@@ -2,11 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTableGridDisplay = void 0;
 const GridDisplay_1 = require("./GridDisplay");
+const _1 = require(".");
 class FreeTableGridDisplay extends GridDisplay_1.GridDisplay {
     constructor(model, config, setConfig, cache, setCache) {
+        var _a;
         super(config, setConfig, cache, setCache);
         this.model = model;
-        this.columns = this.getDisplayColumns(model);
+        this.columns = ((_a = model === null || model === void 0 ? void 0 : model.structure) === null || _a === void 0 ? void 0 : _a.__isDynamicStructure)
+            ? (0, _1.analyseCollectionDisplayColumns)(model === null || model === void 0 ? void 0 : model.rows, this)
+            : this.getDisplayColumns(model);
         this.filterable = false;
         this.sortable = false;
     }

package/lib/GridDisplay.d.ts

@@ -51,6 +51,7 @@ export declare abstract class GridDisplay {
     supportsReload: boolean;
     isDynamicStructure: boolean;
     setColumnVisibility(uniquePath: string[], isVisible: boolean): void;
+    addDynamicColumn(name: string): void;
     focusColumn(uniqueName: string): void;
     get hasReferences(): boolean;
     get focusedColumn(): string;

package/lib/GridDisplay.js

@@ -43,6 +43,9 @@ class GridDisplay {
                 this.reload();
         }
     }
+    addDynamicColumn(name) {
+        this.includeInColumnSet('addedColumns', name, true);
+    }
     focusColumn(uniqueName) {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumn: uniqueName })));
     }
@@ -81,7 +84,7 @@ class GridDisplay {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { hiddenColumns: this.columns.map(x => x.uniqueName) })));
     }
     get hiddenColumnIndexes() {
-        return (this.config.hiddenColumns || []).map(x => lodash_1.default.findIndex(this.columns, y => y.uniqueName == x));
+        return (this.config.hiddenColumns || []).map(x => lodash_1.default.findIndex(this.allColumns, y => y.uniqueName == x));
     }
     isColumnChecked(column) {
         // console.log('isColumnChecked', column, this.config.hiddenColumns);

package/package.json

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