Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 40 additions & 9 deletions src/components/Configs/ConfigTabsLinks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ type ConfigDetailsTab = {
search?: string;
};

export function useConfigDetailsTabs(
function buildConfigDetailsTabs(
id: string | undefined,
views: Array<{
id: string;
title?: string;
name: string;
icon?: string;
ordinal?: number;
}>,
countSummary?: ConfigItem["summary"]
): ConfigDetailsTab[] {
const { id } = useParams<{ id: string }>();

const { data: views = [] } = useQuery({
queryKey: ["views", id],
queryFn: () => getViewsByConfigId(id!),
enabled: !!id
});

const staticTabs: ConfigDetailsTab[] = [
{ label: "Spec", key: "Spec", path: `/catalog/${id}/spec` },
{
Expand Down Expand Up @@ -111,3 +111,34 @@ export function useConfigDetailsTabs(
// Views configured for a config should appear ahead of the built-in tabs.
return [...viewTabs, ...staticTabs];
}

export function useConfigDetailsTabs(
countSummary?: ConfigItem["summary"]
): ConfigDetailsTab[] {
const { id } = useParams<{ id: string }>();

const { data: views = [] } = useQuery({
queryKey: ["views", id],
queryFn: () => getViewsByConfigId(id!),
enabled: !!id
});

return buildConfigDetailsTabs(id, views, countSummary);
}

export function useConfigDetailsTabsWithStatus(
countSummary?: ConfigItem["summary"]
): { tabs: ConfigDetailsTab[]; isViewsLoading: boolean } {
const { id } = useParams<{ id: string }>();

const { data: views = [], isLoading: isViewsLoading } = useQuery({
queryKey: ["views", id],
queryFn: () => getViewsByConfigId(id!),
enabled: !!id
});

return {
tabs: buildConfigDetailsTabs(id, views, countSummary),
isViewsLoading
};
}
10 changes: 6 additions & 4 deletions src/pages/config/details/ConfigDetailsIndexRedirect.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useGetConfigByIdQuery } from "@flanksource-ui/api/query-hooks";
import { useConfigDetailsTabs } from "@flanksource-ui/components/Configs/ConfigTabsLinks";
import { useConfigDetailsTabsWithStatus } from "@flanksource-ui/components/Configs/ConfigTabsLinks";
import { Loading } from "@flanksource-ui/ui/Loading";
import { useEffect } from "react";
import { useLocation, useNavigate, useParams } from "react-router-dom";
Expand All @@ -17,10 +17,12 @@ export function ConfigDetailsIndexRedirect() {
isError: isConfigError
} = useGetConfigByIdQuery(idParam);

const tabs = useConfigDetailsTabs(configDetails?.summary);
const { tabs, isViewsLoading } = useConfigDetailsTabsWithStatus(
configDetails?.summary
);

useEffect(() => {
if (!id || tabs.length === 0) {
if (!id || isViewsLoading || tabs.length === 0) {
return;
}

Expand All @@ -37,7 +39,7 @@ export function ConfigDetailsIndexRedirect() {
},
{ replace: true }
);
}, [id, tabs, navigate, location.pathname, location.search]);
}, [id, isViewsLoading, tabs, navigate, location.pathname, location.search]);

if (isConfigLoading) {
return (
Expand Down
Loading