📁 Several Drive fixes (#2762)

* Add "copy public link" into browser

* Make sure we search in the current company

* Fix unallowed access to Drive listing

* Fix preview modal

* Small change on the canary version note

twake/backend/node/src/services/documents/utils.ts

@@ -164,7 +164,7 @@ export const isCompanyGuest = async (context: CompanyExecutionContext): Promise<
     context.user?.id,
   );
 
-  return userRole === "guest";
+  return userRole === "guest" || !userRole;
 };
 
 /**
@@ -343,9 +343,10 @@ export const getAccessLevel = async (
   repository: Repository<DriveFile>,
   context: CompanyExecutionContext & { public_token?: string; twake_tab_token?: string },
 ): Promise<DriveFileAccessLevel | "none"> => {
-  if (!id || id === "root") return (await isCompanyGuest(context)) ? "read" : "manage";
+  if (!id || id === "root")
+    return !context?.user?.id ? "none" : (await isCompanyGuest(context)) ? "read" : "manage";
   if (id === "trash")
-    return (await isCompanyGuest(context))
+    return (await isCompanyGuest(context)) || !context?.user?.id
       ? "none"
       : (await isCompanyAdmin(context))
       ? "manage"
@@ -377,6 +378,9 @@ export const getAccessLevel = async (
       if (itemToken === publicToken) return itemLevel;
     }
 
+    //From there a user must be logged in
+    if (!context.user.id) return "none";
+
     const accessEntities = item.access_info.entities || [];
 
     //Users

twake/backend/node/src/services/documents/web/controllers/documents.ts

@@ -308,9 +308,9 @@ export class DocumentsController {
       const { search = "", added = "", company_id = "", creator = "" } = request.body;
 
       const options: SearchDocumentsOptions = {
+        company_id: company_id || context.company.id,
         ...(search ? { search } : {}),
         ...(added ? { added } : {}),
-        ...(company_id ? { company_id } : {}),
         ...(creator ? { creator } : {}),
       };
 

twake/backend/node/src/services/user/services/companies.ts

@@ -333,6 +333,7 @@ export class CompanyServiceImpl {
   }
 
   async getUserRole(companyId: uuid, userId: uuid): Promise<CompanyUserRole> {
+    if (!userId) return "guest";
     const companyUser = await this.getCompanyUser({ id: companyId }, { id: userId });
     if (!companyUser) {
       return "guest";

twake/frontend/src/app/components/search-popup/parts/drive-item-result.tsx

@@ -26,6 +26,7 @@ import { openDriveItem, onDriveItemDownloadClick } from '../common';
 import ResultContext from './result-context';
 import { useCompanyApplications } from 'app/features/applications/hooks/use-company-applications';
 import { DriveCurrentFolderAtom } from 'app/views/applications/drive/browser';
+import { FolderIcon } from '@heroicons/react/solid';
 
 export default (props: { driveItem: DriveItem & { user?: UserType } }) => {
   const input = useRecoilValue(SearchInputState);
@@ -122,6 +123,14 @@ export const FileResultMedia = (props: {
   let iconClassName = 'absolute left-0 top-0 bottom-0 right-0 m-auto w-8 h-8';
   if (url) iconClassName = 'absolute bottom-1 left-1 w-6 h-6';
 
+  if (file.is_directory) {
+    return (
+      <div className={'relative flex bg-blue-100 rounded-md ' + (props.className || '')}>
+        <FolderIcon className="w-10 h-10 m-auto text-blue-500" />
+      </div>
+    );
+  }
+
   return (
     <div className={'relative flex bg-zinc-200 rounded-md ' + (props.className || '')}>
       <Media

twake/frontend/src/app/features/drive-twake/api-client/api-client.ts

@@ -4,7 +4,7 @@ import { DriveTwakeTab } from '../types';
 export class DriveTwakeApiClient {
   static async getTab(companyId: string, tabId: string) {
     return await Api.get<DriveTwakeTab>(
-      `/internal/services/documents/v1/companies/${companyId}/tab/${tabId}`,
+      `/internal/services/documents/v1/companies/${companyId}/tabs/${tabId}`,
     );
   }
 
@@ -16,7 +16,7 @@ export class DriveTwakeApiClient {
     level: 'write' | 'read',
   ) {
     return await Api.post<DriveTwakeTab, DriveTwakeTab>(
-      `/internal/services/documents/v1/companies/${companyId}/tab/${tabId}`,
+      `/internal/services/documents/v1/companies/${companyId}/tabs/${tabId}`,
       {
         company_id: companyId,
         tab_id: tabId,

twake/frontend/src/app/features/drive/hooks/use-drive-item.tsx

@@ -89,13 +89,17 @@ export const useDriveItem = (id: string) => {
   };
 };
 
-export const usePublicLink = (item?: DriveItem) => {
+export const usePublicLink = (item?: DriveItem): string => {
   const translator = useRef(short()).current;
-  const publicLink =
-    `${document.location.protocol}//${document.location.host}` +
-    `/shared/${translator.fromUUID(item?.company_id || '')}` +
-    `/drive/${translator.fromUUID(item?.id || '')}` +
-    `/t/${item?.access_info?.public?.token}`;
+  let publicLink = `${document.location.protocol}//${document.location.host}`;
+  try {
+    publicLink +=
+      `/shared/${translator.fromUUID(item?.company_id || '')}` +
+      `/drive/${translator.fromUUID(item?.id || '')}` +
+      `/t/${item?.access_info?.public?.token}`;
+  } catch (e) {
+    return publicLink;
+  }
 
   return publicLink;
 };

twake/frontend/src/app/features/viewer/hooks/use-viewer.ts

@@ -44,17 +44,17 @@ export const useFileViewer = () => {
           loading: true,
         });
 
-          const details = await ViewerAPIClient.getMessageFile(
-            status.file.company_id || '',
-            status.file.message_id || '',
-            status.file.id || '',
-          );
+        const details = await ViewerAPIClient.getMessageFile(
+          status.file.company_id || '',
+          status.file.message_id || '',
+          status.file.id || '',
+        );
 
-          setStatus({
-            ...status,
-            details: details.resource || (details as unknown as MessageFileDetails),
-            loading: false,
-          });
+        setStatus({
+          ...status,
+          details: details.resource || (details as unknown as MessageFileDetails),
+          loading: false,
+        });
       }
     },
     [status.file?.id],