Merge remote-tracking branch 'ui/ui' into dev

frontend/src/hooks/documents/useDocumentsWorkspace.js

@@ -328,6 +328,7 @@ const useDocumentsWorkspace = ({
 
   const {
     previewEntries,
+    previewDocuments,
     ensurePreviewData,
     openDocumentPreview,
     closeDocumentPreview,
@@ -337,7 +338,6 @@ const useDocumentsWorkspace = ({
     routeDocumentId: previewDocumentId,
     documents,
     searchResults,
-    setDocuments,
     selectedFolder,
     assetManager,
     api,
@@ -410,8 +410,13 @@ const useDocumentsWorkspace = ({
     if (Array.isArray(searchResults)) {
       push(searchResults);
     }
+    previewDocuments.forEach((doc, id) => {
+      if (doc && id && !map.has(id)) {
+        map.set(id, doc);
+      }
+    });
     return map;
-  }, [documents, searchResults]);
+  }, [documents, searchResults, previewDocuments]);
 
   const {
     tags,
@@ -1158,6 +1163,7 @@ const useDocumentsWorkspace = ({
   } = useDetailWorkspace({
     documents,
     searchResults,
+    previewDocuments,
     focusedDocumentId,
     selectionOrder,
     selectedDocumentIds,

frontend/src/hooks/documents/useTenantManager.js

@@ -30,10 +30,10 @@ const useTenantManager = ({
         }
 
         if (refreshOnly) {
-          const { data } = await apiClient.get('/auth/tenants');
+          const { data } = await apiClient.get('/tenants');
           appDispatch({
             type: 'SET_TENANTS',
-            tenants: Array.isArray(data?.tenants) ? data.tenants : [],
+            tenants: Array.isArray(data) ? data : [],
           });
           return;
         }