cleanup

frontend/src/app/AppLayout.jsx

@@ -1 +1,64 @@
-export { default } from './DocumentsAppLayout';
+import React from 'react';
+import { Navigate, Outlet } from 'react-router-dom';
+import { AppShellContext } from '../appShellContext';
+import DropOverlay from './DropOverlay';
+import useDocumentsWorkspace from '../hooks/documents/useDocumentsWorkspace';
+import { useDocumentsPreferences } from './useDocumentsPreferences';
+
+const AppLayout = () => {
+  const documentsPreferences = useDocumentsPreferences();
+  const {
+    appStatus,
+    location,
+    shellRef,
+    dropOverlayState,
+    managementModals,
+    contextValue,
+  } = useDocumentsWorkspace({
+    documentsViewMode: documentsPreferences.documentsViewMode,
+    documentsSortField: documentsPreferences.documentsSortField,
+    documentsSortDirection: documentsPreferences.documentsSortDirection,
+    documentsSortFieldRef: documentsPreferences.documentsSortFieldRef,
+    documentsSortDirectionRef: documentsPreferences.documentsSortDirectionRef,
+    onDocumentsViewModeChange: documentsPreferences.handleDocumentsViewModeChange,
+    onDocumentsSortFieldChange: documentsPreferences.handleDocumentsSortFieldChange,
+    onDocumentsSortDirectionToggle: documentsPreferences.handleDocumentsSortDirectionToggle,
+    searchIncludeDescendants: documentsPreferences.searchIncludeDescendants,
+    onToggleSearchIncludeDescendants: documentsPreferences.toggleSearchIncludeDescendants,
+    onSetSearchIncludeDescendants: documentsPreferences.setSearchIncludeDescendants,
+    sortRefreshReadyRef: documentsPreferences.sortRefreshReadyRef,
+    deskHelpOpen: documentsPreferences.deskHelpOpen,
+    setDeskHelpOpen: documentsPreferences.setDeskHelpOpen,
+    handleDeskExit: documentsPreferences.handleDeskExit,
+  });
+
+  if (['logged-out', 'authenticating', 'selecting-tenant'].includes(appStatus)) {
+    const shouldRememberLastLocation = appStatus !== 'logged-out';
+    return (
+      <Navigate
+        to="/account/login"
+        replace
+        state={
+          shouldRememberLastLocation
+            ? { from: location.pathname + location.search }
+            : undefined
+        }
+      />
+    );
+  }
+
+  return (
+    <AppShellContext.Provider value={contextValue}>
+      <div className="app-shell" ref={shellRef}>
+        <DropOverlay
+          active={dropOverlayState.active}
+          folderName={dropOverlayState.folderName}
+        />
+        <Outlet />
+        {managementModals}
+      </div>
+    </AppShellContext.Provider>
+  );
+};
+
+export default AppLayout;

frontend/src/app/DocumentsAppLayout.jsx

@@ -1,64 +0,0 @@
-import React from 'react';
-import { Navigate, Outlet } from 'react-router-dom';
-import { AppShellContext } from '../appShellContext';
-import DropOverlay from './DropOverlay';
-import useDocumentsWorkspace from './useDocumentsWorkspace';
-import { useDocumentsPreferences } from './useDocumentsPreferences';
-
-const DocumentsAppLayout = () => {
-  const documentsPreferences = useDocumentsPreferences();
-  const {
-    appStatus,
-    location,
-    shellRef,
-    dropOverlayState,
-    managementModals,
-    contextValue,
-  } = useDocumentsWorkspace({
-    documentsViewMode: documentsPreferences.documentsViewMode,
-    documentsSortField: documentsPreferences.documentsSortField,
-    documentsSortDirection: documentsPreferences.documentsSortDirection,
-    documentsSortFieldRef: documentsPreferences.documentsSortFieldRef,
-    documentsSortDirectionRef: documentsPreferences.documentsSortDirectionRef,
-    onDocumentsViewModeChange: documentsPreferences.handleDocumentsViewModeChange,
-    onDocumentsSortFieldChange: documentsPreferences.handleDocumentsSortFieldChange,
-    onDocumentsSortDirectionToggle: documentsPreferences.handleDocumentsSortDirectionToggle,
-    searchIncludeDescendants: documentsPreferences.searchIncludeDescendants,
-    onToggleSearchIncludeDescendants: documentsPreferences.toggleSearchIncludeDescendants,
-    onSetSearchIncludeDescendants: documentsPreferences.setSearchIncludeDescendants,
-    sortRefreshReadyRef: documentsPreferences.sortRefreshReadyRef,
-    deskHelpOpen: documentsPreferences.deskHelpOpen,
-    setDeskHelpOpen: documentsPreferences.setDeskHelpOpen,
-    handleDeskExit: documentsPreferences.handleDeskExit,
-  });
-
-  if (['logged-out', 'authenticating', 'selecting-tenant'].includes(appStatus)) {
-    const shouldRememberLastLocation = appStatus !== 'logged-out';
-    return (
-      <Navigate
-        to="/account/login"
-        replace
-        state={
-          shouldRememberLastLocation
-            ? { from: location.pathname + location.search }
-            : undefined
-        }
-      />
-    );
-  }
-
-  return (
-    <AppShellContext.Provider value={contextValue}>
-      <div className="app-shell" ref={shellRef}>
-        <DropOverlay
-          active={dropOverlayState.active}
-          folderName={dropOverlayState.folderName}
-        />
-        <Outlet />
-        {managementModals}
-      </div>
-    </AppShellContext.Provider>
-  );
-};
-
-export default DocumentsAppLayout;

frontend/src/app/useDocumentsWorkspace.js

@@ -1 +0,0 @@
-export { default } from '../hooks/documents/useDocumentsWorkspace';