cleanup

frontend/src/documents/SelectionFloatingActions.tsx

@@ -7,7 +7,6 @@ import {
   FolderOutlineIcon,
   TagIcon,
   CorrespondentIcon,
-  LoaderIcon,
 } from '../ui/icons';
 import SelectionAssignmentMenu, { SelectionAssignmentMenuItem } from './SelectionAssignmentMenu';
 import SelectionSummary from './SelectionSummary';
@@ -287,13 +286,11 @@ const SelectionFloatingActions: React.FC<SelectionFloatingActionsProps> = ({
   const tagLookupMap = tagLookupById instanceof Map ? tagLookupById : null;
 
   const [remoteFolderOptions, setRemoteFolderOptions] = useState<SelectionAssignmentMenuItem[] | null>(null);
-  const [loadingFolders, setLoadingFolders] = useState(false);
   const folderTreeFetchRef = useRef<Promise<SelectionAssignmentMenuItem[]> | null>(null);
 
   useEffect(() => {
     setRemoteFolderOptions(null);
     folderTreeFetchRef.current = null;
-    setLoadingFolders(false);
   }, [tenantId, token]);
 
   const requestFolderTree = useCallback(async (): Promise<SelectionAssignmentMenuItem[]> => {
@@ -311,7 +308,6 @@ const SelectionFloatingActions: React.FC<SelectionFloatingActionsProps> = ({
     }
 
     const fetchPromise = (async () => {
-      setLoadingFolders(true);
       try {
         const data = await getFolderTree();
         const options = buildFolderTreeOptions(data);
@@ -322,7 +318,6 @@ const SelectionFloatingActions: React.FC<SelectionFloatingActionsProps> = ({
         setRemoteFolderOptions([]);
         return [];
       } finally {
-        setLoadingFolders(false);
         folderTreeFetchRef.current = null;
       }
     })();
@@ -521,19 +516,15 @@ const SelectionFloatingActions: React.FC<SelectionFloatingActionsProps> = ({
       label="Move"
       triggerContent={(
         <span className="quick-add__chip-label" title="Move">
-          {loadingFolders ? (
-            <LoaderIcon className="icon-inline icon--spin" aria-hidden="true" />
-          ) : (
-            <FolderOutlineIcon className="icon-inline" aria-hidden="true" />
-          )}
+          <FolderOutlineIcon className="icon-inline" aria-hidden="true" />
           <span className="quick-add__chip-text" aria-hidden="true">Move</span>
         </span>
       )}
       items={moveAssignments}
       placeholder="Search folders…"
-      emptyMessage={loadingFolders ? 'Loading folders…' : 'No folders'}
+      emptyMessage="No folders"
       onToggle={(item) => handleMoveSelectionToFolder(item?.payload || item)}
-      disabled={!documentCount || (loadingFolders && !moveAssignments.length)}
+      disabled={!documentCount}
       createLabel={null}
       showStateIndicators={false}
       showCounts={false}

frontend/src/documents/hooks/useBulkDocumentActions.ts

@@ -19,10 +19,9 @@ interface UseBulkDocumentActionsArgs {
   setStatusMessage: (message: string, variant?: string) => void;
   selectedDocumentIds?: Identifier[];
   selectedFolderIds?: Identifier[];
-  handleDocumentsDelete: (ids: Identifier[], options?: { showMessage?: boolean; manageLoading?: boolean }) => Promise<boolean>;
-  handleFolderDelete: (id: Identifier, options?: { showMessage?: boolean; manageLoading?: boolean }) => Promise<boolean>;
+  handleDocumentsDelete: (ids: Identifier[], options?: { showMessage?: boolean }) => Promise<boolean>;
+  handleFolderDelete: (id: Identifier, options?: { showMessage?: boolean }) => Promise<boolean>;
   clearDocumentSelection: () => void;
-  setLoading: (value: boolean) => void;
   updateDocumentCaches?: (id: Identifier, updater: (doc: any) => any) => void;
 }
 
@@ -36,7 +35,6 @@ const useBulkDocumentActions = ({
   handleDocumentsDelete,
   handleFolderDelete,
   clearDocumentSelection,
-  setLoading,
   updateDocumentCaches,
 }: UseBulkDocumentActionsArgs) => {
   const handleBulkCorrespondentAdd = useCallback(
@@ -202,25 +200,20 @@ const useBulkDocumentActions = ({
       return;
     }
 
-    setLoading(true);
     let docsOk = true;
     let foldersOk = true;
 
-    try {
-      if (docIds.length) {
-        docsOk = await handleDocumentsDelete(docIds, { showMessage: false, manageLoading: false });
-      }
+    if (docIds.length) {
+      docsOk = await handleDocumentsDelete(docIds, { showMessage: false });
+    }
 
-      if (folderIds.length) {
-        for (const folderId of folderIds) {
-          const success = await handleFolderDelete(folderId, { showMessage: false, manageLoading: false });
-          if (!success) {
-            foldersOk = false;
-          }
+    if (folderIds.length) {
+      for (const folderId of folderIds) {
+        const success = await handleFolderDelete(folderId, { showMessage: false });
+        if (!success) {
+          foldersOk = false;
         }
       }
-    } finally {
-      setLoading(false);
     }
 
     if (!docsOk || !foldersOk) {
@@ -245,7 +238,6 @@ const useBulkDocumentActions = ({
     handleFolderDelete,
     selectedDocumentIds,
     selectedFolderIds,
-    setLoading,
     setStatusMessage,
   ]);