update submission type conditionals

I-GUIDE · May 7, 2024 · 6088bdc · 6088bdc
1 parent b268ef3
commit 6088bdc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/frontend/src/components/dataset/cd.dataset.vue b/frontend/src/components/dataset/cd.dataset.vue
@@ -220,7 +220,7 @@
 
           <div class="order-1 order-sm-2">
             <v-btn
-              v-if="!data.repository_identifier"
+              v-if="data.submission_type !== 'HYDROSHARE'"
               class="order-1 order-sm-2 mb-sm-0 mb-4 mt-sm-0 mt-2"
               @click="
                 router.push({

diff --git a/frontend/src/components/submissions/cd.submissions.vue b/frontend/src/components/submissions/cd.submissions.vue
@@ -187,10 +187,7 @@
 
                       <!-- UPDATE -->
                       <v-btn
-                        v-if="
-                          item.raw.repoIdentifier &&
-                          item.raw.repository !== 'S3'
-                        "
+                        v-if="item.raw.type === 'HYDROSHARE'"
                         :id="`sub-${index}-update`"
                         @click="onUpdate(item.raw)"
                         :disabled="

diff --git a/frontend/src/models/submission.model.ts b/frontend/src/models/submission.model.ts
@@ -21,6 +21,7 @@ export default class Submission extends Model implements ISubmission {
   public date!: number;
   public identifier!: string;
   public repoIdentifier?: string;
+  public type?: string;
   public repository!: string;
   public url!: string;
   public id!: string;
@@ -48,6 +49,7 @@ export default class Submission extends Model implements ISubmission {
       date: this.number(0),
       identifier: this.attr(""),
       repoIdentifier: this.attr(""),
+      type: this.attr(""),
       repository: this.attr(""),
       url: this.attr(""),
       id: this.attr(""),
@@ -63,6 +65,7 @@ export default class Submission extends Model implements ISubmission {
       identifier: dbSubmission.identifier, // TODO: we should call this something else. It is not the same as the schema's identifier
       repository: dbSubmission.repository,
       repoIdentifier: dbSubmission.repository_identifier,
+      type: dbSubmission.type,
       url: dbSubmission.url,
       id: dbSubmission._id,
     };
@@ -72,11 +75,13 @@ export default class Submission extends Model implements ISubmission {
   static getInsertData(apiSubmission: any): ISubmission | Partial<Submission> {
     return {
       title: apiSubmission.name,
-      authors: apiSubmission.creator.map((c) => c.name),
+      authors: apiSubmission.creator.map((c: any) => c.name),
       date: new Date(apiSubmission.dateCreated).getTime(),
       identifier: Array.isArray(apiSubmission.identifier)
         ? apiSubmission.identifier[0]
         : apiSubmission.identifier,
+      repoIdentifier: apiSubmission.url,
+      type: "HYDROSHARE",
       url: apiSubmission.url,
       id: apiSubmission._id,
     };