From 1425b3da6b4a862999c4f67c5a9cf1e688379056 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 19 Dec 2025 12:47:04 -0500
Subject: [PATCH] refactor: admin card (#24723)

---
 web/src/lib/components/AdminCard.svelte       |  33 +++
 .../library-management/[id]/+page.svelte      | 133 +++++-------
 web/src/routes/admin/users/[id]/+page.svelte  | 205 +++++++-----------
 3 files changed, 164 insertions(+), 207 deletions(-)
 create mode 100644 web/src/lib/components/AdminCard.svelte

diff --git a/web/src/lib/components/AdminCard.svelte b/web/src/lib/components/AdminCard.svelte
new file mode 100644
index 000000000..4aaf890ca
--- /dev/null
+++ b/web/src/lib/components/AdminCard.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  import HeaderActionButton from '$lib/components/HeaderActionButton.svelte';
+  import { Card, CardBody, CardHeader, CardTitle, Icon, type ActionItem, type IconLike } from '@immich/ui';
+  import type { Snippet } from 'svelte';
+
+  type Props = {
+    icon: IconLike;
+    title: string;
+    headerAction?: ActionItem;
+    children?: Snippet;
+  };
+
+  const { icon, title, headerAction, children }: Props = $props();
+</script>
+
+<Card color="secondary">
+  <CardHeader>
+    <div class="flex w-full justify-between items-center px-4 py-2">
+      <div class="flex gap-2 text-primary">
+        <Icon {icon} size="1.5rem" />
+        <CardTitle>{title}</CardTitle>
+      </div>
+      {#if headerAction}
+        <HeaderActionButton action={headerAction} />
+      {/if}
+    </div>
+  </CardHeader>
+  <CardBody>
+    <div class="px-4 pb-7">
+      {@render children?.()}
+    </div>
+  </CardBody>
+</Card>
diff --git a/web/src/routes/admin/library-management/[id]/+page.svelte b/web/src/routes/admin/library-management/[id]/+page.svelte
index 6ca08db0f..6bffbe39a 100644
--- a/web/src/routes/admin/library-management/[id]/+page.svelte
+++ b/web/src/routes/admin/library-management/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import emptyFoldersUrl from '$lib/assets/empty-folders.svg';
-  import HeaderActionButton from '$lib/components/HeaderActionButton.svelte';
+  import AdminCard from '$lib/components/AdminCard.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
   import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
@@ -15,18 +15,7 @@
     getLibraryFolderActions,
   } from '$lib/services/library.service';
   import { getBytesWithUnit } from '$lib/utils/byte-units';
-  import {
-    Card,
-    CardBody,
-    CardHeader,
-    CardTitle,
-    Code,
-    CommandPaletteContext,
-    Container,
-    Heading,
-    Icon,
-    modalManager,
-  } from '@immich/ui';
+  import { Code, CommandPaletteContext, Container, Heading, modalManager } from '@immich/ui';
   import { mdiCameraIris, mdiChartPie, mdiFilterMinusOutline, mdiFolderOutline, mdiPlayCircle } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
@@ -64,77 +53,53 @@
         <ServerStatisticsCard icon={mdiPlayCircle} title={$t('videos')} value={statistics.videos} />
         <ServerStatisticsCard icon={mdiChartPie} title={$t('usage')} value={storageUsage} {unit} />
       </div>
-      <Card color="secondary">
-        <CardHeader>
-          <div class="flex w-full justify-between items-center px-4 py-2">
-            <div class="flex gap-2 text-primary">
-              <Icon icon={mdiFolderOutline} size="1.5rem" />
-              <CardTitle>{$t('folders')}</CardTitle>
-            </div>
-            <HeaderActionButton action={AddFolder} />
-          </div>
-        </CardHeader>
-        <CardBody>
-          <div class="px-4 pb-7">
-            {#if library.importPaths.length === 0}
-              <EmptyPlaceholder
-                src={emptyFoldersUrl}
-                text={$t('admin.library_folder_description')}
-                fullWidth
-                onClick={() => modalManager.show(LibraryFolderAddModal, { library })}
-              />
-            {:else}
-              <table class="w-full">
-                <tbody>
-                  {#each library.importPaths as folder (folder)}
-                    {@const { Edit, Delete } = getLibraryFolderActions($t, library, folder)}
-                    <tr class="h-12">
-                      <td>
-                        <Code>{folder}</Code>
-                      </td>
-                      <td class="flex gap-2 justify-end">
-                        <TableButton action={Edit} />
-                        <TableButton action={Delete} />
-                      </td>
-                    </tr>
-                  {/each}
-                </tbody>
-              </table>
-            {/if}
-          </div>
-        </CardBody>
-      </Card>
-      <Card color="secondary">
-        <CardHeader>
-          <div class="flex w-full justify-between items-center px-4 py-2">
-            <div class="flex gap-2 text-primary">
-              <Icon icon={mdiFilterMinusOutline} size="1.5rem" />
-              <CardTitle>{$t('exclusion_pattern')}</CardTitle>
-            </div>
-            <HeaderActionButton action={AddExclusionPattern} />
-          </div>
-        </CardHeader>
-        <CardBody>
-          <div class="px-4 pb-7">
-            <table class="w-full">
-              <tbody>
-                {#each library.exclusionPatterns as exclusionPattern (exclusionPattern)}
-                  {@const { Edit, Delete } = getLibraryExclusionPatternActions($t, library, exclusionPattern)}
-                  <tr class="h-12">
-                    <td>
-                      <Code>{exclusionPattern}</Code>
-                    </td>
-                    <td class="flex gap-2 justify-end">
-                      <TableButton action={Edit} />
-                      <TableButton action={Delete} />
-                    </td>
-                  </tr>
-                {/each}
-              </tbody>
-            </table>
-          </div>
-        </CardBody>
-      </Card>
+
+      <AdminCard icon={mdiFolderOutline} title={$t('folders')} headerAction={AddFolder}>
+        {#if library.importPaths.length === 0}
+          <EmptyPlaceholder
+            src={emptyFoldersUrl}
+            text={$t('admin.library_folder_description')}
+            fullWidth
+            onClick={() => modalManager.show(LibraryFolderAddModal, { library })}
+          />
+        {:else}
+          <table class="w-full">
+            <tbody>
+              {#each library.importPaths as folder (folder)}
+                {@const { Edit, Delete } = getLibraryFolderActions($t, library, folder)}
+                <tr class="h-12">
+                  <td>
+                    <Code>{folder}</Code>
+                  </td>
+                  <td class="flex gap-2 justify-end">
+                    <TableButton action={Edit} />
+                    <TableButton action={Delete} />
+                  </td>
+                </tr>
+              {/each}
+            </tbody>
+          </table>
+        {/if}
+      </AdminCard>
+
+      <AdminCard icon={mdiFilterMinusOutline} title={$t('exclusion_pattern')} headerAction={AddExclusionPattern}>
+        <table class="w-full">
+          <tbody>
+            {#each library.exclusionPatterns as exclusionPattern (exclusionPattern)}
+              {@const { Edit, Delete } = getLibraryExclusionPatternActions($t, library, exclusionPattern)}
+              <tr class="h-12">
+                <td>
+                  <Code>{exclusionPattern}</Code>
+                </td>
+                <td class="flex gap-2 justify-end">
+                  <TableButton action={Edit} />
+                  <TableButton action={Delete} />
+                </td>
+              </tr>
+            {/each}
+          </tbody>
+        </table>
+      </AdminCard>
     </div>
   </Container>
 </AdminPageLayout>
diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index e68896e17..c41afba97 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
+  import AdminCard from '$lib/components/AdminCard.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
   import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
@@ -15,10 +16,6 @@
   import {
     Alert,
     Badge,
-    Card,
-    CardBody,
-    CardHeader,
-    CardTitle,
     Code,
     CommandPaletteContext,
     Container,
@@ -131,128 +128,90 @@
             <ServerStatisticsCard icon={mdiChartPie} title={$t('storage')} value={statsUsage} unit={statsUsageUnit} />
           </div>
         </div>
-        <div>
-          <Card color="secondary">
-            <CardHeader>
-              <div class="flex items-center gap-2 px-4 py-2 text-primary">
-                <Icon icon={mdiAccountOutline} size="1.5rem" />
-                <CardTitle>{$t('profile')}</CardTitle>
-              </div>
-            </CardHeader>
-            <CardBody>
-              <div class="px-4 pb-7">
-                <Stack gap={2}>
-                  <div>
-                    <Heading tag="h3" size="tiny">{$t('name')}</Heading>
-                    <Text>{user.name}</Text>
-                  </div>
-                  <div>
-                    <Heading tag="h3" size="tiny">{$t('email')}</Heading>
-                    <Text>{user.email}</Text>
-                  </div>
-                  <div>
-                    <Heading tag="h3" size="tiny">{$t('created_at')}</Heading>
-                    <Text>{userCreatedAtDateAndTime}</Text>
-                  </div>
-                  <div>
-                    <Heading tag="h3" size="tiny">{$t('updated_at')}</Heading>
-                    <Text>{userUpdatedAtDateAndTime}</Text>
-                  </div>
-                  <div>
-                    <Heading tag="h3" size="tiny">{$t('id')}</Heading>
-                    <Code>{user.id}</Code>
-                  </div>
-                </Stack>
-              </div>
-            </CardBody>
-          </Card>
-        </div>
-        <Card color="secondary">
-          <CardHeader>
-            <div class="flex items-center gap-2 px-4 py-2 text-primary">
-              <Icon icon={mdiFeatureSearchOutline} size="1.5rem" />
-              <CardTitle>{$t('features')}</CardTitle>
-            </div>
-          </CardHeader>
-          <CardBody>
-            <div class="px-4 pb-4">
-              <Stack gap={3}>
-                <FeatureSetting title={$t('email_notifications')} state={userPreferences.emailNotifications.enabled} />
-                <FeatureSetting title={$t('folders')} state={userPreferences.folders.enabled} />
-                <FeatureSetting title={$t('memories')} state={userPreferences.memories.enabled} />
-                <FeatureSetting title={$t('people')} state={userPreferences.people.enabled} />
-                <FeatureSetting title={$t('rating')} state={userPreferences.ratings.enabled} />
-                <FeatureSetting title={$t('shared_links')} state={userPreferences.sharedLinks.enabled} />
-                <FeatureSetting title={$t('show_supporter_badge')} state={userPreferences.purchase.showSupportBadge} />
-                <FeatureSetting title={$t('tags')} state={userPreferences.tags.enabled} />
-                <FeatureSetting title={$t('gcast_enabled')} state={userPreferences.cast.gCastEnabled} />
-              </Stack>
-            </div>
-          </CardBody>
-        </Card>
-        <Card color="secondary">
-          <CardHeader>
-            <div class="flex items-center gap-2 px-4 py-2 text-primary">
-              <Icon icon={mdiChartPieOutline} size="1.5rem" />
-              <CardTitle>{$t('storage_quota')}</CardTitle>
-            </div>
-          </CardHeader>
-          <CardBody>
-            <div class="px-4 pb-4">
-              {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
-                <Text>
-                  {$t('storage_usage', {
-                    values: {
-                      used: getByteUnitString(usedBytes, $locale, 3),
-                      available: getByteUnitString(availableBytes, $locale, 3),
-                    },
-                  })}
-                </Text>
-              {:else}
-                <Text class="flex items-center gap-1">
-                  <Icon icon={mdiCheckCircle} size="1.25rem" class="text-success" />
-                  {$t('unlimited')}
-                </Text>
-              {/if}
-            </div>
 
-            {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
-              <div
-                class="storage-status p-4 mt-4 bg-gray-100 dark:bg-immich-dark-primary/10 rounded-lg text-sm w-full"
-                title={$t('storage_usage', {
-                  values: {
-                    used: getByteUnitString(usedBytes, $locale, 3),
-                    available: getByteUnitString(availableBytes, $locale, 3),
-                  },
-                })}
-              >
-                <p class="font-medium text-immich-dark-gray dark:text-white mb-2">{$t('storage')}</p>
-                <div class="mt-4 h-[7px] w-full rounded-full bg-gray-200 dark:bg-gray-700">
-                  <div class="h-[7px] rounded-full {getUsageClass()}" style="width: {usedPercentage}%"></div>
-                </div>
+        <AdminCard icon={mdiAccountOutline} title={$t('profile')}>
+          <Stack gap={2}>
+            <div>
+              <Heading tag="h3" size="tiny">{$t('name')}</Heading>
+              <Text>{user.name}</Text>
+            </div>
+            <div>
+              <Heading tag="h3" size="tiny">{$t('email')}</Heading>
+              <Text>{user.email}</Text>
+            </div>
+            <div>
+              <Heading tag="h3" size="tiny">{$t('created_at')}</Heading>
+              <Text>{userCreatedAtDateAndTime}</Text>
+            </div>
+            <div>
+              <Heading tag="h3" size="tiny">{$t('updated_at')}</Heading>
+              <Text>{userUpdatedAtDateAndTime}</Text>
+            </div>
+            <div>
+              <Heading tag="h3" size="tiny">{$t('id')}</Heading>
+              <Code>{user.id}</Code>
+            </div>
+          </Stack>
+        </AdminCard>
+
+        <AdminCard icon={mdiFeatureSearchOutline} title={$t('features')}>
+          <Stack gap={3}>
+            <FeatureSetting title={$t('email_notifications')} state={userPreferences.emailNotifications.enabled} />
+            <FeatureSetting title={$t('folders')} state={userPreferences.folders.enabled} />
+            <FeatureSetting title={$t('memories')} state={userPreferences.memories.enabled} />
+            <FeatureSetting title={$t('people')} state={userPreferences.people.enabled} />
+            <FeatureSetting title={$t('rating')} state={userPreferences.ratings.enabled} />
+            <FeatureSetting title={$t('shared_links')} state={userPreferences.sharedLinks.enabled} />
+            <FeatureSetting title={$t('show_supporter_badge')} state={userPreferences.purchase.showSupportBadge} />
+            <FeatureSetting title={$t('tags')} state={userPreferences.tags.enabled} />
+            <FeatureSetting title={$t('gcast_enabled')} state={userPreferences.cast.gCastEnabled} />
+          </Stack>
+        </AdminCard>
+
+        <AdminCard icon={mdiChartPieOutline} title={$t('storage_quota')}>
+          {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+            <Text>
+              {$t('storage_usage', {
+                values: {
+                  used: getByteUnitString(usedBytes, $locale, 3),
+                  available: getByteUnitString(availableBytes, $locale, 3),
+                },
+              })}
+            </Text>
+          {:else}
+            <Text class="flex items-center gap-1">
+              <Icon icon={mdiCheckCircle} size="1.25rem" class="text-success" />
+              {$t('unlimited')}
+            </Text>
+          {/if}
+
+          {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+            <div
+              class="storage-status p-4 mt-4 bg-gray-100 dark:bg-immich-dark-primary/10 rounded-lg text-sm w-full"
+              title={$t('storage_usage', {
+                values: {
+                  used: getByteUnitString(usedBytes, $locale, 3),
+                  available: getByteUnitString(availableBytes, $locale, 3),
+                },
+              })}
+            >
+              <p class="font-medium text-immich-dark-gray dark:text-white mb-2">{$t('storage')}</p>
+              <div class="mt-4 h-[7px] w-full rounded-full bg-gray-200 dark:bg-gray-700">
+                <div class="h-[7px] rounded-full {getUsageClass()}" style="width: {usedPercentage}%"></div>
               </div>
-            {/if}
-          </CardBody>
-        </Card>
-        <Card color="secondary">
-          <CardHeader>
-            <div class="flex items-center gap-2 px-4 py-2 text-primary">
-              <Icon icon={mdiDevices} size="1.5rem" />
-              <CardTitle>{$t('authorized_devices')}</CardTitle>
             </div>
-          </CardHeader>
-          <CardBody>
-            <div class="px-4 pb-7">
-              <Stack gap={3}>
-                {#each userSessions as session (session.id)}
-                  <DeviceCard {session} />
-                {:else}
-                  <span class="text-dark">{$t('no_devices')}</span>
-                {/each}
-              </Stack>
-            </div>
-          </CardBody>
-        </Card>
+          {/if}
+        </AdminCard>
+
+        <AdminCard icon={mdiDevices} title={$t('authorized_devices')}>
+          <Stack gap={3}>
+            {#each userSessions as session (session.id)}
+              <DeviceCard {session} />
+            {:else}
+              <span class="text-dark">{$t('no_devices')}</span>
+            {/each}
+          </Stack>
+        </AdminCard>
       </div>
     </Container>
   </div>