From f923c3a428df6d46be499f3a335c3ac423637c11 Mon Sep 17 00:00:00 2001
From: Nate Kelley <nate@buster.so>
Date: Thu, 13 Mar 2025 13:21:36 -0600
Subject: [PATCH] sortable sidebar collapse

---
 .../features/sidebars/SidebarPrimary.tsx      |  4 ++++
 web/src/components/ui/sidebar/Sidebar.tsx     | 19 +++++++++----------
 .../ui/sidebar/SidebarCollapsible.stories.tsx |  7 +++++--
 .../ui/sidebar/SidebarCollapsible.tsx         |  9 +++++++--
 web/src/components/ui/sidebar/interfaces.ts   |  1 +
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/web/src/components/features/sidebars/SidebarPrimary.tsx b/web/src/components/features/sidebars/SidebarPrimary.tsx
index 47166e7dc..4c66a8c8b 100644
--- a/web/src/components/features/sidebars/SidebarPrimary.tsx
+++ b/web/src/components/features/sidebars/SidebarPrimary.tsx
@@ -209,6 +209,10 @@ GlobalModals.displayName = 'GlobalModals';
 const favoritesDropdown = (favorites: BusterUserFavorite[]): ISidebarGroup => {
   return {
     label: 'Favorites',
+    isSortable: true,
+    onItemsReorder: (itemIds) => {
+      console.warn('onItemsReorder', itemIds);
+    },
     items: favorites.map((favorite) => {
       const Icon = assetTypeToIcon(favorite.asset_type);
       const route = assetTypeToRoute(favorite.asset_type, favorite.id);
diff --git a/web/src/components/ui/sidebar/Sidebar.tsx b/web/src/components/ui/sidebar/Sidebar.tsx
index 6bbb8b028..ed5b1da82 100644
--- a/web/src/components/ui/sidebar/Sidebar.tsx
+++ b/web/src/components/ui/sidebar/Sidebar.tsx
@@ -2,21 +2,21 @@ import React from 'react';
 import { ISidebarGroup, ISidebarList, SidebarProps } from './interfaces';
 import { SidebarCollapsible } from './SidebarCollapsible';
 import { SidebarItem } from './SidebarItem';
+import { useMemoizedFn } from '@/hooks';
 
 export const Sidebar: React.FC<SidebarProps> = React.memo(
-  ({ header, content, footer, activeItem, isSortable = false }) => {
+  ({ header, content, footer, activeItem }) => {
+    const onItemsReorder = useMemoizedFn((ids: string[], contentIndex: number) => {
+      console.log('onItemsReorder', ids);
+    });
+
     return (
       <div className="flex h-full flex-col overflow-hidden px-3.5 pt-4.5">
         <div className="flex flex-col space-y-4.5 overflow-hidden">
           <div className="mb-5"> {header}</div>
           <div className="flex flex-grow flex-col space-y-4.5 overflow-y-auto pb-3">
             {content.map((item, index) => (
-              <ContentSelector
-                key={index}
-                content={item}
-                activeItem={activeItem}
-                isSortable={isSortable}
-              />
+              <ContentSelector key={index} content={item} activeItem={activeItem} />
             ))}
           </div>
         </div>
@@ -31,10 +31,9 @@ Sidebar.displayName = 'Sidebar';
 const ContentSelector: React.FC<{
   content: SidebarProps['content'][number];
   activeItem: SidebarProps['activeItem'];
-  isSortable: SidebarProps['isSortable'];
-}> = React.memo(({ content, activeItem, isSortable }) => {
+}> = React.memo(({ content, activeItem }) => {
   if (isSidebarGroup(content)) {
-    return <SidebarCollapsible {...content} activeItem={activeItem} isSortable={isSortable} />;
+    return <SidebarCollapsible {...content} activeItem={activeItem} />;
   }
 
   return <SidebarList items={content.items} activeItem={activeItem} />;
diff --git a/web/src/components/ui/sidebar/SidebarCollapsible.stories.tsx b/web/src/components/ui/sidebar/SidebarCollapsible.stories.tsx
index bb5d31271..ef067f60a 100644
--- a/web/src/components/ui/sidebar/SidebarCollapsible.stories.tsx
+++ b/web/src/components/ui/sidebar/SidebarCollapsible.stories.tsx
@@ -3,6 +3,7 @@ import { SidebarCollapsible } from './SidebarCollapsible';
 import { HouseModern, MapSettings, User } from '../icons/NucleoIconOutlined';
 import { BusterRoutes } from '../../../routes';
 import React from 'react';
+import { fn } from '@storybook/test';
 
 const meta: Meta<typeof SidebarCollapsible> = {
   title: 'UI/Sidebar/SidebarCollapsible',
@@ -50,7 +51,9 @@ export const Default: Story = {
 
 export const Sortable: Story = {
   args: {
-    ...Default.args,
-    isSortable: true
+    label: 'Sortable',
+    isSortable: true,
+    items: Default.args!.items!,
+    onItemsReorder: fn()
   }
 };
diff --git a/web/src/components/ui/sidebar/SidebarCollapsible.tsx b/web/src/components/ui/sidebar/SidebarCollapsible.tsx
index 73580f6a6..cb9221c67 100644
--- a/web/src/components/ui/sidebar/SidebarCollapsible.tsx
+++ b/web/src/components/ui/sidebar/SidebarCollapsible.tsx
@@ -100,12 +100,15 @@ const SortableSidebarItem: React.FC<SortableSidebarItemProps> = React.memo(({ it
 
 SortableSidebarItem.displayName = 'SortableSidebarItem';
 
-export const SidebarCollapsible: React.FC<ISidebarGroup & { activeItem?: string }> = React.memo(
+export const SidebarCollapsible: React.FC<
+  ISidebarGroup & { activeItem?: string; onItemsReorder?: (ids: string[]) => void }
+> = React.memo(
   ({
     label,
     items,
     isSortable = false,
     activeItem,
+    onItemsReorder,
     variant = 'collapsible',
     icon,
     defaultOpen = true
@@ -133,7 +136,9 @@ export const SidebarCollapsible: React.FC<ISidebarGroup & { activeItem?: string
         setSortedItems((items) => {
           const oldIndex = items.findIndex((item) => item.id === active.id);
           const newIndex = items.findIndex((item) => item.id === over?.id);
-          return arrayMove(items, oldIndex, newIndex);
+          const moveddArray = arrayMove(items, oldIndex, newIndex);
+          onItemsReorder?.(moveddArray.map((item) => item.id));
+          return moveddArray;
         });
       }
     });
diff --git a/web/src/components/ui/sidebar/interfaces.ts b/web/src/components/ui/sidebar/interfaces.ts
index 1935e81b3..a09a177b8 100644
--- a/web/src/components/ui/sidebar/interfaces.ts
+++ b/web/src/components/ui/sidebar/interfaces.ts
@@ -18,6 +18,7 @@ export interface ISidebarGroup {
   variant?: 'collapsible' | 'icon'; //default is collapsible
   defaultOpen?: boolean; //will default to true
   isSortable?: boolean;
+  onItemsReorder?: (ids: string[]) => void;
 }
 
 export interface ISidebarList {