dbeaver/pro#7562 [CB] keep data editor filter state during session#4261
Open
SychevAndrey wants to merge 31 commits intodevelfrom
Open
dbeaver/pro#7562 [CB] keep data editor filter state during session#4261SychevAndrey wants to merge 31 commits intodevelfrom
SychevAndrey wants to merge 31 commits intodevelfrom
Conversation
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
…of github.com:dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-after-reconnect
… centralized state persistence
…LDataFilter" This reverts commit 3e0e86f. Last test showed that we don't need any additional logic on BE. It handles all constraints properly.
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 4 |
TIP This summary will be updated as you push new changes. Give us feedback
Wroud
requested changes
Apr 3, 2026
| { | ||
| static dataFormat: ResultDataFormat[] | null = null; | ||
|
|
||
| private store: Record<string, unknown> = {}; |
Member
There was a problem hiding this comment.
please initialize it in the constructor and make it observable.ref
Member
There was a problem hiding this comment.
Seems like Its still not in the constructor
webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridDataResultAction.ts
Outdated
Show resolved
Hide resolved
…Action constructor as observable
…nNameAt for clarity
…e level, simplify persisted state sync - Make DatabasePersistedStateAction a standalone class on DatabaseDataSource instead of per-result action - Convert options to getter - Auto-sync constraints to persisted state via autorun + action batching - Restore view state (pinned columns, column order) in GridViewAction constructor
devnaumov
requested changes
Apr 10, 2026
| { | ||
| static dataFormat: ResultDataFormat[] | null = null; | ||
|
|
||
| private store: Record<string, unknown> = {}; |
Member
There was a problem hiding this comment.
Seems like Its still not in the constructor
webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Grid/GridDataResultAction.ts
Outdated
Show resolved
Hide resolved
| try { | ||
| const persistedState = pageState?.persistedState; | ||
|
|
||
| if (persistedState && validatePersistedState(persistedState) && model.source.options) { |
Member
There was a problem hiding this comment.
What should throw here? validatePersistedState uses .safeParse which does not throw
Wroud
requested changes
Apr 11, 2026
...ges/plugin-data-viewer/src/DatabaseDataModel/Actions/General/DatabasePersistedStateAction.ts
Outdated
Show resolved
Hide resolved
...p/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabasePersistedStateAction.ts
Outdated
Show resolved
Hide resolved
…DatabasePersistedStateStore and update related references
…f github.com:dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-during-session
Wroud
reviewed
Apr 14, 2026
Comment on lines
+47
to
+64
| private applyPersistedConstraints(): void { | ||
| const options = this.source.options; | ||
|
|
||
| if (!options || !validatePersistedState(this.store)) { | ||
| return; | ||
| } | ||
|
|
||
| if ('constraints' in options && 'whereFilter' in options) { | ||
| options.constraints = this.store.constraints.map(c => ({ | ||
| attributeName: c.attributeName, | ||
| operator: c.operator, | ||
| value: c.value, | ||
| orderAsc: c.orderAsc, | ||
| orderPosition: c.orderPosition, | ||
| })); | ||
| options.whereFilter = this.store.whereFilter || ''; | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
please move to result set data source
Comment on lines
+344
to
+351
| for (const name of pinnedColumnNames) { | ||
| const key = this.columnKeys.find(k => this.getColumnName(k) === name); | ||
|
|
||
| if (key) { | ||
| this.pinnedColumns.add(GridDataKeysUtils.serialize(key)); | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
i will suggest to move validation logic for pinned columns and columns order to the updateResult method
| ps.set(COLUMN_ORDER_KEY, isCustomOrder ? columnNames : []); | ||
| } | ||
|
|
||
| restoreViewState(state: IRestoreViewState): void { |
Member
There was a problem hiding this comment.
try to use direct states from store instead of syncing private properties with state
| return this.result.data?.columns?.find(c => c.position === colIdx)?.name; | ||
| } | ||
|
|
||
| private persistConstraints(): void { |
Member
There was a problem hiding this comment.
we need to persist datasource options object (whereFilter) maybe it will be better to persist constraints in the same place instead of splitting it across classes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.