feat: ux/ui improvements - missing files display and archiving logic …

…updates
NFDI4Chem · Nov 28, 2023 · 7bb224f · 7bb224f
1 parent 5028bc7
commit 7bb224f
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 6 deletions.
diff --git a/app/Http/Controllers/DraftController.php b/app/Http/Controllers/DraftController.php
@@ -96,12 +96,24 @@ public function files(Request $request, Draft $draft)
                         ->orderBy('type')
                         ->get(),
                 ],
-                'missing_files' => FileSystemObject::with('children')
+                'missing_files' => FileSystemObject::where([
+                    ['draft_id', $draft->id],
+                    ['status', 'missing'],
+                ])
+                    ->count(),
+            ]);
+    }
+
+    public function missingFiles(Request $request, Draft $draft)
+    {
+        return response()->json(
+            [
+                'missing_files' => FileSystemObject::select('relative_url')
                     ->where([
                         ['draft_id', $draft->id],
                         ['status', 'missing'],
                     ])
-                    ->count(),
+                    ->get(),
             ]);
     }
 

diff --git a/app/Jobs/ProcessFiles.php b/app/Jobs/ProcessFiles.php
@@ -4,6 +4,7 @@
 
 use App\Models\Draft;
 use App\Models\FileSystemObject;
+use App\Models\Project;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -58,18 +59,35 @@ public function handle(): void
                 ->orWhere('status', 'missing')
                 ->get();
 
+            $missingFileAdded = false;
             foreach ($draftFSObjects as $fsObject) {
                 if ($fsObject->path) {
+                    $missingFile = false;
+                    if ($fsObject->status == 'missing') {
+                        $missingFile = true;
+                    }
                     $exists = Storage::disk(env('FILESYSTEM_DRIVER'))->exists($fsObject->path);
                     if (! $exists) {
                         $fsObject->status = 'missing';
                     } else {
                         $fsObject->status = 'present';
+                        if ($missingFile) {
+                            $missingFileAdded = true;
+                        }
                     }
                     $fsObject->save();
                 }
             }
 
+            if ($missingFileAdded) {
+                $project = Project::where('draft_id', $draft->id)->first();
+                foreach ($project->studies as $study) {
+                    $study->download_url = null;
+                    $study->save();
+                }
+                ArchiveStudy::dispatch($project);
+            }
+
             // $this->processFiles($draft->path);
         });
 

diff --git a/resources/js/Pages/Project/Index.vue b/resources/js/Pages/Project/Index.vue
@@ -352,8 +352,12 @@ export default {
             this.emitter.emit("openProjectCreateDialog", data);
         },
         getLink(project) {
-            if (project) {
+            if (!project.is_public) {
                 return router.visit("upload?draft_id=" + project.draft_id);
+            } else {
+                return router.visit(
+                    this.route("dashboard.projects", [project.id])
+                );
             }
         },
     },

diff --git a/resources/js/Pages/Upload.vue b/resources/js/Pages/Upload.vue
@@ -3242,4 +3242,4 @@ export default {
         },
     },
 };
-</script>
+</script>
diff --git a/resources/js/Shared/FileSystemBrowser.vue b/resources/js/Shared/FileSystemBrowser.vue
@@ -30,7 +30,8 @@
                                 </span>
                             </a>
                         </i>
-                        <span
+                        <a
+                            @click="showMissingFilesDetailsModal()"
                             v-if="missing_files > 0"
                             class="text-red-900 text-strong float-right"
                         >
@@ -47,7 +48,7 @@
                                 ></path>
                             </svg>
                             {{ missing_files }} files missing
-                        </span>
+                        </a>
                     </div>
                     <!-- <button class="float-right" @click="toggleFullScreen">
                         <span v-if="fullScreen">
@@ -567,6 +568,26 @@
             </jet-danger-button>
         </template>
     </jet-confirmation-modal>
+
+    <jet-confirmation-modal
+        :show="missing_files > 0 && showMissingFilesDetails"
+        @close="showMissingFilesDetails = null"
+    >
+        <template #title> Missing Files </template>
+
+        <template #content>
+            Following files are mising <br />
+            <span v-for="file in missing_files_list">
+                {{ file.relative_url }} <br />
+            </span>
+        </template>
+
+        <template #footer>
+            <jet-secondary-button @click="showMissingFilesDetails = null">
+                Cancel
+            </jet-secondary-button>
+        </template>
+    </jet-confirmation-modal>
 </template>
 <script>
 import JetDialogModal from "@/Jetstream/DialogModal.vue";
@@ -635,7 +656,9 @@ export default {
             showLogsDialog: false,
             currentLog: null,
             fsoBeingDeleted: null,
+            showMissingFilesDetails: null,
             missing_files: 0,
+            missing_files_list: [],
         };
     },
     computed: {
@@ -680,6 +703,18 @@ export default {
                     });
             }
         },
+        showMissingFilesDetailsModal() {
+            this.fetchMissingFiles();
+            this.showMissingFilesDetails = true;
+        },
+        fetchMissingFiles() {
+            axios
+                .get("/dashboard/drafts/" + this.draft.id + "/missing-files")
+                .then((response) => {
+                    console.log(response);
+                    this.missing_files_list = response.data.missing_files;
+                });
+        },
         toggleFullScreen() {
             this.fullScreen = !this.fullScreen;
         },

diff --git a/routes/web.php b/routes/web.php
@@ -232,6 +232,8 @@
             ->name('dashboard.draft.info');
         Route::get('drafts/{draft}/files', [DraftController::class, 'files'])
             ->name('dashboard.draft.files');
+        Route::get('drafts/{draft}/missing-files', [DraftController::class, 'missingFiles'])
+            ->name('dashboard.draft.missing-files');
         Route::put('drafts/{draft}', [DraftController::class, 'update'])
             ->name('dashboard.draft.update');
         Route::delete('drafts/{draft}/files/{filesystemobject}', [DraftController::class, 'deleteFSO'])