Unify icon badge handling on project page

sillsdev · Nov 1, 2023 · 0684368 · 0684368
1 parent 9adf581
commit 0684368
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.ts
@@ -24,4 +24,4 @@ export {
   TrashIcon
 }
 
-export type IconString = `i-mdi-${string}`;
+export type IconString = `i-mdi-${string}` | `loading loading-spinner loading-${string}`;
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
@@ -145,9 +145,14 @@
   } satisfies Record<ProjectMigrationStatus, string>;
   const migrationStatusIcon = {
     [ProjectMigrationStatus.Migrated]: 'i-mdi-check-circle',
+    [ProjectMigrationStatus.Migrating]: 'loading loading-spinner loading-xs',
   } satisfies Record<ProjectMigrationStatus, IconString>;
   const migrationStatusBadgeVariant = {
     [ProjectMigrationStatus.Migrated]: 'badge-success',
+    [ProjectMigrationStatus.Migrating]: 'badge-warning',
+    [ProjectMigrationStatus.Unknown]: 'badge-neutral',
+    [ProjectMigrationStatus.PrivateRedmine]: 'badge-neutral',
+    [ProjectMigrationStatus.PublicRedmine]: 'badge-neutral',
   } satisfies Record<ProjectMigrationStatus, BadgeVariant>;
   onMount(() => {
     migrationStatus = project?.migrationStatus ?? ProjectMigrationStatus.Unknown;
@@ -263,11 +268,7 @@
             <FormatRetentionPolicy policy={project.retentionPolicy} />
           </Badge>
           <AdminContent>
-          {#if migrationStatus === ProjectMigrationStatus.Migrating}
-            <Badge><span class="loading loading-spinner loading-xs" /> Migrating</Badge>
-          {:else}
             <Badge type={migrationStatusBadgeVariant[migrationStatus]} icon={migrationStatusIcon[migrationStatus]}>{migrationStatusTable[migrationStatus]}</Badge>
-          {/if}
           </AdminContent>
           {#if project.resetStatus === ResetStatus.InProgress}
             <button