Skip to content

Commit cb88bfa

Browse files
authored
Revert: do not display table skeleton when table's data is refreshing (#6479)
1 parent 601f8db commit cb88bfa

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

frontend/app/src/entities/nodes/object/ui/object-table/object-table.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,24 @@ export interface ObjectsTableProps {
1616

1717
export const ObjectTable = ({ schema, permission }: ObjectsTableProps) => {
1818
const [filters] = useFilters();
19-
const { isFetching, data, fetchNextPage, hasNextPage } = useObjects({ schema, filters });
19+
const { data, fetchNextPage, hasNextPage, isPending, isFetchingNextPage } = useObjects({
20+
schema,
21+
filters,
22+
});
2023

2124
const columns = React.useMemo(() => {
2225
return [...getObjectTableColumns(schema), getObjectActionsColumn(permission)];
2326
}, [schema.hash]);
2427
const flatData = React.useMemo(() => data?.pages?.flat() ?? [], [data]);
2528

29+
const isLoading = isPending || isFetchingNextPage;
30+
2631
return (
2732
<InfiniteScroll scrollX hasNextPage={hasNextPage} onLoadMore={fetchNextPage}>
2833
<DataTable
2934
columns={columns}
3035
data={flatData}
31-
isLoading={isFetching}
36+
isLoading={isLoading}
3237
renderEmpty={() => <ObjectTableEmpty schema={schema} />}
3338
data-testid="object-items"
3439
/>

frontend/app/src/entities/nodes/relationships/ui/relationship-table/relationship-table.tsx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ export function RelationshipTable({
2121
...props
2222
}: RelationshipTableProps) {
2323
const [filters] = useFilters();
24-
const { data, isFetching, fetchNextPage, hasNextPage } = useObjectRelationships({
25-
relationshipSchema,
26-
parentId,
27-
parentKind,
28-
relationshipName,
29-
filters,
30-
...props,
31-
});
24+
const { data, fetchNextPage, hasNextPage, isPending, isFetchingNextPage } =
25+
useObjectRelationships({
26+
relationshipSchema,
27+
parentId,
28+
parentKind,
29+
relationshipName,
30+
filters,
31+
...props,
32+
});
3233

3334
const flatData = React.useMemo(() => data?.pages?.flat() ?? [], [data]);
3435

@@ -45,12 +46,14 @@ export function RelationshipTable({
4546
];
4647
}, [relationshipSchema.hash, flatData.length]);
4748

49+
const isLoading = isPending || isFetchingNextPage;
50+
4851
return (
4952
<InfiniteScroll scrollX hasNextPage={hasNextPage} onLoadMore={fetchNextPage}>
5053
<DataTable
5154
columns={columns}
5255
data={flatData}
53-
isLoading={isFetching}
56+
isLoading={isLoading}
5457
renderEmpty={() => <ObjectTableEmpty schema={relationshipSchema} />}
5558
/>
5659
</InfiniteScroll>

0 commit comments

Comments
 (0)