public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

E2C: Fix rebuild snapshot not showing while pending upload (#91077)

Browse Source 
* E2C: Fix rebuild snapshot not showing while pending upload

* fix unable to make snapshot after disconnect/reconnect

* fix wrap on migration summary
This commit is contained in:
Josh Hunt
2024-07-29 18:27:31 +03:00
committed by GitHub
parent 218cf45ec0
commit 1a7c965f7d
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/migrate-to-cloud/onprem/MigrationSummary.tsx
+27 -25
View File
@@ -63,7 +63,7 @@ export function MigrationSummary(props: MigrationSummaryProps) {
alignItems="center"
justifyContent="space-between"
>
<Stack gap={4} wrap="wrap">
<Stack gap={4} wrap>
<MigrationInfo title={t('migrate-to-cloud.summary.snapshot-date', 'Snapshot timestamp')}>
{snapshot?.created ? (
formatDate(snapshot.created, DATE_FORMAT)
@@ -101,32 +101,34 @@ export function MigrationSummary(props: MigrationSummaryProps) {
</MigrationInfo>
</Stack>
{showBuildSnapshot && (
<Button disabled={isBusy} onClick={onBuildSnapshot} icon={buildSnapshotIsLoading ? 'spinner' : undefined}>
<Trans i18nKey="migrate-to-cloud.summary.start-migration">Build snapshot</Trans>
</Button>
)}
<Stack gap={2} wrap justifyContent="flex-end">
{showBuildSnapshot && (
<Button disabled={isBusy} onClick={onBuildSnapshot} icon={buildSnapshotIsLoading ? 'spinner' : undefined}>
<Trans i18nKey="migrate-to-cloud.summary.start-migration">Build snapshot</Trans>
</Button>
)}
{showRebuildSnapshot && (
<Button
disabled={isBusy}
onClick={onBuildSnapshot}
icon={buildSnapshotIsLoading ? 'spinner' : undefined}
variant="secondary"
>
<Trans i18nKey="migrate-to-cloud.summary.rebuild-snapshot">Rebuild snapshot</Trans>
</Button>
)}
{showRebuildSnapshot && (
<Button
disabled={isBusy}
onClick={onBuildSnapshot}
icon={buildSnapshotIsLoading ? 'spinner' : undefined}
variant="secondary"
>
<Trans i18nKey="migrate-to-cloud.summary.rebuild-snapshot">Rebuild snapshot</Trans>
</Button>
)}
{showUploadSnapshot && (
<Button
disabled={isBusy || uploadSnapshotIsLoading}
onClick={onUploadSnapshot}
icon={uploadSnapshotIsLoading ? 'spinner' : undefined}
>
<Trans i18nKey="migrate-to-cloud.summary.upload-migration">Upload snapshot</Trans>
</Button>
)}
{showUploadSnapshot && (
<Button
disabled={isBusy || uploadSnapshotIsLoading}
onClick={onUploadSnapshot}
icon={uploadSnapshotIsLoading ? 'spinner' : undefined}
>
<Trans i18nKey="migrate-to-cloud.summary.upload-migration">Upload snapshot</Trans>
</Button>
)}
</Stack>
</Box>
);
}
public/app/features/migrate-to-cloud/onprem/Page.tsx
+1 -1
View File
@@ -57,7 +57,7 @@ const SHOULD_POLL_STATUSES: Array<SnapshotDto['status']> = [
'PROCESSING',
];
const SNAPSHOT_REBUILD_STATUSES: Array<SnapshotDto['status']> = ['PENDING_PROCESSING', 'FINISHED', 'ERROR', 'UNKNOWN'];
const SNAPSHOT_REBUILD_STATUSES: Array<SnapshotDto['status']> = ['PENDING_UPLOAD', 'FINISHED', 'ERROR', 'UNKNOWN'];
const SNAPSHOT_BUILDING_STATUSES: Array<SnapshotDto['status']> = ['INITIALIZING', 'CREATING'];
const SNAPSHOT_UPLOADING_STATUSES: Array<SnapshotDto['status']> = ['UPLOADING', 'PENDING_PROCESSING', 'PROCESSING'];