From 84126222c4e1551de2ec2bbc3c50f00e8723afd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Tue, 4 Mar 2025 16:34:54 +0100
Subject: [PATCH] Same onboarding page regarless of migration (#101557)

---
 .betterer.results                             |  3 +-
 .../features/provisioning/OnboardingPage.tsx  | 75 ++++++++-----------
 2 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index ff3a9f2ab96..09d20205df6 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5688,8 +5688,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"],
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "3"],
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "4"],
-      [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "5"],
-      [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "6"]
+      [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "5"]
     ],
     "public/app/features/provisioning/RecentJobs.tsx:5381": [
       [0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "0"],
diff --git a/public/app/features/provisioning/OnboardingPage.tsx b/public/app/features/provisioning/OnboardingPage.tsx
index 2e086eacf0f..4f6bf6c88e7 100644
--- a/public/app/features/provisioning/OnboardingPage.tsx
+++ b/public/app/features/provisioning/OnboardingPage.tsx
@@ -10,55 +10,46 @@ import { NEW_URL, MIGRATE_URL } from './constants';
 export default function OnboardingPage({ legacyStorage }: { legacyStorage?: boolean }) {
   const settingsQuery = useGetFrontendSettingsQuery();
   const navigate = useNavigate();
+
+  const onClick = async () => {
+    if (legacyStorage) {
+      await settingsQuery.refetch();
+      navigate(MIGRATE_URL);
+    } else {
+      navigate(NEW_URL);
+    }
+  };
+
   return (
     <Page
       navId="provisioning"
       pageNav={{ text: 'Setup provisioning', subTitle: 'Configure this instance to use provisioning' }}
     >
       <Page.Contents>
-        {legacyStorage ? (
-          <>
-            <Alert severity="info" title="Setting up this connection could cause a temporary outage">
-              When you connect your whole instance, dashboards will be unavailable while running the migration. We
-              recommend warning your users before starting the process.
-            </Alert>
-            <EmptyState
-              variant="call-to-action"
-              message="Set up your provisioning connection!"
-              image={<SVG src="public/img/provisioning-empty.svg" width={300} />}
-              button={
-                <Button
-                  size="lg"
-                  icon="plus"
-                  onClick={async () => {
-                    await settingsQuery.refetch();
-                    navigate(MIGRATE_URL);
-                  }}
-                >
-                  Connect Grafana to repository
-                </Button>
-              }
-            >
-              <Stack direction="column" alignItems="center">
-                <Text>Store and provision your Grafana resources externally by connecting to a repository.</Text>
-                <Text>We currently support GitHub and local storage.</Text>
-                <LinkButton fill="text" href="#" icon="external-link-alt">
-                  Learn more
-                </LinkButton>
-              </Stack>
-            </EmptyState>
-          </>
-        ) : (
-          <EmptyState
-            variant="call-to-action"
-            message="You haven't created any repository configs yet"
-            button={
-              <LinkButton icon="plus" href={NEW_URL} size="lg">
-                Create repository config
-              </LinkButton>
-            }
-          />
+        {legacyStorage && (
+          <Alert severity="info" title="Setting up this connection could cause a temporary outage">
+            When you connect your whole instance, dashboards will be unavailable while running the migration. We
+            recommend warning your users before starting the process.
+          </Alert>
         )}
+        <EmptyState
+          variant="call-to-action"
+          message="Set up your provisioning connection!"
+          image={<SVG src="public/img/provisioning-empty.svg" width={300} />}
+          button={
+            <Button size="lg" icon="plus" onClick={onClick}>
+              Connect Grafana to repository
+            </Button>
+          }
+        >
+          <Stack direction="column" alignItems="center">
+            <Text>Store and provision your Grafana resources externally by connecting to a repository.</Text>
+            <Text>We currently support GitHub and local storage.</Text>
+            <LinkButton fill="text" href="#" icon="external-link-alt">
+              Learn more
+            </LinkButton>
+          </Stack>
+        </EmptyState>
       </Page.Contents>
     </Page>
   );