opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 23:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-4584 fix: loads object properties tabs after relogin correctly + added loader

Browse Source
This commit is contained in:
sergeyteleshev
2024-05-21 14:37:19 +02:00
parent e3a859fee7
commit 05a4983981
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
+7 -3
View File
@@ -8,7 +8,7 @@
import { observer } from 'mobx-react-lite';
import { useEffect } from 'react';
import { s, TextPlaceholder, useOffsetPagination, useResource, useTranslate } from '@cloudbeaver/core-blocks';
import { Loader, s, TextPlaceholder, useOffsetPagination, useResource, useTranslate } from '@cloudbeaver/core-blocks';
import { useService } from '@cloudbeaver/core-di';
import { type DBObject, DBObjectParentKey, DBObjectResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
import { isDefined } from '@cloudbeaver/core-utils';
@@ -26,11 +26,11 @@ interface ObjectPropertyTableProps {
export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function ObjectPropertyTable({ objectId, parentId, className }) {
const translate = useTranslate();
const navNodeViewService = useService(NavNodeViewService);
const navTreeResource = useService(NavTreeResource);
const navTreeResource = useResource(ObjectPropertyTable, NavTreeResource, objectId);
const pagination = useOffsetPagination(DBObjectResource, {
key: DBObjectParentKey(objectId),
pageSize: navTreeResource.childrenLimit,
pageSize: navTreeResource.resource.childrenLimit,
});
const dbObjectLoader = useResource(ObjectPropertyTable, DBObjectResource, pagination.key);
@@ -43,6 +43,10 @@ export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function O
navNodeViewService.logDuplicates(objectId, duplicates);
});
if (navTreeResource.loading || dbObjectLoader.loading) {
return <Loader />;
}
return (
<>
{nodes.length === 0 ? (