From fe3e7bda59e2608214ab62582b15e375378f00ed Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Tue, 1 Mar 2022 16:01:35 +0300 Subject: [PATCH 1/2] fix(plugin-data-viewer): CB-1737 --- .../Actions/ResultSet/ResultSetConstraintAction.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts index 9cb0f2e40e..9e5a0e627f 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts @@ -255,7 +255,12 @@ export class ResultSetConstraintAction extends DatabaseDataAction column.label === prevColumn.label); + let column = nextResult.data?.columns?.find(column => column.position === prevColumn.position); + + if (!column || column.label !== prevColumn.label) { + column = nextResult.data?.columns?.find(column => column.label === prevColumn.label); + } + if (column && prevColumn.position !== column.position) { const prevConstraint = this.source.prevOptions?.constraints From dccdf229dc69bbfce3146760b3a87cf5decd620b Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Tue, 1 Mar 2022 16:02:52 +0300 Subject: [PATCH 2/2] fix(plugin-data-viewer): CB-1737 find column by position --- .../Actions/ResultSet/ResultSetConstraintAction.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts index 9e5a0e627f..d40c44c3df 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts @@ -261,7 +261,6 @@ export class ResultSetConstraintAction extends DatabaseDataAction column.label === prevColumn.label); } - if (column && prevColumn.position !== column.position) { const prevConstraint = this.source.prevOptions?.constraints .find(prevConstraint => prevConstraint.attributePosition === constraint.attributePosition);