From 7772978c317daedde11688905338b714e8d74f8a Mon Sep 17 00:00:00 2001
From: Eric Gauzens <ericgauzens@hotmail.com>
Date: Wed, 30 Oct 2024 17:28:43 -0400
Subject: [PATCH 1/5] Updated GTM events

---
 components/BfDownloadFile/BfDownloadFile.vue | 5 +++--
 components/FilesTable/FilesTable.vue         | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/BfDownloadFile/BfDownloadFile.vue b/components/BfDownloadFile/BfDownloadFile.vue
index d6c218e1..bc54500b 100644
--- 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
index ce6937f0..ae95b71e 100644
--- 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: ""
       })

From ae666be4a4e58d1081b2a53324e22e964bec2f04 Mon Sep 17 00:00:00 2001
From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:39:17 +0100
Subject: [PATCH 2/5] changing newsletter links

---
 pages/news-and-events/index.vue | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/news-and-events/index.vue b/pages/news-and-events/index.vue
index 5123649b..dd4e0d7a 100644
--- 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() {

From 4bbdacbb93c1a153400aac1247aa478dafda8ab3 Mon Sep 17 00:00:00 2001
From: akhuoa <aung.kyaw.hein@auckland.ac.nz>
Date: Thu, 7 Nov 2024 10:24:09 +1300
Subject: [PATCH 3/5] Fix dataset contributor name bug for broken page

---
 pages/datasets/[datasetId].vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/datasets/[datasetId].vue b/pages/datasets/[datasetId].vue
index 0158894e..757421c0 100644
--- a/pages/datasets/[datasetId].vue
+++ b/pages/datasets/[datasetId].vue
@@ -251,8 +251,8 @@ export default {
       ])
       const datasetDetailsContributors = algoliaContributors?.map(contributor => {
         return {
-          firstName: contributor.first.name,
-          lastName: contributor.last.name,
+          firstName: contributor.first?.name,
+          lastName: contributor.last?.name,
           orcid: contributor.curie?.replace('ORCID:', '')
         }
       })

From 813fb99246666d219c392b7f35d3e93345e8e2a7 Mon Sep 17 00:00:00 2001
From: akhuoa <aung.kyaw.hein@auckland.ac.nz>
Date: Thu, 7 Nov 2024 11:27:47 +1300
Subject: [PATCH 4/5] Filter dataset contributors without name

---
 pages/datasets/[datasetId].vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/datasets/[datasetId].vue b/pages/datasets/[datasetId].vue
index 757421c0..4eaa90e6 100644
--- a/pages/datasets/[datasetId].vue
+++ b/pages/datasets/[datasetId].vue
@@ -249,7 +249,10 @@ 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,
@@ -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

From 50ae4ee41776b22e2a66b9fc6cd8c9f8a504a48a Mon Sep 17 00:00:00 2001
From: "David J. Yu" <87633683+ddjnw1yu@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:12:44 +1300
Subject: [PATCH 5/5] Remove timeout

---
 .github/workflows/pull_request_cypress.yml         | 1 -
 .github/workflows/quality_control_cypress.yml      | 1 -
 .github/workflows/scheduled_production_cypress.yml | 1 -
 .github/workflows/scheduled_staging_cypress.yml    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/.github/workflows/pull_request_cypress.yml b/.github/workflows/pull_request_cypress.yml
index 979baa19..88a8e942 100644
--- 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
index 3aaba846..6e9744b6 100644
--- 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
index dac5bab1..7fc704ab 100644
--- 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
index 4b9e76c3..e2f3f00a 100644
--- 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: