[MS] Full implementation of workspace history

Scille · Oct 22, 2024 · 68f042c · 68f042c
1 parent 45fda67
commit 68f042c
Show file tree

Hide file tree

Showing 30 changed files with 1,393 additions and 39 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -53,7 +53,7 @@
         "@types/luxon": "^3.3.4",
         "axios": "^1.7.4",
         "luxon": "^3.4.4",
-        "megashark-lib": "git+https://github.com/Scille/megashark-lib.git#d1ebfc3607f9d31df7a6e6430a6dbceafd9099d5",
+        "megashark-lib": "git+https://github.com/Scille/megashark-lib.git#5827e410f9b2c494f44cad402bb280df9d586425",
         "qrcode-vue3": "^1.6.8",
         "uuid": "^9.0.1",
         "vue": "^3.3.8",

diff --git a/client/src/components/files/FileCard.vue b/client/src/components/files/FileCard.vue
@@ -17,6 +17,7 @@
       :current-path="currentPath"
       @files-added="$emit('filesAdded', $event)"
       :is-reader="isWorkspaceReader"
+      @drop-as-reader="$emit('dropAsReader')"
     >
       <div class="card-checkbox">
         <!-- eslint-disable vue/no-mutating-props -->
@@ -101,6 +102,7 @@ const emits = defineEmits<{
   (e: 'click', event: Event, entry: EntryModel): void;
   (e: 'menuClick', event: Event, entry: EntryModel, onFinished: () => void): void;
   (e: 'filesAdded', imports: FileImportTuple[]): void;
+  (e: 'dropAsReader'): void;
 }>();
 
 defineExpose({

diff --git a/client/src/components/files/FileDropZone.vue b/client/src/components/files/FileDropZone.vue
@@ -34,8 +34,7 @@ import { DocumentImport, MsImage } from 'megashark-lib';
 import { FileImportTuple, getFilesFromDrop } from '@/components/files/utils';
 import { FsPath } from '@/parsec';
 import { IonLabel } from '@ionic/vue';
-import { computed, inject, onMounted, onUnmounted, ref } from 'vue';
-import { Information, InformationLevel, InformationManager, InformationManagerKey, PresentationMode } from '@/services/informationManager';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 
 defineExpose({
   reset,
@@ -50,10 +49,10 @@ const props = defineProps<{
 
 const emits = defineEmits<{
   (e: 'filesAdded', imports: FileImportTuple[]): void;
+  (e: 'dropAsReader'): void;
 }>();
 
 const dragEnterCount = ref(0);
-const informationManager: InformationManager = inject(InformationManagerKey)!;
 
 const isActive = computed(() => {
   return !props.disabled && !props.isReader && dragEnterCount.value > 0;
@@ -77,19 +76,13 @@ onUnmounted(() => {
 
 async function onDrop(event: DragEvent): Promise<void> {
   if (props.isReader) {
-    await informationManager.present(
-      new Information({
-        message: 'FoldersPage.ImportFile.noDropForReader',
-        level: InformationLevel.Error,
-      }),
-      PresentationMode.Toast,
-    );
+    event.stopPropagation();
+    emits('dropAsReader');
     return;
   }
   if (props.disabled) {
     return;
   }
-  event.stopPropagation();
   dragEnterCount.value = 0;
   const imports = await getFilesFromDrop(event, props.currentPath);
   if (imports.length) {

diff --git a/client/src/components/files/FileGridDisplay.vue b/client/src/components/files/FileGridDisplay.vue
@@ -7,6 +7,7 @@
     :show-drop-message="true"
     @files-added="$emit('filesAdded', $event)"
     :is-reader="ownRole === WorkspaceRole.Reader"
+    @drop-as-reader="$emit('dropAsReader')"
   >
     <div
       class="scroll"
@@ -24,6 +25,7 @@
           @menu-click="(event, entry, onFinished) => $emit('menuClick', event, entry, onFinished)"
           @files-added="onFilesAdded"
           :is-workspace-reader="ownRole === WorkspaceRole.Reader"
+          @drop-as-reader="$emit('dropAsReader')"
         />
         <file-card
           class="folder-grid-item"
@@ -35,6 +37,7 @@
           @click="$emit('click', file, $event)"
           @menu-click="(event, entry, onFinished) => $emit('menuClick', event, entry, onFinished)"
           @files-added="onFilesAdded"
+          @drop-as-reader="$emit('dropAsReader')"
         />
 
         <file-card-processing
@@ -73,6 +76,7 @@ const emits = defineEmits<{
   (e: 'menuClick', event: Event, entry: EntryModel, onFinished: () => void): void;
   (e: 'globalMenuClick', event: Event): void;
   (e: 'filesAdded', imports: FileImportTuple[]): void;
+  (e: 'dropAsReader'): void;
 }>();
 
 onMounted(async () => {

diff --git a/client/src/components/files/FileListDisplay.vue b/client/src/components/files/FileListDisplay.vue
@@ -8,6 +8,7 @@
       @files-added="$emit('filesAdded', $event)"
       :show-drop-message="true"
       :is-reader="ownRole === WorkspaceRole.Reader"
+      @drop-as-reader="$emit('dropAsReader')"
     >
       <div
         class="scroll"
@@ -54,6 +55,7 @@
               @selected-change="onSelectedChange"
               @files-added="onFilesAdded"
               :is-workspace-reader="ownRole === WorkspaceRole.Reader"
+              @drop-as-reader="$emit('dropAsReader')"
             />
             <file-list-item
               v-for="file in files.getEntries()"
@@ -65,6 +67,7 @@
               @menu-click="(event, entry, onFinished) => $emit('menuClick', event, entry, onFinished)"
               @selected-change="onSelectedChange"
               @files-added="onFilesAdded"
+              @drop-as-reader="$emit('dropAsReader')"
             />
             <file-list-item-processing
               v-for="op in operationsInProgress"
@@ -103,6 +106,7 @@ const emits = defineEmits<{
   (e: 'menuClick', event: Event, entry: EntryModel, onFinished: () => void): void;
   (e: 'globalMenuClick', event: Event): void;
   (e: 'filesAdded', imports: FileImportTuple[]): void;
+  (e: 'dropAsReader'): void;
 }>();
 
 const fileDropZoneRef = ref();

diff --git a/client/src/components/files/FileListItem.vue b/client/src/components/files/FileListItem.vue
@@ -2,11 +2,12 @@
 
 <template>
   <file-drop-zone
-    :disabled="entry.isFile()"
+    :disabled="disableDrop || entry.isFile()"
     :current-path="currentPath"
     @files-added="$emit('filesAdded', $event)"
     :is-reader="isWorkspaceReader"
     class="drop-zone-item"
+    @drop-as-reader="$emit('dropAsReader')"
   >
     <ion-item
       button
@@ -43,6 +44,7 @@
             {{ entry.name }}
           </ion-label>
           <ion-icon
+            v-show="!hideSyncStatus"
             class="cloud-overlay"
             :class="isFileSynced() ? 'cloud-overlay-ok' : 'cloud-overlay-ko'"
             :icon="isFileSynced() ? cloudDone : cloudOffline"
@@ -62,7 +64,10 @@
         </div>
 
         <!-- last update -->
-        <div class="file-lastUpdate">
+        <div
+          class="file-lastUpdate"
+          v-show="!hideLastUpdate"
+        >
           <ion-label class="label-last-update cell">
             {{ $msTranslate(formatTimeSince(entry.updated, '--', 'short')) }}
           </ion-label>
@@ -82,7 +87,7 @@
         <div class="file-options ion-item-child-clickable">
           <ion-button
             fill="clear"
-            v-show="isHovered || menuOpened"
+            v-show="!hideMenu && (isHovered || menuOpened)"
             class="options-button"
             @click.stop="onOptionsClick($event)"
             @dblclick.stop
@@ -118,13 +123,18 @@ const props = defineProps<{
   entry: EntryModel;
   showCheckbox: boolean;
   isWorkspaceReader?: boolean;
+  disableDrop?: boolean;
+  hideSyncStatus?: boolean;
+  hideLastUpdate?: boolean;
+  hideMenu?: boolean;
 }>();
 
 const emits = defineEmits<{
   (e: 'click', event: Event, entry: EntryModel): void;
   (e: 'menuClick', event: Event, entry: EntryModel, onFinished: () => void): void;
   (e: 'selectedChange', entry: EntryModel, checked: boolean): void;
   (e: 'filesAdded', imports: FileImportTuple[]): void;
+  (e: 'dropAsReader'): void;
 }>();
 
 defineExpose({