From 3d08d457dc26db65941641023756dee1bc8ea34b Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Wed, 19 Mar 2025 09:09:29 -0500
Subject: [PATCH] Refine admin menus

---
 src/admin/AdminAppMenu.tsx              | 26 ++++++--------
 src/admin/AdminBatchEditPanelClient.tsx |  4 ++-
 src/components/cmdk/CommandKClient.tsx  | 47 +++++++++++++++----------
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/admin/AdminAppMenu.tsx b/src/admin/AdminAppMenu.tsx
index d9b3f119..39377e56 100644
--- a/src/admin/AdminAppMenu.tsx
+++ b/src/admin/AdminAppMenu.tsx
@@ -68,6 +68,17 @@ export default function AdminAppMenu({
     }),
   }];
 
+  if (uploadsCount) {
+    items.push({
+      label: 'Uploads',
+      annotation: `${uploadsCount}`,
+      icon: <IconFolder
+        size={16}
+        className="translate-y-[0.5px]"
+      />,
+      href: PATH_ADMIN_UPLOADS,
+    });
+  }
   if (photosCountTotal) {
     items.push({
       label: 'Manage Photos',
@@ -81,19 +92,6 @@ export default function AdminAppMenu({
       href: PATH_ADMIN_PHOTOS,
     });
   }
-
-  if (uploadsCount) {
-    items.push({
-      label: 'Uploads',
-      annotation: `${uploadsCount}`,
-      icon: <IconFolder
-        size={16}
-        className="translate-y-[0.5px]"
-      />,
-      href: PATH_ADMIN_UPLOADS,
-    });
-  }
-
   if (tagsCount) {
     items.push({
       label: 'Manage Tags',
@@ -105,7 +103,6 @@ export default function AdminAppMenu({
       href: PATH_ADMIN_TAGS,
     });
   }
-
   if (recipesCount) {
     items.push({
       label: 'Manage Recipes',
@@ -117,7 +114,6 @@ export default function AdminAppMenu({
       href: PATH_ADMIN_RECIPES,
     });
   }
-
   if (photosCountTotal) {
     items.push({
       label: isSelecting
diff --git a/src/admin/AdminBatchEditPanelClient.tsx b/src/admin/AdminBatchEditPanelClient.tsx
index 6c77cdc1..8a4dc8ae 100644
--- a/src/admin/AdminBatchEditPanelClient.tsx
+++ b/src/admin/AdminBatchEditPanelClient.tsx
@@ -58,7 +58,9 @@ export default function AdminBatchEditPanelClient({
   const renderPhotoCTA = selectedPhotoIds?.length === 0
     ? <>
       <FaArrowDown />
-      Select photos below
+      <ResponsiveText shortText="Select below">
+        Select photos below
+      </ResponsiveText>
     </>
     : <ResponsiveText shortText={photosText}>
       {photosText} selected
diff --git a/src/components/cmdk/CommandKClient.tsx b/src/components/cmdk/CommandKClient.tsx
index 33bb41cb..eeda69e6 100644
--- a/src/components/cmdk/CommandKClient.tsx
+++ b/src/components/cmdk/CommandKClient.tsx
@@ -17,6 +17,7 @@ import {
   PATH_ADMIN_CONFIGURATION,
   PATH_ADMIN_INSIGHTS,
   PATH_ADMIN_PHOTOS,
+  PATH_ADMIN_RECIPES,
   PATH_ADMIN_TAGS,
   PATH_ADMIN_UPLOADS,
   PATH_FEED_INFERRED,
@@ -126,6 +127,7 @@ export default function CommandKClient({
     photosCountHidden,
     uploadsCount,
     tagsCount,
+    recipesCount,
     selectedPhotoIds,
     setSelectedPhotoIds,
     insightsIndicatorStatus,
@@ -425,18 +427,18 @@ export default function CommandKClient({
   };
 
   if (isUserSignedIn) {
+    if (uploadsCount) {
+      adminSection.items.push({
+        label: `Uploads (${uploadsCount})`,
+        annotation: <IconLock narrow />,
+        path: PATH_ADMIN_UPLOADS,
+      });
+    }
     adminSection.items.push({
       label: 'Manage Photos',
       annotation: <IconLock narrow />,
       path: PATH_ADMIN_PHOTOS,
     });
-    if (uploadsCount) {
-      adminSection.items.push({
-        label: 'Manage Uploads',
-        annotation: <IconLock narrow />,
-        path: PATH_ADMIN_UPLOADS,
-      });
-    }
     if (tagsCount) {
       adminSection.items.push({
         label: 'Manage Tags',
@@ -444,7 +446,25 @@ export default function CommandKClient({
         path: PATH_ADMIN_TAGS,
       });
     }
+    if (recipesCount) {
+      adminSection.items.push({
+        label: 'Manage Recipes',
+        annotation: <IconLock narrow />,
+        path: PATH_ADMIN_RECIPES,
+      });
+    }
     adminSection.items.push({
+      label: selectedPhotoIds === undefined
+        ? 'Batch Edit Photos ...'
+        : 'Exit Batch Edit',
+      annotation: <IconLock narrow />,
+      path: selectedPhotoIds === undefined
+        ? PATH_GRID_INFERRED
+        : undefined,
+      action: selectedPhotoIds === undefined
+        ? () => setSelectedPhotoIds?.([])
+        : () => setSelectedPhotoIds?.(undefined),
+    }, {
       label: <span className="flex items-center gap-3">
         App Insights
         {insightsIndicatorStatus &&
@@ -457,17 +477,6 @@ export default function CommandKClient({
       label: 'App Config',
       annotation: <IconLock narrow />,
       path: PATH_ADMIN_CONFIGURATION,
-    }, {
-      label: selectedPhotoIds === undefined
-        ? 'Select Multiple Photos'
-        : 'Exit Select Multiple Photos',
-      annotation: <IconLock narrow />,
-      path: selectedPhotoIds === undefined
-        ? PATH_GRID_INFERRED
-        : undefined,
-      action: selectedPhotoIds === undefined
-        ? () => setSelectedPhotoIds?.([])
-        : () => setSelectedPhotoIds?.(undefined),
     });
     if (showDebugTools) {
       adminSection.items.push({
@@ -537,7 +546,7 @@ export default function CommandKClient({
             />
             {isLoading && !isPending &&
               <span className={clsx(
-                'absolute top-2 right-0 w-10',
+                'absolute top-[9px] right-0 w-10',
                 'flex items-center justify-center translate-y-[2px]',
               )}>
                 <Spinner size={16} />