Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 10 commits into from
May 27, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
05a4983
CB-4584 fix: loads object properties tabs after relogin correctly + a…
sergeyteleshev May 21, 2024
e91778e
CB-4584 adds force suspense for Object property table
sergeyteleshev May 21, 2024
0a2ead6
Merge branch 'devel' into CB-4584-metadata-tables-databases-are-not-l…
dariamarutkina May 21, 2024
7427582
Merge branch 'devel' into CB-4584-metadata-tables-databases-are-not-l…
dariamarutkina May 22, 2024
93b844f
CB-4584 trigger object property page outdate on connection being disc…
sergeyteleshev May 23, 2024
0f1db95
Revert "CB-4584 trigger object property page outdate on connection be…
sergeyteleshev May 23, 2024
63b94e4
Merge branch 'devel' into CB-4584-metadata-tables-databases-are-not-l…
sergeyteleshev May 23, 2024
46f28dc
CB-4584 fix: object property table reloads pages after connection bei…
sergeyteleshev May 23, 2024
fd5b6ec
Revert "CB-4584 fix: object property table reloads pages after connec…
sergeyteleshev May 24, 2024
2db2d4f
Merge branch 'devel' into CB-4584-metadata-tables-databases-are-not-l…
dariamarutkina May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
Expand All @@ -43,6 +43,10 @@ export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function O
navNodeViewService.logDuplicates(objectId, duplicates);
});

if (navTreeResource.loading || dbObjectLoader.loading) {
return <Loader />;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems strange, why it's not covered by suspense?


return (
<>
{nodes.length === 0 ? (
Expand Down
Loading