diff --git a/public/app/features/provisioning/HomePage.tsx b/public/app/features/provisioning/HomePage.tsx index f849ef26f01..94ccf8fc6d8 100644 --- a/public/app/features/provisioning/HomePage.tsx +++ b/public/app/features/provisioning/HomePage.tsx @@ -7,24 +7,16 @@ import { useDeletecollectionRepositoryMutation, useGetFrontendSettingsQuery } fr import { Page } from 'app/core/components/Page/Page'; import { t, Trans } from 'app/core/internationalization'; -import { FilesView } from './File/FilesView'; import GettingStarted from './GettingStarted/GettingStarted'; import GettingStartedPage from './GettingStarted/GettingStartedPage'; -import { RepositoryActions } from './Repository/RepositoryActions'; -import { RepositoryOverview } from './Repository/RepositoryOverview'; -import { RepositoryResources } from './Repository/RepositoryResources'; import { FolderRepositoryList } from './Shared/FolderRepositoryList'; import { useRepositoryList } from './hooks'; -import { checkSyncSettings } from './utils/checkSyncSettings'; const appEvents = getAppEvents(); enum TabSelection { - Overview = 'overview', - Resources = 'resources', - Files = 'files', - GettingStarted = 'getting-started', Repositories = 'repositories', + GettingStarted = 'getting-started', } export default function HomePage() { @@ -32,38 +24,9 @@ export default function HomePage() { const settings = useGetFrontendSettingsQuery(); const [deleteAll, deleteAllResult] = useDeletecollectionRepositoryMutation(); const [showDeleteModal, setShowDeleteModal] = useState(false); - const { instanceConnected } = checkSyncSettings(items); - const [activeTab, setActiveTab] = useState( - instanceConnected ? TabSelection.Overview : TabSelection.Repositories - ); + const [activeTab, setActiveTab] = useState(TabSelection.Repositories); - const connectedTabInfo = useMemo( - () => [ - { - value: TabSelection.Overview, - label: t('provisioning.home-page.tab-overview', 'Overview'), - title: t('provisioning.home-page.tab-overview-title', 'Repository overview'), - }, - { - value: TabSelection.Resources, - label: t('provisioning.home-page.tab-resources', 'Resources'), - title: t('provisioning.home-page.tab-resources-title', 'Resources saved in Grafana database'), - }, - { - value: TabSelection.Files, - label: t('provisioning.home-page.tab-files', 'Files'), - title: t('provisioning.home-page.tab-files-title', 'The raw file list from the repository'), - }, - { - value: TabSelection.GettingStarted, - label: t('provisioning.home-page.tab-getting-started', 'Getting started'), - title: t('provisioning.home-page.tab-getting-started-title', 'Getting started'), - }, - ], - [] - ); - - const disconnectedTabInfo = useMemo( + const tabInfo = useMemo( () => [ { value: TabSelection.Repositories, @@ -88,10 +51,6 @@ export default function HomePage() { } }, [deleteAllResult.isSuccess]); - useEffect(() => { - setActiveTab(instanceConnected ? TabSelection.Overview : TabSelection.Repositories); - }, [instanceConnected]); - // Early return for onboarding if (!items?.length && !isLoading) { return ; @@ -103,29 +62,9 @@ export default function HomePage() { }; const renderTabContent = () => { - if (!instanceConnected) { - switch (activeTab) { - case TabSelection.Repositories: - return ; - case TabSelection.GettingStarted: - return ; - default: - return null; - } - } - - const repo = items?.[0]; - if (!repo) { - return null; - } - switch (activeTab) { - case TabSelection.Overview: - return ; - case TabSelection.Resources: - return ; - case TabSelection.Files: - return ; + case TabSelection.Repositories: + return ; case TabSelection.GettingStarted: return ; default: @@ -137,7 +76,6 @@ export default function HomePage() { : undefined} > {settings.data?.legacyStorage && ( @@ -174,7 +112,7 @@ export default function HomePage() { /> - {(instanceConnected ? connectedTabInfo : disconnectedTabInfo).map((t) => ( + {tabInfo.map((t) => ( item.metadata?.name?.includes(query)); - + const instanceProvisioned = checkSyncSettings(items); return ( - - - - + {!instanceProvisioned && ( + + + + + )} {filteredItems.length ? ( filteredItems.map((item) => ) diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index f2dc7fe42ce..f095b4e0a8c 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -5001,16 +5001,10 @@ "remove-all-configured-repositories": "Remove all configured repositories", "subtitle": "View and manage your configured repositories", "success-all-repositories-deleted": "All configured repositories deleted", - "tab-files": "Files", - "tab-files-title": "The raw file list from the repository", "tab-getting-started": "Getting started", "tab-getting-started-title": "Getting started", - "tab-overview": "Overview", - "tab-overview-title": "Repository overview", "tab-repositories": "Repositories", "tab-repositories-title": "List of repositories", - "tab-resources": "Resources", - "tab-resources-title": "Resources saved in Grafana database", "title-delete-all-configured-repositories": "Delete all configured repositories", "title-legacy-storage-detected": "Legacy storage detected" },