Merge remote-tracking branch 'nih/main' into biolucida-image

nih-sparc · Nov 12, 2024 · 340fbe4 · 340fbe4
2 parents 0bc2bcb + 3edd991
commit 340fbe4
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/.github/workflows/pull_request_cypress.yml b/.github/workflows/pull_request_cypress.yml
@@ -82,7 +82,6 @@ jobs:
       - name: Automated Run Testing when Pull Request
         if: steps.checkUser.outputs.require-result == 'true'
         uses: cypress-io/github-action@v6
-        timeout-minutes: 30
         env:
           ROOT_URL: ${{ secrets.ROOT_URL }} # http://localhost:3000
         with:

diff --git a/.github/workflows/quality_control_cypress.yml b/.github/workflows/quality_control_cypress.yml
@@ -142,7 +142,6 @@ jobs:
         env:
           ROOT_URL: "https://sparc.science"
         uses: cypress-io/github-action@v6
-        timeout-minutes: 30
         with:
           wait-on: ${{ env.ROOT_URL }}
           record: true

diff --git a/.github/workflows/scheduled_production_cypress.yml b/.github/workflows/scheduled_production_cypress.yml
@@ -98,7 +98,6 @@ jobs:
 
       - name: Schedule Run Testing against Production
         uses: cypress-io/github-action@v6
-        timeout-minutes: 30
         env:
           ROOT_URL: "https://sparc.science"
         with:

diff --git a/.github/workflows/scheduled_staging_cypress.yml b/.github/workflows/scheduled_staging_cypress.yml
@@ -98,7 +98,6 @@ jobs:
 
       - name: Schedule Run Testing against Staging
         uses: cypress-io/github-action@v6
-        timeout-minutes: 30
         env:
           ROOT_URL: "https://staging.sparc.science"
         with:

diff --git a/components/BfDownloadFile/BfDownloadFile.vue b/components/BfDownloadFile/BfDownloadFile.vue
@@ -62,6 +62,7 @@
 
 <script>
 import StorageMetrics from '@/mixins/bf-storage-metrics'
+import { propOr } from 'ramda'
 
 const DEFAULT_ARCHIVE_NAME = 'sparc-portal-data'
 
@@ -193,8 +194,8 @@ export default {
         file_path: "",
         file_type: "",
         category: "",
-        dataset_id: "",
-        version_id: "",
+        dataset_id: this.dataset.id,
+        version_id: this.dataset.version,
         doi: "",
         citation_type: "",
         location: ""

diff --git a/components/FilesTable/FilesTable.vue b/components/FilesTable/FilesTable.vue
@@ -730,8 +730,8 @@ export default {
         file_type: pathOr('', ['row','fileType'], scope),
         location: "",
         category: "",
-        dataset_id: "",
-        version_id: "",
+        dataset_id: this.datasetInfo.id,
+        version_id: this.datasetVersion,
         doi: "",
         citation_type: "",
         files: ""
@@ -767,8 +767,8 @@ export default {
         file_type: "",
         location: "",
         category: "",
-        dataset_id: "",
-        version_id: "",
+        dataset_id: this.datasetInfo.id,
+        version_id: this.datasetVersion,
         doi: "",
         citation_type: ""
       })

diff --git a/pages/datasets/[datasetId].vue b/pages/datasets/[datasetId].vue
@@ -249,10 +249,13 @@ export default {
         getOrganizationIds(algoliaIndex),
         getContributorsFromAlgolia(algoliaIndex, datasetId)
       ])
-      const datasetDetailsContributors = algoliaContributors?.map(contributor => {
+      const filteredAlgoliaContributors = algoliaContributors.filter(contributor =>
+        contributor.first || contributor.last
+      )
+      const datasetDetailsContributors = filteredAlgoliaContributors?.map(contributor => {
         return {
-          firstName: contributor.first.name,
-          lastName: contributor.last.name,
+          firstName: contributor.first?.name,
+          lastName: contributor.last?.name,
           orcid: contributor.curie?.replace('ORCID:', '')
         }
       })
@@ -269,7 +272,7 @@ export default {
           name: propOr('', 'organizationName', datasetDetails)
         }
       ]
-      const contributors = algoliaContributors?.map(contributor => {
+      const contributors = filteredAlgoliaContributors?.map(contributor => {
         const sameAs = contributor.curie
           ? `http://orcid.org/${contributor.curie.replace('ORCID:', '')}`
           : null

diff --git a/pages/news-and-events/index.vue b/pages/news-and-events/index.vue
@@ -73,11 +73,18 @@
               <newsletter-form />
               <div class="newsletter-archive mt-16">
                 <div class="heading2 mt-24">Current Newsletter</div>
-                <div ref="newsletterArchive" id="newsletter-archive" />
-                <a class="mt-8" href="//us2.campaign-archive.com/home/?u=e60c48f231a30b544eed731ea&id=c81a347bd8"
-                  target="_blank">
-                  View all Newsletters<svgo-icon-open />
-                </a>
+                <div>
+                  <a class="mt-8" href="https://docs.sparc.science/docs/sparc-plug-current"
+                    target="_blank">
+                    Read the current SPARC Plug Newsletter<svgo-icon-open />
+                  </a>
+                </div>
+                <div>
+                  <a class="mt-8" href="https://docs.sparc.science/docs/sparc-plug-newsletter-archive"
+                    target="_blank">
+                    View Newsletters Archive<svgo-icon-open />
+                  </a>
+                </div>
               </div>
             </el-col>
             <el-col :xs="24" :sm="12" class="newsletter-wrap right-panel">
@@ -149,10 +156,6 @@ export default {
     }
   },
 
-  mounted() {
-    this.$injectNewsletterArchive('#newsletter-archive')
-  },
-
   watch: {
     '$route.query': {
       handler: async function() {