dbgate-datalib 7.1.13 → 7.2.0

package/lib/GridDisplay.d.ts

@@ -25,6 +25,8 @@ export interface DisplayColumn {
     dataType?: string;
     filterBehaviour?: FilterBehaviour;
     isStructured?: boolean;
+    sourceColumnName?: string;
+    queryResultEditable?: boolean;
 }
 export interface DisplayedColumnEx extends DisplayColumn {
     sourceAlias: string;
@@ -59,6 +61,10 @@ export declare abstract class GridDisplay {
     groupable: boolean;
     filterable: boolean;
     editable: boolean;
+    allowInsert: boolean;
+    allowDelete: boolean;
+    allowStructureChange: boolean;
+    allowRowDocumentEdit: boolean;
     isLoadedCorrectly: boolean;
     supportsReload: boolean;
     isDynamicStructure: boolean;
@@ -115,8 +121,10 @@ export declare abstract class GridDisplay {
     clearFilters(): void;
     resetConfig(): void;
     getChangeSetCondition(row: any): Pick<any, string>;
+    isColumnEditable(uniqueName: string, row?: any): boolean;
     getChangeSetField(row: any, uniqueName: any, insertedRowIndex: any, existingRowIndex?: any, baseNameOmitable?: boolean): ChangeSetFieldDefinition;
     getChangeSetRow(row: any, insertedRowIndex: any, existingRowIndex: any, baseNameOmitable?: boolean): ChangeSetRowDefinition;
+    getChangeSetRowDefinitions(row: any, insertedRowIndex: any, existingRowIndex: any, baseNameOmitable?: boolean): ChangeSetRowDefinition[];
     createSelect(options?: {}): Select;
     processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options: any): void;
     createColumnExpression(col: any, source: any, alias?: any, purpose?: 'view' | 'filter'): any;

package/lib/GridDisplay.js

@@ -27,6 +27,10 @@ class GridDisplay {
         this.groupable = false;
         this.filterable = false;
         this.editable = false;
+        this.allowInsert = true;
+        this.allowDelete = true;
+        this.allowStructureChange = true;
+        this.allowRowDocumentEdit = true;
         this.isLoadedCorrectly = true;
         this.supportsReload = false;
         this.isDynamicStructure = false;
@@ -406,6 +410,9 @@ class GridDisplay {
             return null;
         return lodash_1.default.pick(row, this.changeSetKeyFields);
     }
+    isColumnEditable(uniqueName, row) {
+        return this.editable;
+    }
     getChangeSetField(row, uniqueName, insertedRowIndex, existingRowIndex = null, baseNameOmitable = false) {
         const col = this.columns.find(x => x.uniqueName == uniqueName);
         if (!col)
@@ -432,6 +439,9 @@ class GridDisplay {
             condition: insertedRowIndex == null && existingRowIndex == null ? this.getChangeSetCondition(row) : null,
         };
     }
+    getChangeSetRowDefinitions(row, insertedRowIndex, existingRowIndex, baseNameOmitable = false) {
+        return [this.getChangeSetRow(row, insertedRowIndex, existingRowIndex, baseNameOmitable)].filter(Boolean);
+    }
     createSelect(options = {}) {
         return null;
     }

package/lib/JslGridDisplay.d.ts

@@ -1,6 +1,27 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import { GridConfig, GridCache } from './GridConfig';
-import { EngineDriver } from 'dbgate-types';
+import { DatabaseInfo, EngineDriver } from 'dbgate-types';
 export declare class JslGridDisplay extends GridDisplay {
-    constructor(jslid: any, structure: any, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, rows: any, isDynamicStructure: boolean, supportsReload: boolean, editable?: boolean, driver?: EngineDriver, currentSettings?: any);
+    queryResultEditing: boolean;
+    private queryResultTableMappings;
+    constructor(jslid: any, structure: any, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, rows: any, isDynamicStructure: boolean, supportsReload: boolean, editable?: boolean, driver?: EngineDriver, currentSettings?: any, queryResultEditing?: boolean, dbinfo?: DatabaseInfo);
+    private getTableKey;
+    private findTable;
+    private getEditableQueryResultColumns;
+    private hasCompleteQueryResultKey;
+    isColumnEditable(uniqueName: string, row?: any): boolean;
+    getChangeSetField(row: any, uniqueName: any, insertedRowIndex: any, existingRowIndex?: any, baseNameOmitable?: boolean): import("./ChangeSet").ChangeSetFieldDefinition | {
+        pureName: string;
+        schemaName: string;
+        existingRowIndex: any;
+        condition: {};
+        uniqueName: any;
+        columnName: string;
+    };
+    getChangeSetRowDefinitions(row: any, insertedRowIndex: any, existingRowIndex: any, baseNameOmitable?: boolean): import("./ChangeSet").ChangeSetRowDefinition[] | {
+        pureName: string;
+        schemaName: string;
+        existingRowIndex: any;
+        condition: {};
+    }[];
 }

package/lib/JslGridDisplay.js

@@ -9,17 +9,28 @@ const GridDisplay_1 = require("./GridDisplay");
 const CollectionGridDisplay_1 = require("./CollectionGridDisplay");
 const dbgate_tools_1 = require("dbgate-tools");
 class JslGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(jslid, structure, config, setConfig, cache, setCache, rows, isDynamicStructure, supportsReload, editable = false, driver = null, currentSettings = null) {
+    constructor(jslid, structure, config, setConfig, cache, setCache, rows, isDynamicStructure, supportsReload, editable = false, driver = null, currentSettings = null, queryResultEditing = false, dbinfo = null) {
         var _a;
-        super(config, setConfig, cache, setCache, driver, undefined, undefined, currentSettings);
+        super(config, setConfig, cache, setCache, driver, dbinfo, undefined, currentSettings);
+        this.queryResultEditing = queryResultEditing;
+        this.queryResultTableMappings = {};
         this.filterable = true;
         this.sortable = true;
         this.supportsReload = supportsReload;
         this.isDynamicStructure = isDynamicStructure;
         this.filterBehaviourOverride = dbgate_tools_1.evalFilterBehaviour;
         this.editable = editable;
-        this.editableStructure = editable ? structure : null;
+        this.editableStructure = editable && !queryResultEditing ? structure : null;
+        if (queryResultEditing) {
+            this.allowInsert = false;
+            this.allowDelete = false;
+            this.allowStructureChange = false;
+            this.allowRowDocumentEdit = false;
+        }
         if (structure === null || structure === void 0 ? void 0 : structure.columns) {
+            const queryResultEditableColumns = queryResultEditing
+                ? this.getEditableQueryResultColumns(structure.columns, dbinfo)
+                : new Set();
             this.columns = lodash_1.default.uniqBy((_a = structure.columns
                 .map(col => ({
                 columnName: col.columnName,
@@ -28,8 +39,10 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
                 uniquePath: [col.columnName],
                 notNull: col.notNull,
                 autoIncrement: col.autoIncrement,
-                pureName: null,
-                schemaName: null,
+                pureName: queryResultEditing ? col.tableName : null,
+                schemaName: queryResultEditing ? col.tableSchema : null,
+                sourceColumnName: col.sourceColumnName,
+                queryResultEditable: queryResultEditableColumns.has(col.columnName),
             }))) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col) }))), col => col.uniqueName);
         }
         if (structure === null || structure === void 0 ? void 0 : structure.__isDynamicStructure) {
@@ -37,7 +50,118 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
         }
         if (!this.columns)
             this.columns = [];
+        if (queryResultEditing) {
+            this.editable = this.columns.some(col => col.queryResultEditable);
+        }
         this.formColumns = this.columns;
     }
+    getTableKey(schemaName, pureName) {
+        return `${schemaName || ''}\n${pureName}`;
+    }
+    findTable(dbinfo, schemaName, pureName) {
+        if (!(dbinfo === null || dbinfo === void 0 ? void 0 : dbinfo.tables))
+            return null;
+        if (schemaName) {
+            return dbinfo.tables.find(table => table.schemaName == schemaName && table.pureName == pureName);
+        }
+        const tables = dbinfo.tables.filter(table => table.pureName == pureName);
+        return tables.length == 1 ? tables[0] : null;
+    }
+    getEditableQueryResultColumns(columns, dbinfo) {
+        var _a, _b;
+        const res = new Set();
+        const groups = lodash_1.default.groupBy(columns.filter(column => column.tableName && column.sourceColumnName), column => this.getTableKey(column.tableSchema, column.tableName));
+        for (const groupColumns of Object.values(groups)) {
+            const firstColumn = groupColumns[0];
+            const table = this.findTable(dbinfo, firstColumn.tableSchema, firstColumn.tableName);
+            const sourceToDisplay = new Map(groupColumns.map(column => [column.sourceColumnName, column.columnName]));
+            const primaryKeyColumns = ((_b = (_a = table === null || table === void 0 ? void 0 : table.primaryKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(column => column.columnName)) ||
+                groupColumns.filter(column => column.isPrimaryKey).map(column => column.sourceColumnName);
+            const keyColumns = primaryKeyColumns.length > 0 && primaryKeyColumns.every(columnName => sourceToDisplay.has(columnName))
+                ? primaryKeyColumns
+                : [];
+            if (keyColumns.length == 0)
+                continue;
+            const mapping = {
+                pureName: firstColumn.tableName,
+                schemaName: firstColumn.tableSchema,
+                keyColumns,
+                keyDisplayColumns: keyColumns.map(sourceColumnName => ({
+                    sourceColumnName,
+                    displayName: sourceToDisplay.get(sourceColumnName),
+                })),
+            };
+            this.queryResultTableMappings[this.getTableKey(firstColumn.tableSchema, firstColumn.tableName)] = mapping;
+            for (const column of groupColumns) {
+                res.add(column.columnName);
+            }
+        }
+        return res;
+    }
+    hasCompleteQueryResultKey(mapping, row) {
+        return mapping.keyDisplayColumns.every(keyColumn => {
+            const value = row === null || row === void 0 ? void 0 : row[keyColumn.displayName];
+            return value !== null && value !== undefined;
+        });
+    }
+    isColumnEditable(uniqueName, row) {
+        if (!this.queryResultEditing)
+            return super.isColumnEditable(uniqueName, row);
+        const col = this.columns.find(column => column.uniqueName == uniqueName);
+        if (!(col === null || col === void 0 ? void 0 : col.queryResultEditable))
+            return false;
+        const mapping = this.queryResultTableMappings[this.getTableKey(col.schemaName, col.pureName)];
+        return !!mapping && this.hasCompleteQueryResultKey(mapping, row);
+    }
+    getChangeSetField(row, uniqueName, insertedRowIndex, existingRowIndex = null, baseNameOmitable = false) {
+        if (!this.queryResultEditing) {
+            return super.getChangeSetField(row, uniqueName, insertedRowIndex, existingRowIndex, baseNameOmitable);
+        }
+        if (insertedRowIndex != null || !this.isColumnEditable(uniqueName, row))
+            return null;
+        const col = this.columns.find(column => column.uniqueName == uniqueName);
+        if (!col)
+            return null;
+        const mapping = this.queryResultTableMappings[this.getTableKey(col.schemaName, col.pureName)];
+        if (!mapping)
+            return null;
+        if (!this.hasCompleteQueryResultKey(mapping, row))
+            return null;
+        const condition = {};
+        for (const keyColumn of mapping.keyDisplayColumns) {
+            condition[keyColumn.sourceColumnName] = row === null || row === void 0 ? void 0 : row[keyColumn.displayName];
+        }
+        if (lodash_1.default.isEmpty(condition))
+            return null;
+        return {
+            pureName: mapping.pureName,
+            schemaName: mapping.schemaName,
+            existingRowIndex,
+            condition,
+            uniqueName,
+            columnName: col.sourceColumnName,
+        };
+    }
+    getChangeSetRowDefinitions(row, insertedRowIndex, existingRowIndex, baseNameOmitable = false) {
+        if (!this.queryResultEditing) {
+            return super.getChangeSetRowDefinitions(row, insertedRowIndex, existingRowIndex, baseNameOmitable);
+        }
+        if (insertedRowIndex != null)
+            return [];
+        return Object.values(this.queryResultTableMappings)
+            .filter(mapping => this.hasCompleteQueryResultKey(mapping, row))
+            .map(mapping => {
+            const condition = {};
+            for (const keyColumn of mapping.keyDisplayColumns) {
+                condition[keyColumn.sourceColumnName] = row === null || row === void 0 ? void 0 : row[keyColumn.displayName];
+            }
+            return {
+                pureName: mapping.pureName,
+                schemaName: mapping.schemaName,
+                existingRowIndex,
+                condition,
+            };
+        });
+    }
 }
 exports.JslGridDisplay = JslGridDisplay;

package/lib/QueryResultChangeSet.d.ts

@@ -0,0 +1,5 @@
+import type { QueryResultColumn } from 'dbgate-types';
+import { ChangeSet } from './ChangeSet';
+export declare function createQueryResultSaveChangeSet(changeSet: ChangeSet, structure: {
+    columns?: QueryResultColumn[];
+}): ChangeSet;

package/lib/QueryResultChangeSet.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createQueryResultSaveChangeSet = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const ChangeSet_1 = require("./ChangeSet");
+function createQueryResultSaveChangeSet(changeSet, structure) {
+    const res = (0, ChangeSet_1.createChangeSet)();
+    const columnMap = lodash_1.default.keyBy(((structure === null || structure === void 0 ? void 0 : structure.columns) || []).filter(column => column.tableName && column.sourceColumnName), 'columnName');
+    res.updates = ((changeSet === null || changeSet === void 0 ? void 0 : changeSet.updates) || [])
+        .map(update => {
+        const fields = {};
+        for (const fieldName of Object.keys(update.fields || {})) {
+            const column = columnMap[fieldName];
+            if (!column)
+                continue;
+            fields[column.sourceColumnName] = update.fields[fieldName];
+        }
+        if (lodash_1.default.isEmpty(fields))
+            return null;
+        return {
+            pureName: update.pureName,
+            schemaName: update.schemaName,
+            condition: update.condition,
+            fields,
+        };
+    })
+        .filter(Boolean);
+    return res;
+}
+exports.createQueryResultSaveChangeSet = createQueryResultSaveChangeSet;

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './PerspectiveTreeNode';
 export * from './TableGridDisplay';
 export * from './ViewGridDisplay';
 export * from './JslGridDisplay';
+export * from './QueryResultChangeSet';
 export * from './ChangeSet';
 export * from './MacroDefinition';
 export * from './runMacro';

package/lib/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./PerspectiveTreeNode"), exports);
 __exportStar(require("./TableGridDisplay"), exports);
 __exportStar(require("./ViewGridDisplay"), exports);
 __exportStar(require("./JslGridDisplay"), exports);
+__exportStar(require("./QueryResultChangeSet"), exports);
 __exportStar(require("./ChangeSet"), exports);
 __exportStar(require("./MacroDefinition"), exports);
 __exportStar(require("./runMacro"), exports);

package/package.json

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