dbeaver/pro#7562 [CB] keep data editor filter state after reconnect by SychevAndrey · Pull Request #4238 · dbeaver/cloudbeaver

SychevAndrey · 2026-03-25T09:42:05Z

No description provided.

allow using attrName without attrPosition

replaced private restorePendingState() with public restoreViewState(pinnedColumnNames, columnOrderNames?) that takes data directly as arguments

bug with skipping constraints if any without a position. if (!prevColumn) { return; }

… in GridViewAction

sergeyteleshev · 2026-03-26T13:47:29Z

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridViewAction.ts

+        if (!usedIndices.has(key)) {
+          newOrder.push(key);
+        }
+      }


What does this check stand for?
What columns didn't we see in the previous cycle above?

The answer is the same as for indecies. Someone could edit our table and add some columns. So we will not have them in our orderColumns array. Here we put them in the end (I am open to other solutions)

sergeyteleshev · 2026-03-26T13:55:59Z

webapp/packages/plugin-data-viewer/src/DataViewerTableState/IDataViewerPersistedState.ts

+export interface IDataViewerPersistedState {
+  constraints: IPersistedConstraint[];
+  whereFilter: string;
+  pinnedColumns: string[];


I'm a bit confused that we use column names as unique identifiers. This feels tricky and has a bug potential
In most of DBs it is forbidden to name 2 columns with the same name it is true. But is it in all DBs? I have a little doubt here

Also we can have this kind of case:
SELECT a AS col, b AS col FROM table;

We execute this in sql editor. See the table. What would happen? Is there a chance one of the columns disappears? Or any other related bug happened?

My suggestion is to add unique index for each column and it will resolve a lot of potential issues

what will be the index then? How would you resolve it if someone added a column or two while you was working on something else and then reopen the table?

what will be the index then?

The backend sends the id for each column

How would you resolve it if someone added a column or two while you were working on something else and then reopened the table?

Maybe append it to the end or the beginning of the current view?

sergeyteleshev · 2026-03-26T14:36:03Z

webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerPanel.ts

+          console.warn('[DataViewerTableState] Auto-save failed', exception);
+        }
+      },
+      { delay: 1000, fireImmediately: false, equals: comparer.structural },


maybe we can not throttle it after any changes, but debounce? like save the state once in 5 seconds after any change?

Does it spam the table with requests every second if you're actively working with it? if so debounce would reduce amount of requests to save the whole state

ok I see. I don't think it's a big problem with comparing on each action, but I guess the deep equal is overhead here, so I just simplify it a bit and let MobX compare by pointer. You should make 1000 operation/sec to make it lag :) effect is already delayed, I guess 5 sec is too much, localstorage is fast enough and the size of saved object is relatively small until someone has thousands of columns and pinned half of them

sergeyteleshev · 2026-03-26T14:38:47Z

webapp/packages/plugin-data-viewer/src/DataViewerTableState/DataViewerTableStateService.ts

+  private validateState(data: IDataViewerPersistedState): boolean {
+    if (!data || typeof data !== 'object') {
+      return false;
+    }
+
+    if (!Array.isArray(data.constraints)) {
+      return false;
+    }
+
+    for (const c of data.constraints) {
+      if (!c || typeof c.attributeName !== 'string' || c.attributeName.length === 0) {
+        return false;
+      }
+    }
+
+    if (typeof data.whereFilter !== 'string') {
+      return false;
+    }
+
+    if (!Array.isArray(data.pinnedColumns) || !data.pinnedColumns.every(c => typeof c === 'string')) {
+      return false;
+    }
+
+    if (data.columnOrder !== undefined && (!Array.isArray(data.columnOrder) || !data.columnOrder.every(c => typeof c === 'string'))) {
+      return false;
+    }
+
+    return true;
+  }


seems like zod is gonna be quite handy here

…Panel

webapp/packages/plugin-data-viewer/src/DataViewerTableState/DataViewerTableStateService.ts

…-reconnect

…of github.com:dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-after-reconnect

…idViewAction

…nt to unknown

devnaumov · 2026-03-27T16:23:49Z

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridViewAction.ts

+    return this.columnKeys
+      .filter(key => this.isColumnPinned(key))
+      .map(key => this.getColumnName(key))
+      .filter((name): name is string => name !== undefined);


we can use isDefined for that

devnaumov · 2026-03-27T16:51:46Z

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridViewAction.ts

+        const name = this.getColumnName(key);
+
+        if (name) {
+          nameToIndex.set(name, key.index);


seems like we need to add new function, something like getColumnIndexByName

devnaumov · 2026-03-27T16:53:00Z

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridViewAction.ts

+    if (pinnedColumnNames.length > 0) {
+      const keys = pinnedColumnNames
+        .map(name => this.columnKeys.find(k => this.getColumnName(k) === name))
+        .filter((k): k is IGridColumnKey => k !== undefined);


devnaumov · 2026-03-27T16:56:14Z

...pp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataConstraintAction.ts

    updateConstraintsForResult(this.source, result);
  }
+
+  private getColumnNameByPosition(attributePosition: number): string | undefined {


probably it should be implemented on the GridViewAction level as we might need it in different places, we have similar logic there, in general, logic that find data column by certain criteria should be gathered in one place and be accessible from different places. Also we have similar logic inside useTableData

i think it's better to implement on the GridDataResultAction side, but there is problem GridDataResultAction is abstraction over grid structures, but this function is requires specific ResultSet data type, so it should be implemented in the ResultSetDataAction and can be abstract in the GridDataResultAction

Wroud · 2026-03-30T09:23:14Z

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridViewAction.ts

    }
  }
+
+  restoreViewState(pinnedColumnNames: string[], columnOrderNames?: string[]): void {


i think it's better to pass an interface as a single argument to this function, so it can be easily extended if needed

Wroud · 2026-03-30T09:27:40Z

...pp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataConstraintAction.ts

    updateConstraintsForResult(this.source, result);
  }
+
+  private getColumnNameByPosition(attributePosition: number): string | undefined {


i think it's better to implement on the GridDataResultAction side, but there is problem GridDataResultAction is abstraction over grid structures, but this function is requires specific ResultSet data type, so it should be implemented in the ResultSetDataAction and can be abstract in the GridDataResultAction

Wroud · 2026-03-30T09:30:43Z

webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerPanel.ts

+    let viewStateRestored = false;
+
+    const cancelViewRestore = hasViewState
+      ? reaction(


since you using reaction here, it will be much easier to have some state interface, and read-mutate it directly in the database data actions, so it will be automatically synced and restored

i think you can introduce the new database data action for persisted state and re-use it in the actions

…-reconnect

codacy-production · 2026-04-02T08:29:12Z

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

🟢 Metrics 0 complexity

Metric Results

Complexity 0

View in Codacy

_{TIP This summary will be updated as you push new changes. Give us feedback}

… centralized state persistence

…-reconnect

…LDataFilter" This reverts commit 3e0e86f. Last test showed that we don't need any additional logic on BE. It handles all constraints properly.

SychevAndrey added 6 commits March 24, 2026 17:33

dbeaver/pro#7562 feat: persist data editor filter state after reconnect

1458076

dbeaver/pro#7562 feat: update data viewer to persist filter state

98de428

dbeaver/pro#7562 feat: enhance constraint resolution in WebSQLDataFilter

3e0e86f

allow using attrName without attrPosition

dbeaver/pro#7562 refactor: don't use options

472815d

replaced private restorePendingState() with public restoreViewState(pinnedColumnNames, columnOrderNames?) that takes data directly as arguments

dbeaver/pro#7562 fix: stale constraints in UI

6b2f4f9

bug with skipping constraints if any without a position. if (!prevColumn) { return; }

dbeaver/pro#7562 refactor: add method to retrieve pinned column names…

52dd2b8

… in GridViewAction

SychevAndrey marked this pull request as ready for review March 26, 2026 11:12

SychevAndrey requested review from Nexus6v2, Wroud, devnaumov, sergeyteleshev and yagudin10 March 26, 2026 11:12

SychevAndrey changed the title ~~7562 cb keep data editor filter state after reconnect~~ dbeaver/pro#7562 [CB] keep data editor filter state after reconnect Mar 26, 2026

SychevAndrey self-assigned this Mar 26, 2026

sergeyteleshev reviewed Mar 26, 2026

View reviewed changes

dbeaver/pro#7562 refactor: simplify state validation using schema

0517067

SychevAndrey requested a review from sergeyteleshev March 26, 2026 15:47

Nexus6v2 previously approved these changes Mar 26, 2026

View reviewed changes

dbeaver/pro#7562 refactor: simplify state management in useDataViewer…

8038250

…Panel

SychevAndrey dismissed Nexus6v2’s stale review via 8038250 March 26, 2026 16:18

Wroud requested changes Mar 26, 2026

View reviewed changes

webapp/packages/plugin-data-viewer/src/DataViewerTableState/DataViewerTableStateService.ts Outdated Show resolved Hide resolved

SychevAndrey and others added 8 commits March 27, 2026 11:28

Merge branch 'devel' into 7562-cb-keep-data-editor-filter-state-after…

b897cc2

…-reconnect

dbeaver/pro#7562 refactor: move persisted state to IDataViewerPageState

e3563d4

Merge branch '7562-cb-keep-data-editor-filter-state-after-reconnect' …

1c0eea7

…of github.com:dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-after-reconnect

dbeaver/pro#7562 fix: initial pageState

9d26ed9

dbeaver/pro#7562 refactor: simplify getPinnedColumnNames method in Gr…

17e733e

…idViewAction

dbeaver/pro#7562 refactor: shadowed column renamed to c for clarity

3ba78e6

dbeaver/pro#7562 refactor: change type of value in IPersistedConstrai…

a7bd511

…nt to unknown

dbeaver/pro#7562 refactor: remove manual state operations

576cfeb

SychevAndrey requested a review from Wroud March 27, 2026 11:49

devnaumov reviewed Mar 27, 2026

View reviewed changes

Wroud requested changes Mar 30, 2026

View reviewed changes

Merge branch 'devel' into 7562-cb-keep-data-editor-filter-state-after…

f1f5a6c

…-reconnect

SychevAndrey and others added 8 commits April 2, 2026 17:50

dbeaver/pro#7562 refactor: introduce DatabasePersistedStateAction for…

281c3dd

… centralized state persistence

Merge branch 'devel' into 7562-cb-keep-data-editor-filter-state-after…

7cdb1a9

…-reconnect

Merge branch 'devel' into 7562-cb-keep-data-editor-filter-state-after…

64fe0ae

…-reconnect

dbeaver/pro#7562 fix

32cb99d

dbeaver/pro#7562 refactor: replace reaction with when

04bec45

Revert "dbeaver/pro#7562 feat: enhance constraint resolution in WebSQ…

98d7c92

…LDataFilter" This reverts commit 3e0e86f. Last test showed that we don't need any additional logic on BE. It handles all constraints properly.

dbeaver/pro#7562 fix: make pinColumns optional

b228b7b

dbeaver/pro#7562 refactor: simplify pinned column handling

094c231

SychevAndrey requested a review from Wroud April 3, 2026 12:43

SychevAndrey closed this Apr 3, 2026

SychevAndrey deleted the 7562-cb-keep-data-editor-filter-state-after-reconnect branch April 3, 2026 12:46

Conversation

SychevAndrey commented Mar 25, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codacy-production bot commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Up to standards ✅

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codacy-production bot commented Apr 2, 2026 •

edited

Loading