From a76530155d0249cb67ecc0143cd13bc33b219887 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 28 Jul 2022 21:02:24 +0200 Subject: [PATCH] filter child tables --- .vscode/settings.json | 5 ++++- packages/datalib/src/PerspectiveTreeNode.ts | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bae22e49c..14d16bbc2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,6 @@ { - "jestrunner.jestCommand": "node_modules/.bin/cross-env DEVMODE=1 LOCALTEST=1 node_modules/.bin/jest" + "jestrunner.jestCommand": "node_modules/.bin/cross-env DEVMODE=1 LOCALTEST=1 node_modules/.bin/jest", + "cSpell.words": [ + "dbgate" + ] } \ No newline at end of file diff --git a/packages/datalib/src/PerspectiveTreeNode.ts b/packages/datalib/src/PerspectiveTreeNode.ts index 015117be8..ab8346eec 100644 --- a/packages/datalib/src/PerspectiveTreeNode.ts +++ b/packages/datalib/src/PerspectiveTreeNode.ts @@ -238,6 +238,7 @@ export class PerspectiveTableColumnNode extends PerspectiveTreeNode { dataColumns: this.getDataLoadColumns(), databaseConfig: this.databaseConfig, orderBy: this.refTable?.primaryKey?.columns.map(x => x.columnName) || [this.refTable.columns[0].columnName], + condition: this.getChildrenCondition(), }; } @@ -397,6 +398,7 @@ export class PerspectiveTableReferenceNode extends PerspectiveTableNode { dataColumns: this.getDataLoadColumns(), databaseConfig: this.databaseConfig, orderBy: this.table.primaryKey?.columns.map(x => x.columnName) || [this.table.columns[0].columnName], + condition: this.getChildrenCondition(), }; }