dbeaver/dbeaver-vscode#83 refactor: data grid #3265
Merged
Conversation
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
sergeyteleshev
previously approved these changes
Feb 14, 2025
...pp/packages/plugin-data-viewer-result-trace-details/src/DVResultTraceDetailsPresentation.tsx
Outdated
Show resolved
Hide resolved
...atasource-transaction-manager/src/TransactionLog/TransactionLogTable/TransactionLogTable.tsx
Outdated
Show resolved
Hide resolved
...s/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/ObjectMenuCell.tsx
Show resolved
Hide resolved
...p/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
Show resolved
Hide resolved
webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/OrderButton.tsx
Outdated
Show resolved
Hide resolved
...pp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
Outdated
Show resolved
Hide resolved
Comment on lines
+35
to
+46
| function getCell(rowIdx: number, colIdx: number) { | ||
| switch (colIdx) { | ||
| case 0: | ||
| return trace![rowIdx]?.name ?? ''; | ||
| case 1: | ||
| return trace![rowIdx]?.value ?? ''; | ||
| case 2: | ||
| return trace![rowIdx]?.description ?? ''; | ||
| } | ||
|
|
||
| return ''; | ||
| } |
There was a problem hiding this comment.
very unusual way of setting the columns. Can we rearrange the columns order in grid? Will it work?
| @@ -125,28 +65,70 @@ export const Table = observer<TableProps>(function Table({ objects, hasNextPage, | |||
| return null; | |||
| } | |||
|
|
|||
| function getCell(rowIdx: number, colIdx: number) { | |||
| colIdx--; | |||
There was a problem hiding this comment.
shouldn't we move this mutation to the DataGrid props
so getCell={(r, c) => getCell(r, c--)}?
Comment on lines
+97
to
+98
| function getHeaderText(colIdx: number) { | ||
| colIdx--; |
There was a problem hiding this comment.
and same here: remove mutation from the getter
...p/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
Outdated
Show resolved
Hide resolved
...ges/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.module.css
Show resolved
Hide resolved
Comment on lines
+215
to
+264
| // const colIdx = tableData.getColumnIndexFromColumnKey(cell.column); | ||
| // const rowIdx = tableData.getRowIndexFromKey(cell.row); | ||
| // const editingState = tableData.editor.getElementState(cell); | ||
|
|
||
| // switch (event.nativeEvent.code) { | ||
| // case 'Delete': { | ||
| // const filteredRows = activeRows.filter(cell => tableData.editor.getElementState(cell) !== DatabaseEditChangeType.delete); | ||
|
|
||
| // if (filteredRows.length > 0) { | ||
| // const editor = tableData.editor; | ||
| // const firstRow = filteredRows[0]!; | ||
| // const editingState = tableData.editor.getElementState(firstRow); | ||
|
|
||
| // editor.delete(...filteredRows); | ||
|
|
||
| // if (editingState === DatabaseEditChangeType.add) { | ||
| // if (rowIdx - 1 > 0) { | ||
| // handlers.selectCell({ colIdx, rowIdx: rowIdx - 1 }); | ||
| // } | ||
| // } else { | ||
| // if (rowIdx + 1 < tableData.rows.length) { | ||
| // handlers.selectCell({ colIdx, rowIdx: rowIdx + 1 }); | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| // return; | ||
| // } | ||
| // case 'KeyV': { | ||
| // if (editingState === DatabaseEditChangeType.delete) { | ||
| // return; | ||
| // } | ||
|
|
||
| // if (event.ctrlKey || event.metaKey) { | ||
| // if (!clipboardService.clipboardAvailable || clipboardService.state === 'denied' || tableData.isCellReadonly(cell)) { | ||
| // return; | ||
| // } | ||
|
|
||
| // clipboardService | ||
| // .read() | ||
| // .then(value => tableData.editor.set(cell, value)) | ||
| // .catch(); | ||
| // return; | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| // if (editingState === DatabaseEditChangeType.delete) { | ||
| // return; | ||
| // } |
There was a problem hiding this comment.
what do we do with this feature?
There was a problem hiding this comment.
we need to test and if all works we will just remove this, if not we will return this code back (I think I can just remove it for now and revert if needed)
Comment on lines
+30
to
+46
| const trace = state.trace; | ||
|
|
||
| const columnsCount = useCreateGridReactiveValue(() => 3, null, []); | ||
| const rowCount = useCreateGridReactiveValue( | ||
| () => trace?.length || 0, | ||
| onValueChange => reaction(() => trace?.length || 0, onValueChange), | ||
| [trace], | ||
| ); | ||
|
|
||
| function getCell(rowIdx: number, colIdx: number) { | ||
| switch (colIdx) { | ||
| case 0: | ||
| return trace![rowIdx]?.name ?? ''; | ||
| case 1: | ||
| return trace![rowIdx]?.value ?? ''; | ||
| case 2: | ||
| return trace![rowIdx]?.description ?? ''; |
There was a problem hiding this comment.
why do we need this trace variable and why do we access it with trace? and trace! at the same time?
sergeyteleshev
approved these changes
Feb 25, 2025
kkapper
pushed a commit
to PlaidCloud/cloudbeaver
that referenced
this pull request
Apr 18, 2025
* dbeaver/dbeaver-vscode#83 refactor: data grid * chore: try to fix build scripts * chore: commit artifacts * chore: update yarn.lock * fix: adjust grid auto-sizing * chore: fix prettier * chore: add documentation about typescript crashes * fix: cell menu * fix: grid inline editor styles * fix: cell menu styles * fix: cell items alignment * fix: data sync * feat: support reactive values in grid * chore: try to fix strange build bug * chore: restore original file name * fix: add specific to inline editor styles * fix: remove delete row shortcut (not working) * chore: enable common cache
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.