folders-move

frontend/src/app/AppLayout.jsx

@@ -4575,6 +4575,8 @@ const AppLayout = () => {
       onBulkCorrespondentAdd: handleBulkCorrespondentAdd,
       onBulkCorrespondentRemove: handleBulkCorrespondentRemove,
       onBulkReanalyze: handleBulkSelectionReanalyze,
+      folderOptions,
+      onMoveDocumentsToFolder: moveDocumentsToFolder,
     }),
     [
       activeCorrespondentFilters,
@@ -4623,6 +4625,8 @@ const AppLayout = () => {
       handleBulkCorrespondentAdd,
       handleBulkCorrespondentRemove,
       handleBulkSelectionReanalyze,
+      folderOptions,
+      moveDocumentsToFolder,
     ],
   );
 
@@ -4882,6 +4886,8 @@ const AppLayout = () => {
       onBulkCorrespondentAdd: handleBulkCorrespondentAdd,
       onBulkCorrespondentRemove: handleBulkCorrespondentRemove,
       onBulkReanalyze: handleBulkSelectionReanalyze,
+      folderOptions,
+      onMoveDocumentsToFolder: moveDocumentsToFolder,
     }),
     [
       documents,
@@ -4922,6 +4928,8 @@ const AppLayout = () => {
       handleBulkCorrespondentAdd,
       handleBulkCorrespondentRemove,
       handleBulkSelectionReanalyze,
+      folderOptions,
+      moveDocumentsToFolder,
     ],
   );
 

frontend/src/app/SettingsRoute.jsx

@@ -3,6 +3,8 @@ import { useNavigate } from 'react-router-dom';
 import SettingsModal from '../settings/SettingsModal';
 import { useAppShell } from '../appShellContext';
 import useApiTokens from '../settings/useApiTokens';
+import useCapabilitySets from '../settings/useCapabilitySets';
+import useCapabilities from '../settings/useCapabilities';
 import { api } from './appState';
 
 const SettingsRoute = () => {
@@ -23,31 +25,49 @@ const SettingsRoute = () => {
 
   const {
     tokens,
-    loading,
-    creating,
+    loading: tokensLoading,
+    creating: creatingToken,
     deletingId,
     regeneratingId,
     createdSecret,
-    refresh,
-    refreshCapabilitySets,
-    create,
-    revoke,
-    regenerate,
+    refresh: refreshTokens,
+    create: createToken,
+    revoke: revokeToken,
+    regenerate: regenerateToken,
     dismissSecret,
-    capabilitySets,
-    capabilitySetsLoading,
   } = useApiTokens({ api, token, notifyApiError, setStatusMessage });
 
+  const {
+    capabilitySets,
+    capabilitySetsLoading,
+    creatingCapabilitySet,
+    savingCapabilitySetId,
+    deletingCapabilitySetId,
+    supportsCapabilitySetLabels,
+    refreshCapabilitySets,
+    createCapabilitySet,
+    updateCapabilitySet,
+    deleteCapabilitySet,
+  } = useCapabilitySets({ api, token, notifyApiError, setStatusMessage });
+
+  const {
+    capabilities,
+    capabilitiesLoading,
+    refreshCapabilities,
+  } = useCapabilities({ api, notifyApiError, token });
+
   useEffect(() => {
-    refresh();
+    refreshTokens();
     refreshCapabilitySets();
+    refreshCapabilities();
     refreshPasskeys();
-  }, [refresh, refreshCapabilitySets, refreshPasskeys]);
+  }, [refreshTokens, refreshCapabilitySets, refreshCapabilities, refreshPasskeys]);
 
   const handleRefresh = useCallback(() => {
-    refresh();
+    refreshTokens();
     refreshCapabilitySets();
-  }, [refresh, refreshCapabilitySets]);
+    refreshCapabilities();
+  }, [refreshTokens, refreshCapabilitySets, refreshCapabilities]);
 
   const handleClose = useCallback(() => {
     dismissSecret();
@@ -74,18 +94,29 @@ const SettingsRoute = () => {
       open
       onClose={handleClose}
       tokens={tokens}
-      loading={loading}
-      creating={creating}
+      loading={tokensLoading}
+      creating={creatingToken}
       deletingId={deletingId}
       regeneratingId={regeneratingId}
       onRefresh={handleRefresh}
-      onCreate={create}
-      onDelete={revoke}
-      onRegenerate={regenerate}
+      onCreate={createToken}
+      onDelete={revokeToken}
+      onRegenerate={regenerateToken}
       createdToken={createdSecret}
       onDismissCreatedToken={dismissSecret}
       capabilitySets={capabilitySets}
       capabilitySetsLoading={capabilitySetsLoading}
+      creatingCapabilitySet={creatingCapabilitySet}
+      savingCapabilitySetId={savingCapabilitySetId}
+      deletingCapabilitySetId={deletingCapabilitySetId}
+      supportsCapabilitySetLabels={supportsCapabilitySetLabels}
+      onRefreshCapabilitySets={refreshCapabilitySets}
+      capabilities={capabilities}
+      capabilitiesLoading={capabilitiesLoading}
+      onRefreshCapabilities={refreshCapabilities}
+      onCreateCapabilitySet={createCapabilitySet}
+      onUpdateCapabilitySet={updateCapabilitySet}
+      onDeleteCapabilitySet={deleteCapabilitySet}
       passkeys={passkeys}
       passkeysSupported={passkeysSupported}
       passkeysLoading={passkeysLoading}