finalUpdate

Author: fabienSvtr

client/src/components/files/operations/FileOperationBase.vue

@@ -101,9 +101,7 @@
           v-if="props.status === FileOperationEvents.Progress && props.eventData"
         >
           <ion-text class="progress-percentage button-small default-state">
-            {{
-              (props.eventData as OperationProgressEventData).global.progress
-            }}%
+            {{ (props.eventData as OperationProgressEventData).global.progress }}%
           </ion-text>
           <ms-spinner class="progress-spinner default-state" />
           <ion-button
@@ -117,6 +115,21 @@
           </ion-button>
         </div>
 
+        <!-- done -->
+        <ion-icon
+          class="folder-icon"
+          v-if="props.status === FileOperationEvents.Finished && props.operationData.type !== FileOperationDataType.Download"
+          :icon="folder"
+          @click="$emit('click', operationData, props.status, eventData)"
+          @mouseover="isHovered = true"
+          @mouseleave="isHovered = false"
+        />
+        <ion-icon
+          class="checkmark-icon"
+          v-if="props.status === FileOperationEvents.Finished && props.operationData.type === FileOperationDataType.Download"
+          :icon="checkmarkCircle"
+        />
+
         <!-- cancelled -->
         <ion-icon
           class="cancel-icon"
@@ -162,7 +175,7 @@ import {
   OperationProgressEventData,
 } from '@/services/fileOperation';
 import { IonButton, IonIcon, IonItem, IonText } from '@ionic/vue';
-import { alert, chevronDown, warning } from 'ionicons/icons';
+import { alert, checkmarkCircle, chevronDown, folder, warning } from 'ionicons/icons';
 import { MsImage, MsSpinner } from 'megashark-lib';
 import { computed, ref } from 'vue';
 
@@ -172,8 +185,9 @@ const props = defineProps<{
   eventData?: FileOperationEventData;
 }>();
 
-const cancelling = ref(false);
+const isHovered = ref(false);
 const showFileList = ref(false);
+const cancelling = ref(false);
 
 const info = computed(() => {
   switch (props.operationData.type) {

client/src/components/files/operations/FileOperationDownloadArchive.vue

@@ -70,9 +70,7 @@
           v-if="props.status === FileOperationEvents.Progress && props.eventData"
         >
           <ion-text class="progress-percentage button-small default-state">
-            {{
-              (props.eventData as OperationProgressEventData).global.progress
-            }}%
+            {{ (props.eventData as OperationProgressEventData).global.progress }}%
           </ion-text>
           <ms-spinner class="progress-spinner default-state" />
           <ion-button
@@ -85,6 +83,13 @@
           </ion-button>
         </div>
 
+        <!-- done -->
+        <ion-icon
+          class="checkmark-icon"
+          v-if="props.status === FileOperationEvents.Finished"
+          :icon="checkmarkCircle"
+        />
+
         <!-- cancelled -->
         <ion-icon
           class="cancel-icon"
@@ -113,7 +118,7 @@ import {
   OperationProgressEventData,
 } from '@/services/fileOperation';
 import { IonButton, IonIcon, IonItem, IonText } from '@ionic/vue';
-import { alert, warning } from 'ionicons/icons';
+import { alert, checkmarkCircle, warning } from 'ionicons/icons';
 import { MsImage, MsSpinner } from 'megashark-lib';
 import { ref } from 'vue';
 

client/src/components/files/operations/FileOperationImport.vue

@@ -128,9 +128,7 @@
           v-if="props.status === FileOperationEvents.Progress && props.eventData"
         >
           <ion-text class="progress-percentage button-small default-state">
-            {{
-              (eventData as OperationProgressEventData).global.progress
-            }}%
+            {{ (eventData as OperationProgressEventData).global.progress }}%
           </ion-text>
           <ms-spinner class="progress-spinner default-state" />
           <ion-button

client/src/views/files/FileOperationMenu.vue

@@ -86,7 +86,13 @@
 <script setup lang="ts">
 import { FileOperationBase, FileOperationDownloadArchive, FileOperationImport } from '@/components/files';
 import { navigateTo, Routes } from '@/router';
-import { FileOperationData, FileOperationDataType, FileOperationImportData } from '@/services/fileOperation';
+import {
+  FileOperationCopyData,
+  FileOperationData,
+  FileOperationDataType,
+  FileOperationImportData,
+  FileOperationMoveData,
+} from '@/services/fileOperation';
 import { FileEventRegistrationCanceller, FileOperationEventData, FileOperationEvents } from '@/services/fileOperation/events';
 import { FileOperationManager, FileOperationManagerKey } from '@/services/fileOperation/manager';
 import useUploadMenu from '@/services/fileUploadMenu';
@@ -229,7 +235,7 @@ async function onClearClicked(): Promise<void> {
 }
 
 async function onOperationClick(
-  operation: FileOperationData,
+  operation: FileOperationData | FileOperationImportData | FileOperationCopyData | FileOperationMoveData,
   status: FileOperationEvents,
   _eventData?: FileOperationEventData,
 ): Promise<void> {
@@ -245,6 +251,15 @@ async function onOperationClick(
         selectFile: op.files.length === 1 ? op.files.at(0)?.name : undefined,
       },
     });
+  } else if (operation.type === FileOperationDataType.Move || operation.type === FileOperationDataType.Copy) {
+    const op = operation as FileOperationMoveData | FileOperationCopyData;
+    await navigateTo(Routes.Documents, {
+      query: {
+        workspaceHandle: operation.workspaceHandle,
+        documentPath: op.destination,
+        selectFile: op.sources.length === 1 ? op.sources.at(0)?.name : undefined,
+      },
+    });
   }
 }