Merge branch 'main' into ssr

.github/workflows/pull_request_cypress.yml

@@ -55,11 +55,6 @@ jobs:
     if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4]
-
     steps:
       - name: Cleanup pre-installed tools
         run: |
@@ -96,7 +91,6 @@ jobs:
           start: yarn preview
           wait-on: ${{ secrets.ROOT_URL }}
           record: true
-          parallel: true
           tag: PR
 
       - name: Skip tests

components/ContactUsForms/ResearchForm/ResearchForm.vue

@@ -33,20 +33,14 @@
       <sparc-radio
         :value="form.individualFileSize"
         @input="form.individualFileSize = $event.target.value"
-        label="MB"
-        display="MB"
+        label="<220GB"
+        display="< 220 GB"
       />
       <sparc-radio
         :value="form.individualFileSize"
         @input="form.individualFileSize = $event.target.value"
-        label="GB"
-        display="GB"
-      />
-      <sparc-radio
-        :value="form.individualFileSize"
-        @input="form.individualFileSize = $event.target.value"
-        label="TB"
-        display="TB"
+        label="≥220GB"
+        display="≥ 220 GB"
       />
     </el-form-item>
 
@@ -74,14 +68,12 @@
         @input="form.datasetSize = $event.target.value"
         label="50-500GB"
         display="50 - 500GB"
-        :disabled="isOversized"
       />
       <sparc-radio
         :value="form.datasetSize"
         @input="form.datasetSize = $event.target.value"
         label="500GB-TB"
         display="500GB - TB"
-        :disabled="isOversized"
       />
       <sparc-radio
         :value="form.datasetSize"
@@ -303,7 +295,7 @@ export default {
 
   computed: {
     isOversized: function() {
-      return this.form.individualFileSize === "TB"
+      return this.form.individualFileSize === '≥220GB'
     },
   },
 
@@ -363,8 +355,10 @@ export default {
     profileEmail() {
       this.form.user.email = this.profileEmail
     },
-    isOversized() {
-      this.form.datasetSize = ">TB"
+    isOversized(value) {
+      if (value && (this.form.datasetSize === '<5GB' || this.form.datasetSize === '5-50GB')) {
+        this.form.datasetSize = ''
+      }
     }
   }
 }

components/DatasetDetails/DatasetFilesInfo.vue

@@ -125,7 +125,7 @@
                 Requesting Access to Download from AWS
               </div>
               <p>
-                In order to request access to download this dataset, we ask that you please submit a 
+                In order to request access to download this version of the dataset, we ask that you please submit a 
                 <a href="https://docs.sparc.science/docs/requesting-access-to-older-versions-of-a-public-dataset">rehydration
                 request</a>. This button will take you to a form where you can submit your request.
               </p>

components/MapViewer/MapViewer.client.vue

@@ -7,6 +7,7 @@
       :starting-map="startingMap"
       :options="options"
       :share-link="shareLink"
+      :useHelpModeDialog="true"
       @updateShareLinkRequested="$emit('updateShareLinkRequested')"
       @isReady="$emit('isReady')"
       @trackEvent="onTrackEvent"
@@ -58,7 +59,7 @@
         return this.$refs.map;
       },
       onTrackEvent: function(eventData) {
-        this.$gtm.trackEvent(eventData);
+        this.$gtm.push(eventData);
       },
     },
   }

components/Paper/Paper.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="subpage-col about-page-border p-32">
+    <div class="subpage-col about-page-border p-24">
       <div class="subpage-row">
         <img v-if="logoSrc" class="logo-image mr-16 p-16" :src="logoSrc" />
         <div class="subpage-col">

pages/about/consortia/[id].vue

@@ -17,12 +17,12 @@
         <paper class="row-item" :text="parseMarkdown(ourResearch)" :button-text="ourResearchButtonText"
           :button-link="ourResearchButtonLink" />
       </div>
-      <div v-if="featuredDataset?.title" class="featured-dataset-container p-16 mt-32">
+      <div v-if="featuredDataset?.title" class="featured-dataset-container p-24 mt-32">
         <div class="heading2 mb-16">Here is a dataset you might be interested in:</div>
         <projects-and-datasets-card :title="featuredDataset.title" :description="featuredDataset.description"
           :banner="featuredDataset.banner" :link="featuredDatasetLink" button-text="View Dataset" />
       </div>
-      <div v-if="highlights.length > 0" class="gallery-items-container p-32 mt-32">
+      <div v-if="highlights.length > 0" class="gallery-items-container p-24 mt-32">
         <div class="heading2 mb-16">Highlights</div>
         <gallery galleryItemType="highlights" :cardWidth="68" :items="highlights" />
       </div>

pages/about/index.vue

@@ -16,7 +16,7 @@
     <div class="container">
       <paper class="row mt-32" :text="parseMarkdown(sparcPortal)" button-text="View The Roadmap"
         button-link-external="https://docs.sparc.science/docs/sparc-portal-roadmap" />
-      <div :v-if="whoWeSpport?.length > 0" class="who-we-support-container p-32 mt-32">
+      <div :v-if="whoWeSpport?.length > 0" class="who-we-support-container p-24 mt-32">
         <div class="heading2">Who We Support</div>
         <div class="body1 mb-16">The SPARC Portal currently supports {{ whoWeSupport.length }} consortia. Visit the
           consortia page to find out more about them.</div>
@@ -44,7 +44,7 @@
           :button-link="aboutLink(getInvolvedPageId)" />
       </div>
 
-      <div class="gallery-items-container p-32 mt-32">
+      <div class="gallery-items-container p-24 mt-32">
         <div class="heading2 mb-16">Portal Metrics</div>
         <gallery galleryItemType="metrics" :items="metricsItems" />
         <nuxt-link to="/about/metrics">
@@ -54,7 +54,7 @@
         </nuxt-link>
       </div>
 
-      <div class="gallery-items-container p-32 mt-32">
+      <div class="gallery-items-container p-24 mt-32">
         <div class="heading2 mb-16">Highlights</div>
         <gallery galleryItemType="highlights" :cardWidth="68" :items="highlights" />
       </div>

tests/cypress/e2e/mapsviewer.cy.js

@@ -151,6 +151,8 @@ describe('Maps Viewer', { testIsolation: false }, function () {
             cy.get('.badges-container > .container').contains(/Scaffold/i).click()
           })
 
+          cy.waitForLoadingMask()
+
           // Check for button text
           cy.get('.dataset-card-container > .dataset-card', { timeout: 30000 }).contains(/View Scaffold/i).should('exist').click()
 

tests/cypress/e2e/userstories.cy.js

@@ -1,7 +1,7 @@
 // To check the segmentation card
 // should use datasets which have segmentation data
 const segmentationDatasetIds = [226, 77]
-const scaffoldDatasetCategories = ['stomach', 'heart']
+const scaffoldDatasetCategories = ['pig colon', 'pig heart']
 const categories = ['stomach', 'lung']
 
 describe('User stories', function () {
@@ -19,6 +19,9 @@ describe('User stories', function () {
     segmentationDatasetIds.forEach((id) => {
 
       it(`Access dataset ${id}`, function () {
+
+        cy.waitForLoadingMask()
+
         // Search for segmentation related dataset
         cy.get('.el-input__wrapper > .el-input__inner').clear();
         cy.get('.search-text').click();

tests/cypress/support/commands.js

@@ -41,7 +41,9 @@ Cypress.on('uncaught:exception', (err, runnable) => {
     return false
   if (err.message.includes("Cannot destructure property 'type' of 'vnode' as it is null"))
     return false
-  if (err.message.includes("Cannot read properties of undefined (reading 'receiveSynchronisedEvent')"))
+  if (err.message.includes('Cannot read properties of undefined'))
+    return false
+  if (err.message.includes('Source "markers" already exists.'))
     return false
   // // For legacy dataset
   // if (err.message.includes('ObjectID does not exist'))