mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-10-29 19:19:39 +08:00
CB-5749 fix: metadata table loading (#2960)
* CB-5749 fix: metadata table loading
* CB-5749 fix: offset pagination range expand function
* CB-5205 fix: connection view switching
* Revert "CB-5205 fix: connection view switching"
This reverts commit e06c039fdd.
* CB-5749 fix: prevent page offset overflow
---------
Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com>
Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
This commit is contained in:
co-authored by
Evgenia Bezborodova
Daria Marutkina
parent
fd711b055c
commit
a4bb23b21e
+3
-2
@@ -32,9 +32,10 @@ export const VirtualFolderPanel: NavNodeTransformViewComponent = observer(functi
|
||||
|
||||
const dbObjectLoader = useResource(VirtualFolderPanel, DBObjectResource, pagination.currentPage);
|
||||
|
||||
const { nodes, duplicates } = navNodeViewService.filterDuplicates(dbObjectLoader.data.filter(isDefined).map(node => node?.id) || []);
|
||||
const allData = dbObjectLoader.resource.get(pagination.allPages).filter(isDefined);
|
||||
const { nodes, duplicates } = navNodeViewService.filterDuplicates(allData.map(node => node?.id) || []);
|
||||
|
||||
const objects = dbObjectLoader.data.filter(
|
||||
const objects = allData.filter(
|
||||
object => object && nodes.includes(object.id) && navNodeInfoResource.get(object.id)?.nodeType === nodeType,
|
||||
) as DBObject[];
|
||||
|
||||
|
||||
+3
-2
@@ -35,9 +35,10 @@ export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function O
|
||||
|
||||
const dbObjectLoader = useResource(ObjectPropertyTable, DBObjectResource, pagination.currentPage);
|
||||
|
||||
const { nodes, duplicates } = navNodeViewService.filterDuplicates(dbObjectLoader.data.filter(isDefined).map(node => node?.id) || []);
|
||||
const allData = dbObjectLoader.resource.get(pagination.allPages).filter(isDefined);
|
||||
const { nodes, duplicates } = navNodeViewService.filterDuplicates(allData.map(node => node?.id) || []);
|
||||
|
||||
const objects = dbObjectLoader.data.filter(node => nodes.includes(node?.id || '')) as DBObject[];
|
||||
const objects = allData.filter(node => nodes.includes(node.id)) as DBObject[];
|
||||
|
||||
useEffect(() => {
|
||||
navNodeViewService.logDuplicates(objectId, duplicates);
|
||||
|
||||
Reference in New Issue
Block a user