📁 Fix renaming and thumbnail (#2776)

* Fix renaming and thumbnail * Fixed realtime and context menu
linagora · Mar 9, 2023 · 0c3f576 · 0c3f576
1 parent 0b9ca81
commit 0c3f576
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/twake/backend/node/src/services/documents/entities/file-version.ts b/twake/backend/node/src/services/documents/entities/file-version.ts
@@ -66,7 +66,7 @@ export type DriveFileMetadata = {
   name?: string;
   mime?: string;
   size?: number;
-  thumbnails?: DriveFileThumbnail;
+  thumbnails?: DriveFileThumbnail[];
 };
 
 type DriveFileThumbnail = {

diff --git a/twake/backend/node/src/services/documents/services/index.ts b/twake/backend/node/src/services/documents/services/index.ts
@@ -240,6 +240,7 @@ export class DocumentsService {
           driveItemVersion.file_metadata.mime = fileToProcess.metadata.mime;
           driveItemVersion.file_metadata.size = fileToProcess.upload_data.size;
           driveItemVersion.file_metadata.name = fileToProcess.metadata.name;
+          driveItemVersion.file_metadata.thumbnails = fileToProcess.thumbnails;
           if (context.user.application_id) {
             driveItemVersion.application_id = context.user.application_id;
           }
@@ -559,6 +560,7 @@ export class DocumentsService {
       driveItemVersion.file_metadata.size = metadata.size;
       driveItemVersion.file_metadata.name = metadata.name;
       driveItemVersion.file_metadata.mime = metadata.mime;
+      driveItemVersion.file_metadata.thumbnails = metadata.thumbnails;
       driveItemVersion.drive_item_id = item.id;
       if (context.user.application_id) {
         driveItemVersion.application_id = context.user.application_id;

diff --git a/twake/backend/node/src/services/documents/utils.ts b/twake/backend/node/src/services/documents/utils.ts
@@ -678,11 +678,13 @@ export const getFileMetadata = async (
   }
 
   return {
+    source: "internal",
     external_id: fileId,
     mime: file.metadata.mime,
     name: file.metadata.name,
     size: file.upload_data.size,
-  };
+    thumbnails: file.thumbnails,
+  } as DriveFileMetadata;
 };
 
 /**

diff --git a/twake/frontend/src/app/features/drive/hooks/use-drive-realtime.tsx b/twake/frontend/src/app/features/drive/hooks/use-drive-realtime.tsx
@@ -10,3 +10,8 @@ export const useDriveRealtime = (id: string) => {
     refresh(id);
   });
 };
+
+export const DriveRealtimeObject = ({ id }: { id: string }) => {
+  useDriveRealtime(id);
+  return <></>;
+};
diff --git a/twake/frontend/src/app/features/global/hooks/use-realtime.ts b/twake/frontend/src/app/features/global/hooks/use-realtime.ts
@@ -51,7 +51,7 @@ const useRealtimeRoom = <T>(
 
   useEffect(() => {
     if (room !== roomConf) {
-      setRoom(roomConf);
+      setRoom({ ...roomConf });
       if (room && subscribed.current && websocket) {
         websocket.leave(room.room, tag);
         subscribed.current = false;

diff --git a/twake/frontend/src/app/views/applications/drive/browser.tsx b/twake/frontend/src/app/views/applications/drive/browser.tsx
@@ -6,7 +6,7 @@ import { getFilesTree } from 'app/components/uploads/file-tree-utils';
 import UploadZone from 'app/components/uploads/upload-zone';
 import { setTwakeTabToken } from 'app/features/drive/api-client/api-client';
 import { useDriveItem } from 'app/features/drive/hooks/use-drive-item';
-import { useDriveRealtime } from 'app/features/drive/hooks/use-drive-realtime';
+import { DriveRealtimeObject } from 'app/features/drive/hooks/use-drive-realtime';
 import { useDriveUpload } from 'app/features/drive/hooks/use-drive-upload';
 import { DriveItemSelectedList } from 'app/features/drive/state/store';
 import { formatBytes } from 'app/features/drive/utils';
@@ -61,7 +61,6 @@ export default memo(
     } = useDriveItem(parentId);
     const { item: trash } = useDriveItem('trash');
     const { uploadTree, uploadFromUrl } = useDriveUpload();
-    useDriveRealtime(parentId);
 
     const loading = loadingParent || loadingParentChange;
 
@@ -135,6 +134,7 @@ export default memo(
           });
         }}
       >
+        <DriveRealtimeObject id={parentId} key={parentId} />
         <CreateModal
           selectFromDevice={() => uploadZoneRef.current?.open()}
           addFromUrl={(url, name) => {

diff --git a/twake/frontend/src/app/views/applications/drive/context-menu.tsx b/twake/frontend/src/app/views/applications/drive/context-menu.tsx
@@ -65,7 +65,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
             { type: 'separator' },
             {
               type: 'menu',
-              text: 'Modify properties',
+              text: 'Rename',
               hide: access === 'read',
               onClick: () => setPropertiesModalState({ open: true, id: item.id }),
             },
@@ -132,7 +132,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
           }
         }
 
-        if (selectedCount && !item) {
+        if (selectedCount && (selectedCount >= 2 || !item)) {
           // Add selected items related menus
           const newMenuActions: any[] = [
             {

diff --git a/twake/frontend/src/app/views/applications/drive/modals/properties/index.tsx b/twake/frontend/src/app/views/applications/drive/modals/properties/index.tsx
@@ -47,7 +47,7 @@ const PropertiesModalContent = ({ id, onClose }: { id: string; onClose: () => vo
   }, [item?.name]);
 
   return (
-    <ModalContent title={'Properties of ' + item?.name}>
+    <ModalContent title={'Rename ' + item?.name}>
       <InputLabel
         className="mt-4"
         label={'Name'}
@@ -67,7 +67,14 @@ const PropertiesModalContent = ({ id, onClose }: { id: string; onClose: () => vo
         loading={loading}
         onClick={async () => {
           setLoading(true);
-          if (item) await update({ name }, id, item.parent_id);
+          if (item) {
+            let finalName = name;
+            if (!item?.is_directory) {
+              const ext = item?.name.split('.').pop();
+              finalName = name.split('.')[0] + (ext !== item?.name ? '.' + ext : '');
+            }
+            await update({ name: finalName }, id, item.parent_id);
+          }
           onClose();
           setLoading(false);
         }}