Merge pull request #523 from NFDI4Chem/development

fix: Extending drafts to include shared project drafts
NFDI4Chem · Oct 20, 2022 · 4d00f79 · 4d00f79
2 parents cf84c7c + cade25c
commit 4d00f79
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/app/Http/Controllers/DraftController.php b/app/Http/Controllers/DraftController.php
@@ -45,6 +45,8 @@ public function all(Request $request)
             ->where('owner_id', $user_id)
             ->first();
 
+        $sharedDrafts = $user->sharedDrafts();
+
         if (! $defaultDraft) {
             $id = Str::uuid();
             $environment = env('APP_ENV', 'local');
@@ -71,6 +73,7 @@ public function all(Request $request)
 
         return response()->json([
             'drafts' => $drafts,
+            'sharedDrafts' => $sharedDrafts,
             'default' => $defaultDraft,
         ]);
     }

diff --git a/app/Models/HasProjects.php b/app/Models/HasProjects.php
@@ -34,6 +34,17 @@ public function sharedProjects()
         return $this->projects()->wherePivot('role', '!=', 'creator');
     }
 
+    /**
+     * User model and Drafts relationship - many to many
+     *
+     * @var array
+     */
+    public function sharedDrafts()
+    {
+        $sharedProjects = $this->projects()->wherePivot('role', '!=', 'creator');
+        return Draft::whereIn('id', $sharedProjects->pluck('draft_id'))->get();
+    }
+
     /**
      * User model and Projects relationship - many to many
      *

diff --git a/resources/js/Shared/Submission.vue b/resources/js/Shared/Submission.vue
@@ -1633,10 +1633,16 @@ export default {
         const initialise = (data) => {
             this.fetchDrafts().then((response) => {
                 this.drafts = response.data.drafts;
+                this.sharedDrafts = response.data.sharedDrafts;
                 if (data.draft_id) {
                     let selectedDraft = this.drafts.find(
                         (d) => d.id == data.draft_id
                     );
+                    if(!selectedDraft){
+                        selectedDraft = this.sharedDrafts.find(
+                            (d) => d.id == data.draft_id
+                        );
+                    }
                     this.selectDraft(selectedDraft);
                     this.loading = false;
                     this.toggleOpenCreateDatasetDialog();