[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 82c291675b)

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
pull/104439/head
grafana-delivery-bot[bot] 3 months ago committed by GitHub
parent ed408985fa
commit 2fbb2d6f5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      public/app/features/provisioning/Job/JobContent.tsx
  2. 2
      public/app/features/provisioning/Wizard/BootstrapStep.tsx

@ -17,7 +17,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
return null; 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 repoName = job.metadata?.labels?.['provisioning.grafana.app/repository'];
const getStatusDisplay = () => { const getStatusDisplay = () => {
@ -35,7 +35,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
severity="error" severity="error"
title={t('provisioning.job-status.status.title-error-running-job', 'Error running job')} title={t('provisioning.job-status.status.title-error-running-job', 'Error running job')}
> >
{message} {message ?? errors?.join('\n')}
</Alert> </Alert>
); );
} }

@ -57,7 +57,7 @@ export function BootstrapStep({ onOptionSelect, settingsData, repoName, onStepSt
useEffect(() => { useEffect(() => {
const { target } = options[0]; const { target } = options[0];
setValue('repository.sync.target', target); setValue('repository.sync.target', target);
onOptionSelect(target !== 'folder' || resourceCount > 0); onOptionSelect(settingsData?.legacyStorage || resourceCount > 0);
// Only run this effect on mount // Only run this effect on mount
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, []); }, []);

Loading…
Cancel
Save