dbgate-datalib 5.1.0 → 5.1.1

package/lib/processPerspectiveDefaultColunns.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processPerspectiveDefaultColunns = exports.shouldProcessPerspectiveDefaultColunns = exports.perspectiveNodesHaveStructure = void 0;
+const dbgate_tools_1 = require("dbgate-tools");
+const PerspectiveTreeNode_1 = require("./PerspectiveTreeNode");
+function getPerspectiveDefaultColumns(table, db, circularColumns) {
+    const columns = table.columns.map(x => x.columnName);
+    const predicates = [
+        x => x.toLowerCase() == 'name',
+        x => x.toLowerCase() == 'title',
+        x => x.toLowerCase().includes('name'),
+        x => x.toLowerCase().includes('title'),
+        x => x.toLowerCase().includes('subject'),
+        // x => x.toLowerCase().includes('text'),
+        // x => x.toLowerCase().includes('desc'),
+        x => {
+            var _a, _b, _c;
+            return (_c = (_b = (_a = table.columns
+                .find(y => y.columnName == x)) === null || _a === void 0 ? void 0 : _a.dataType) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes('char');
+        },
+    ];
+    for (const predicate of predicates) {
+        const col = columns.find(predicate);
+        if (col)
+            return [[col], null];
+    }
+    if (circularColumns) {
+        const keyPredicates = [
+            x => { var _a, _b; return ((_b = (_a = (0, dbgate_tools_1.findForeignKeyForColumn)(table, x)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.length) == 1 && !circularColumns.includes(x); },
+            x => { var _a, _b; return ((_b = (_a = (0, dbgate_tools_1.findForeignKeyForColumn)(table, x)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.length) == 1; },
+        ];
+        for (const predicate of keyPredicates) {
+            const col = columns.find(predicate);
+            if (col)
+                return [null, [col]];
+        }
+    }
+    return [[columns[0]], null];
+}
+function perspectiveNodesHaveStructure(config, dbInfos, conid, database) {
+    var _a;
+    for (const node of config.nodes) {
+        const db = (_a = dbInfos === null || dbInfos === void 0 ? void 0 : dbInfos[node.conid || conid]) === null || _a === void 0 ? void 0 : _a[node.database || database];
+        if (!db)
+            return false;
+        const table = db.tables.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+        const view = db.views.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+        if (!table && !view)
+            return false;
+    }
+    return true;
+}
+exports.perspectiveNodesHaveStructure = perspectiveNodesHaveStructure;
+function shouldProcessPerspectiveDefaultColunns(config, dbInfos, conid, database) {
+    const nodesNotProcessed = config.nodes.filter(x => !x.defaultColumnsProcessed);
+    if (nodesNotProcessed.length == 0)
+        return false;
+    return perspectiveNodesHaveStructure(config, dbInfos, conid, database);
+}
+exports.shouldProcessPerspectiveDefaultColunns = shouldProcessPerspectiveDefaultColunns;
+function processPerspectiveDefaultColunnsStep(config, dbInfos, conid, database) {
+    var _a, _b;
+    const rootNode = config.nodes.find(x => x.designerId == config.rootDesignerId);
+    if (!rootNode)
+        return null;
+    const rootDb = (_a = dbInfos === null || dbInfos === void 0 ? void 0 : dbInfos[rootNode.conid || conid]) === null || _a === void 0 ? void 0 : _a[rootNode.database || database];
+    if (!rootDb)
+        return null;
+    const rootTable = rootDb.tables.find(x => x.pureName == rootNode.pureName && x.schemaName == rootNode.schemaName);
+    const rootView = rootDb.views.find(x => x.pureName == rootNode.pureName && x.schemaName == rootNode.schemaName);
+    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(rootTable || rootView, dbInfos, config, null, null, { conid, database }, null, config.rootDesignerId);
+    for (const node of config.nodes) {
+        if (node.defaultColumnsProcessed)
+            continue;
+        const db = (_b = dbInfos === null || dbInfos === void 0 ? void 0 : dbInfos[node.conid || conid]) === null || _b === void 0 ? void 0 : _b[node.database || database];
+        if (!db)
+            continue;
+        const table = db.tables.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+        const view = db.views.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+        if (table || view) {
+            const treeNode = root.findNodeByDesignerId(node.designerId);
+            if (!treeNode) {
+                const [defaultColumns] = getPerspectiveDefaultColumns(table || view, db, null);
+                return Object.assign(Object.assign({}, config), { nodes: config.nodes.map(n => n.designerId == node.designerId
+                        ? Object.assign(Object.assign({}, n), { defaultColumnsProcessed: true, checkedColumns: defaultColumns }) : n) });
+            }
+            const circularColumns = treeNode.childNodes.filter(x => x.isCircular).map(x => x.columnName);
+            const [defaultColumns, defaultRefs] = getPerspectiveDefaultColumns(table || view, db, circularColumns);
+            if (defaultRefs) {
+                const childNode = treeNode.childNodes.find(x => x.columnName == defaultRefs[0]);
+                if (childNode === null || childNode === void 0 ? void 0 : childNode.designerId) {
+                    return Object.assign(Object.assign({}, config), { nodes: config.nodes.map(n => n.designerId == childNode.designerId
+                            ? Object.assign(Object.assign({}, n), { isNodeChecked: true }) : n.designerId == node.designerId
+                            ? Object.assign(Object.assign({}, n), { defaultColumnsProcessed: true }) : n) });
+                }
+                else if (childNode) {
+                    const [newConfig, nodeConfig] = childNode.ensureNodeConfig(config);
+                    nodeConfig.isNodeChecked = true;
+                    return Object.assign(Object.assign({}, newConfig), { nodes: newConfig.nodes.map(n => n.designerId == node.designerId
+                            ? Object.assign(Object.assign({}, n), { defaultColumnsProcessed: true }) : n) });
+                }
+            }
+            else {
+                return Object.assign(Object.assign({}, config), { nodes: config.nodes.map(n => n.designerId == node.designerId
+                        ? Object.assign(Object.assign({}, n), { defaultColumnsProcessed: true, checkedColumns: defaultColumns }) : n) });
+            }
+        }
+    }
+    return null;
+}
+function markAllProcessed(config) {
+    return Object.assign(Object.assign({}, config), { nodes: config.nodes.map(x => (Object.assign(Object.assign({}, x), { defaultColumnsProcessed: true }))) });
+}
+function processPerspectiveDefaultColunns(config, dbInfos, conid, database) {
+    while (config.nodes.filter(x => !x.defaultColumnsProcessed).length > 0) {
+        const newConfig = processPerspectiveDefaultColunnsStep(config, dbInfos, conid, database);
+        if (!newConfig) {
+            return markAllProcessed(config);
+        }
+        if (newConfig.nodes.filter(x => x.defaultColumnsProcessed).length <=
+            config.nodes.filter(x => x.defaultColumnsProcessed).length) {
+            return markAllProcessed(config);
+        }
+        config = newConfig;
+    }
+    return markAllProcessed(config);
+}
+exports.processPerspectiveDefaultColunns = processPerspectiveDefaultColunns;

package/lib/tests/PerspectiveDisplay.test.js

@@ -10,46 +10,47 @@ const PerspectiveConfig_1 = require("../PerspectiveConfig");
 const artistDataFlat_1 = __importDefault(require("./artistDataFlat"));
 const artistDataAlbum_1 = __importDefault(require("./artistDataAlbum"));
 const artistDataAlbumTrack_1 = __importDefault(require("./artistDataAlbumTrack"));
+const processPerspectiveDefaultColunns_1 = require("../processPerspectiveDefaultColunns");
 test('test flat view', () => {
     const artistTable = chinookDbInfo_1.chinookDbInfo.tables.find(x => x.pureName == 'Artist');
-    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, (0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' }), null, null, { conid: 'conid', database: 'db' }, null);
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)((0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' }), { conid: { db: chinookDbInfo_1.chinookDbInfo } }, 'conid', 'db');
+    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, configColumns, null, null, { conid: 'conid', database: 'db' }, null, configColumns.rootDesignerId);
     const display = new PerspectiveDisplay_1.PerspectiveDisplay(root, artistDataFlat_1.default);
-    // console.log(display.loadIndicatorsCounts);
-    // console.log(display.rows);
     expect(display.rows.length).toEqual(4);
-    expect(display.rows[0]).toEqual(expect.objectContaining({
-        rowData: ['AC/DC'],
-    }));
+    expect(display.rows[0].rowData).toEqual(['AC/DC']);
     expect(display.loadIndicatorsCounts).toEqual({
         Artist: 4,
     });
 });
 test('test one level nesting', () => {
     const artistTable = chinookDbInfo_1.chinookDbInfo.tables.find(x => x.pureName == 'Artist');
-    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, Object.assign(Object.assign({}, (0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' })), { checkedColumns: ['Artist::Album'] }), null, null, { conid: 'conid', database: 'db' }, null);
+    const config = (0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' });
+    config.nodes.push((0, PerspectiveConfig_1.createPerspectiveNodeConfig)({ pureName: 'Album' }));
+    config.references.push({
+        sourceId: config.nodes[0].designerId,
+        targetId: config.nodes[1].designerId,
+        designerId: '1',
+        columns: [{ source: 'ArtistId', target: 'ArtistId' }],
+    });
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, 'conid', 'db');
+    // const config = createPerspectiveConfig({ pureName: 'Artist' });
+    // config.nodes[0].checkedColumns = ['Album'];
+    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, configColumns, null, null, { conid: 'conid', database: 'db' }, null, configColumns.nodes[0].designerId);
     const display = new PerspectiveDisplay_1.PerspectiveDisplay(root, artistDataAlbum_1.default);
     console.log(display.loadIndicatorsCounts);
     // console.log(display.rows);
     expect(display.rows.length).toEqual(6);
-    expect(display.rows[0]).toEqual(expect.objectContaining({
-        rowData: ['AC/DC', 'For Those About To Rock We Salute You'],
-        rowSpans: [2, 1],
-        rowCellSkips: [false, false],
-    }));
-    expect(display.rows[1]).toEqual(expect.objectContaining({
-        rowData: [undefined, 'Let There Be Rock'],
-        rowSpans: [1, 1],
-        rowCellSkips: [true, false],
-    }));
-    expect(display.rows[2]).toEqual(expect.objectContaining({
-        rowData: ['Accept', 'Balls to the Wall'],
-        rowSpans: [2, 1],
-        rowCellSkips: [false, false],
-    }));
-    expect(display.rows[5]).toEqual(expect.objectContaining({
-        rowData: ['Alanis Morissette', 'Jagged Little Pill'],
-        rowSpans: [1, 1],
-    }));
+    expect(display.rows[0].rowData).toEqual(['AC/DC', 'For Those About To Rock We Salute You']);
+    expect(display.rows[0].rowSpans).toEqual([2, 1]);
+    expect(display.rows[0].rowCellSkips).toEqual([false, false]);
+    expect(display.rows[1].rowData).toEqual([undefined, 'Let There Be Rock']);
+    expect(display.rows[1].rowSpans).toEqual([1, 1]);
+    expect(display.rows[1].rowCellSkips).toEqual([true, false]);
+    expect(display.rows[2].rowData).toEqual(['Accept', 'Balls to the Wall']);
+    expect(display.rows[2].rowSpans).toEqual([2, 1]);
+    expect(display.rows[2].rowCellSkips).toEqual([false, false]);
+    expect(display.rows[5].rowData).toEqual(['Alanis Morissette', 'Jagged Little Pill']);
+    expect(display.rows[5].rowSpans).toEqual([1, 1]);
     expect(display.loadIndicatorsCounts).toEqual({
         Artist: 6,
         'Artist.Album': 6,
@@ -57,23 +58,37 @@ test('test one level nesting', () => {
 });
 test('test two level nesting', () => {
     const artistTable = chinookDbInfo_1.chinookDbInfo.tables.find(x => x.pureName == 'Artist');
-    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, Object.assign(Object.assign({}, (0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' })), { checkedColumns: ['Artist::Album', 'Artist::Album::Track'] }), null, null, { conid: 'conid', database: 'db' }, null);
+    const config = (0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' });
+    config.nodes.push((0, PerspectiveConfig_1.createPerspectiveNodeConfig)({ pureName: 'Album' }));
+    config.nodes.push((0, PerspectiveConfig_1.createPerspectiveNodeConfig)({ pureName: 'Track' }));
+    config.references.push({
+        sourceId: config.nodes[0].designerId,
+        targetId: config.nodes[1].designerId,
+        designerId: '1',
+        columns: [{ source: 'ArtistId', target: 'ArtistId' }],
+    });
+    config.references.push({
+        sourceId: config.nodes[1].designerId,
+        targetId: config.nodes[2].designerId,
+        designerId: '2',
+        columns: [{ source: 'AlbumId', target: 'AlbumId' }],
+    });
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, 'conid', 'db');
+    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, configColumns, null, null, { conid: 'conid', database: 'db' }, null, configColumns.nodes[0].designerId);
     const display = new PerspectiveDisplay_1.PerspectiveDisplay(root, artistDataAlbumTrack_1.default);
     console.log(display.rows);
     expect(display.rows.length).toEqual(8);
-    expect(display.rows[0]).toEqual(expect.objectContaining({
-        rowData: ['AC/DC', 'For Those About To Rock We Salute You', 'For Those About To Rock (We Salute You)'],
-        rowSpans: [4, 2, 1],
-        rowCellSkips: [false, false, false],
-    }));
-    expect(display.rows[1]).toEqual(expect.objectContaining({
-        rowData: [undefined, undefined, 'Put The Finger On You'],
-        rowSpans: [1, 1, 1],
-        rowCellSkips: [true, true, false],
-    }));
-    expect(display.rows[2]).toEqual(expect.objectContaining({
-        rowData: [undefined, 'Let There Be Rock', 'Go Down'],
-        rowSpans: [1, 2, 1],
-        rowCellSkips: [true, false, false],
-    }));
+    expect(display.rows[0].rowData).toEqual([
+        'AC/DC',
+        'For Those About To Rock We Salute You',
+        'For Those About To Rock (We Salute You)',
+    ]);
+    expect(display.rows[0].rowSpans).toEqual([4, 2, 1]);
+    expect(display.rows[0].rowCellSkips).toEqual([false, false, false]);
+    expect(display.rows[1].rowData).toEqual([undefined, undefined, 'Put The Finger On You']);
+    expect(display.rows[1].rowSpans).toEqual([1, 1, 1]);
+    expect(display.rows[1].rowCellSkips).toEqual([true, true, false]);
+    expect(display.rows[2].rowData).toEqual([undefined, 'Let There Be Rock', 'Go Down']);
+    expect(display.rows[2].rowSpans).toEqual([1, 2, 1]);
+    expect(display.rows[2].rowCellSkips).toEqual([true, false, false]);
 });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.0",
+  "version": "5.1.1",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,12 +13,12 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^5.1.0",
-    "dbgate-tools": "^5.1.0",
-    "dbgate-filterparser": "^5.1.0"
+    "dbgate-sqltree": "^5.1.1",
+    "dbgate-tools": "^5.1.1",
+    "dbgate-filterparser": "^5.1.1"
   },
   "devDependencies": {
-    "dbgate-types": "^5.1.0",
+    "dbgate-types": "^5.1.1",
     "@types/node": "^13.7.0",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",

package/lib/getPerspectiveDefaultColumns.d.ts

@@ -1,2 +0,0 @@
-import { DatabaseInfo, TableInfo, ViewInfo } from 'dbgate-types';
-export declare function getPerspectiveDefaultColumns(table: TableInfo | ViewInfo, db: DatabaseInfo, circularColumns: string[]): string[];

package/lib/getPerspectiveDefaultColumns.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPerspectiveDefaultColumns = void 0;
-const dbgate_tools_1 = require("dbgate-tools");
-function getPerspectiveDefaultColumns(table, db, circularColumns) {
-    const columns = table.columns.map(x => x.columnName);
-    const predicates = [
-        x => x.toLowerCase() == 'name',
-        x => x.toLowerCase() == 'title',
-        x => x.toLowerCase().includes('name'),
-        x => x.toLowerCase().includes('title'),
-        x => x.toLowerCase().includes('subject'),
-        // x => x.toLowerCase().includes('text'),
-        // x => x.toLowerCase().includes('desc'),
-        x => {
-            var _a, _b, _c;
-            return (_c = (_b = (_a = table.columns
-                .find(y => y.columnName == x)) === null || _a === void 0 ? void 0 : _a.dataType) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes('char');
-        },
-        x => { var _a, _b; return ((_b = (_a = (0, dbgate_tools_1.findForeignKeyForColumn)(table, x)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.length) == 1 && !circularColumns.includes(x); },
-        x => { var _a, _b; return ((_b = (_a = (0, dbgate_tools_1.findForeignKeyForColumn)(table, x)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.length) == 1; },
-    ];
-    for (const predicate of predicates) {
-        const col = columns.find(predicate);
-        if (col)
-            return [col];
-    }
-    return [columns[0]];
-}
-exports.getPerspectiveDefaultColumns = getPerspectiveDefaultColumns;