From 2fbb2d6f5d2752c27347f37a0a74b82f1be68ff3 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 24 Apr 2025 07:48:02 +0100
Subject: [PATCH] [release-12.0.1] Provisioning: Fix requires migration
 condition (#104436)

Provisioning: Fix requires migration condition (#104434)

* Provisioning: Fix requires migration condition

* Better error messaging

(cherry picked from commit 82c291675bfbbbbce54c0fcd1d28e45bf3471967)

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
---
 public/app/features/provisioning/Job/JobContent.tsx       | 4 ++--
 public/app/features/provisioning/Wizard/BootstrapStep.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/features/provisioning/Job/JobContent.tsx b/public/app/features/provisioning/Job/JobContent.tsx
index c5f0ef5b76d..e41bad2502c 100644
--- a/public/app/features/provisioning/Job/JobContent.tsx
+++ b/public/app/features/provisioning/Job/JobContent.tsx
@@ -17,7 +17,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
     return null;
   }
 
-  const { state, message, progress, summary } = job.status;
+  const { state, message, progress, summary, errors } = job.status;
   const repoName = job.metadata?.labels?.['provisioning.grafana.app/repository'];
 
   const getStatusDisplay = () => {
@@ -35,7 +35,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
             severity="error"
             title={t('provisioning.job-status.status.title-error-running-job', 'Error running job')}
           >
-            {message}
+            {message ?? errors?.join('\n')}
           </Alert>
         );
     }
diff --git a/public/app/features/provisioning/Wizard/BootstrapStep.tsx b/public/app/features/provisioning/Wizard/BootstrapStep.tsx
index f06e5764450..8bada6d5a57 100644
--- a/public/app/features/provisioning/Wizard/BootstrapStep.tsx
+++ b/public/app/features/provisioning/Wizard/BootstrapStep.tsx
@@ -57,7 +57,7 @@ export function BootstrapStep({ onOptionSelect, settingsData, repoName, onStepSt
   useEffect(() => {
     const { target } = options[0];
     setValue('repository.sync.target', target);
-    onOptionSelect(target !== 'folder' || resourceCount > 0);
+    onOptionSelect(settingsData?.legacyStorage || resourceCount > 0);
     // Only run this effect on mount
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);