Provisioning: Fix requires migration condition (#104434)
* Provisioning: Fix requires migration condition * Better error messaging
This commit is contained in:
@@ -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>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}, []);
|
||||
|
||||
Reference in New Issue
Block a user