Merge branch 'main' into update-organizations-to-use-id

nih-sparc · Oct 17, 2024 · c8e76ac · c8e76ac
2 parents 2541bf4 + d237cc2
commit c8e76ac
Show file tree

Hide file tree

Showing 5 changed files with 3,529 additions and 3,212 deletions.
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -204,10 +204,12 @@ export default defineNuxtConfig({
   css: ['sparc-design-system-components-2/dist/style.css', '@/assets/_base.scss'],
   sitemap: {
     cacheMaxAgeSeconds: 86400,
-    sources: [
+    sources: process.env.DEPLOY_ENV === 'production' ?
+    [
       '/api/__sitemap__/urls'
-    ],
-    exclude: [
+    ] : [],
+    exclude: process.env.DEPLOY_ENV === 'production' ? 
+    [
       '/datasets/plotviewer',
       '/datasets/simulationviewer',
       '/datasets/timeseriesviewer',
@@ -216,16 +218,16 @@ export default defineNuxtConfig({
       '/datasets/flatmapviewer',
       '/datasets/imageviewer',
       '/datasets/scaffoldviewer',
-    ],
-
+    ] : ['/'],  
     xslColumns: [
       { label: 'URL', width: '100%' }
     ],
   },
   robots: {
     // provide simple disallow rules for all robots `user-agent: *`
     // disallowing certain pages that are either redirects, authticated routes, or causing bots to recursively crawl
-    disallow: [
+    disallow: process.env.DEPLOY_ENV === 'production' ? 
+    [
       '/datasets/*?*',
       '/welcome', 
       '/user', 
@@ -235,7 +237,7 @@ export default defineNuxtConfig({
       '/maps',
       '/news-and-events/submit',
       '/news-and-events/community-spotlight/submit'
-    ],
+    ] : ['/'],
     blockNonSeoBots: true,
     crawlDelay: 3600
   }

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "sass": "^1.66.1"
   },
   "dependencies": {
-    "@abi-software/mapintegratedvuer": "1.5.1",
+    "@abi-software/mapintegratedvuer": "1.5.2",
     "@abi-software/plotvuer": "1.0.3",
     "@abi-software/simulationvuer": "1.0.1",
     "@element-plus/nuxt": "^1.0.10",

diff --git a/pages/datasets/file/[datasetId]/[datasetVersion]/index.vue b/pages/datasets/file/[datasetId]/[datasetVersion]/index.vue
@@ -156,10 +156,12 @@ export default {
       if (packageType == 'Unsupported') {
         await discover.getSegmentationInfo(route.params.datasetId, filePath, s3Bucket).then(({ data }) => {
           segmentationData = data
-          // file is from pennsieve, filePath is from scicrunch
-          // Normally filePath will be correct if path in file and filePath not the same
+          // file is from Pennsieve, filePath is from Scicrunch
           if (file.path != filePath) {
+            // Normally filePath will be correct if file.path and filePath not the same
             file.path = filePath
+            // Need to update the file.name as well if file.path is changed
+            file.name = filePath.substring(filePath.lastIndexOf('/') + 1)
           }
         })
       }

diff --git a/pages/news-and-events/index.vue b/pages/news-and-events/index.vue
@@ -79,6 +79,8 @@
                   View all Newsletters<svgo-icon-open />
                 </a>
               </div>
+            </el-col>
+            <el-col :xs="24" :sm="12" class="newsletter-wrap right-panel">
               <div class="heading2 mt-24">Get Involved</div>
               <div class="body1 mb-16 mt-8">Empower SPARC to promote your science and interests by submitting your
                 science story, news, or event.</div>
@@ -105,12 +107,6 @@
                 </nuxt-link>
               </div>
             </el-col>
-            <el-col :xs="24" :sm="12" class="twitter-wrap">
-              <div v-twitter-widgets>
-                <a class="twitter-timeline" href="https://twitter.com/sparc_science?ref_src=twsrc%5Etfw">Tweets by
-                  sparc_science</a>
-              </div>
-            </el-col>
           </el-row>
         </div>
       </div>
@@ -155,9 +151,6 @@ export default {
 
   mounted() {
     this.$injectNewsletterArchive('#newsletter-archive')
-    const xFeedScript = document.createElement('script')
-    xFeedScript.setAttribute('src', 'https://platform.twitter.com/widgets.js')
-    document.head.appendChild(xFeedScript)
   },
 
   watch: {
@@ -261,16 +254,14 @@ export default {
   margin-bottom: 2rem;
   @media (min-width: 48em) {
     margin-bottom: 0;
+    &.right-panel {
+      border-left: 2px solid #d8d8d8;
+    }
   }
   p {
     color: $darkBlue
   }
 }
-.twitter-wrap {
-  @media (min-width: 48em) {
-    border-left: 2px solid #d8d8d8;
-  }
-}
 
 .btn-load-more {
   background: none;