fix: various updates and bug fixes

NFDI4Chem · Nov 10, 2023 · 06be025 · 06be025
1 parent 2eed0ed
commit 06be025
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/app/Jobs/ArchiveProject.php b/app/Jobs/ArchiveProject.php
@@ -6,14 +6,15 @@
 use App\Models\Project;
 use Aws\S3\S3Client;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;
 use ZipStream;
 
-class ArchiveProject implements ShouldQueue
+class ArchiveProject implements ShouldQueue, ShouldBeUnique
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

diff --git a/app/Jobs/ArchiveStudy.php b/app/Jobs/ArchiveStudy.php
@@ -5,6 +5,7 @@
 use App\Models\Project;
 use Aws\S3\S3Client;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
@@ -13,7 +14,7 @@
 use Illuminate\Support\Facades\Storage;
 use ZipStream;
 
-class ArchiveStudy implements ShouldQueue
+class ArchiveStudy implements ShouldQueue, ShouldBeUnique
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

diff --git a/database/migrations/2022_09_16_115525_create_nmrium_table.php b/database/migrations/2022_09_16_115525_create_nmrium_table.php
@@ -20,10 +20,10 @@ public function up()
             $table->timestamps();
         });
 
-        // Schema::table('datasets', function (Blueprint $table) {
-        //     $table->dropColumn('nmrium_info');
-        //     $table->boolean('has_nmrium')->nullable()->default(0);
-        // });
+        Schema::table('datasets', function (Blueprint $table) {
+            $table->dropColumn('nmrium_info');
+            $table->boolean('has_nmrium')->nullable()->default(0);
+        });
     }
 
     /**

diff --git a/resources/js/Pages/Public/Project/Files.vue b/resources/js/Pages/Public/Project/Files.vue
@@ -1,7 +1,7 @@
 <template>
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
-            <div class="pb-10 mb-10 max-w-7xl mx-auto p-4">
+            <div class="pb-10 mb-10 max-w-7xl mx-auto py-4">
                 <div v-if="project.data.files">
                     <nav
                         v-if="$page.props.selectedFolder"

diff --git a/resources/js/Shared/Children.vue b/resources/js/Shared/Children.vue
@@ -107,7 +107,7 @@
                                                         sfile.relative_url
                                                         ? 'cursor-pointer bg-gray-100 text-gray-900'
                                                         : 'cursor-pointer text-gray-600',
-                                                    'group w-full flex items-center pr-2 py-1 text-left font-medium rounded-md focus:outline-none focus:ring-2 focus:ring-indigo-500',
+                                                    'group w-full flex pr-1 py-1 text-left font-medium rounded-md focus:outline-none focus:ring-2 focus:ring-indigo-500',
                                                 ]"
                                                 @click.stop="
                                                     displaySelected(sfile)
@@ -159,7 +159,7 @@
                                                                 sfile.status ==
                                                                 'missing'
                                                                     ? 'text-red-800'
-                                                                    : '',
+                                                                    : 'ellipsis',
                                                             ]"
                                                             style="
                                                                 user-select: none;
@@ -193,7 +193,7 @@
                                                     v-for="subItem in sfile.children"
                                                     :key="subItem.name"
                                                     as="div"
-                                                    class="cursor-pointer group w-full flex items-center pl-7 pr-2 py-0 font-medium text-gray-600 rounded-md"
+                                                    class="cursor-pointer group w-full flex pl-4 pr-2 py-0 font-medium text-gray-600 rounded-md"
                                                     @click.stop="
                                                         displaySelected(subItem)
                                                     "

diff --git a/resources/js/Shared/FileSystemBrowser.vue b/resources/js/Shared/FileSystemBrowser.vue
@@ -199,14 +199,14 @@
                 :class="[
                     fullScreen
                         ? 'overflow-scroll h-full relative px-6 py-4'
-                        : 'px-5',
+                        : 'px-1',
                     'min-w-0 flex-1 bg-white border-t border-gray-200 lg:flex',
                 ]"
             >
                 <aside
                     :class="[
                         height ? height : '',
-                        'py-5 pr-4 lg:inset-y-0 lg:z-50 lg:flex lg:w-72 lg:flex-col overflow-y-scroll border-r',
+                        'py-2 lg:inset-y-0 lg:z-50 lg:flex lg:w-72 lg:flex-col overflow-y-scroll overflow-x-scroll border-r',
                     ]"
                 >
                     <children :file="file"></children>