- FIX: Fixed error on dataset edit modal.

- FIX: Fixed error on the datasets table where it wouldn't show the associated file resources for datasets that don't have a license but do have a file resource.
- ADD: Added Bluesky account links to Germinate page and footer.

src/components/modals/DatasetEditModal.vue

@@ -331,7 +331,7 @@ export default {
       this.formState = {
         name: this.datasetName !== undefined && this.datasetName !== null && this.datasetName.length > 0,
         experimentId: this.experimentId !== undefined && this.experimentId !== null,
-        datasetState: this.datasetState !== undefined && this.datasetType !== null,
+        datasetState: this.datasetState !== undefined && this.datasetState !== null,
         selectedDatasetType: this.selectedDatasetType !== undefined && this.selectedDatasetType !== null
       }
 

src/components/tables/DatasetTable.vue

@@ -137,7 +137,7 @@
       </template>
       <!-- Show file resources -->
       <template v-slot:cell(fileresourceIds)="data">
-        <b-button class="text-nowrap" @click="showFileresources(data.item)" v-if="data.item.fileresourceIds && (data.item.fileresourceIds.length > 0) && dataResourcesVisible && isAccepted(data.item)"><MdiIcon :path="mdiAttachment"/> {{ $t('buttonShow') }}</b-button>
+        <b-button class="text-nowrap" @click="showFileresources(data.item)" v-if="data.item.fileresourceIds && (data.item.fileresourceIds.length > 0) && dataResourcesVisible && (!data.item.licenseName || isAccepted(data.item))"><MdiIcon :path="mdiAttachment"/> {{ $t('buttonShow') }}</b-button>
       </template>
       <!-- Download the dataset -->
       <template v-slot:cell(download)="data">

src/mixins/util.js

@@ -3,6 +3,8 @@ import { event } from 'vue-gtag'
 
 const germinateVersion = '4.7.4'
 
+const bskyIcon = 'M 6.3352642,4.3805537 C 8.6282167,6.1019578 11.094547,9.5922478 12.000058,11.465341 12.905639,9.5923853 15.371832,6.1019228 17.664853,4.3805537 19.319326,3.1384578 22,2.1773945 22,5.2355487 c 0,0.610755 -0.35017,5.1306603 -0.555548,5.8644483 -0.713893,2.551158 -3.315291,3.201843 -5.629278,2.808018 4.044804,0.68841 5.073763,2.968673 2.851604,5.248935 -4.22032,4.330665 -6.065826,-1.08658 -6.538927,-2.474675 C 12.041162,16.427804 12.000597,16.30876 12,16.409987 c -6e-4,-0.101231 -0.04116,0.01782 -0.127851,0.272288 C 11.399255,18.07037 9.5537833,23.487752 5.3332217,19.15695 3.1110283,16.876688 4.1399533,14.596287 8.1848258,13.908015 5.87077,14.30184 3.2693375,13.651151 2.5555483,11.099997 2.3501633,10.36614 2,5.8462353 2,5.2355487 2,2.1773945 4.6807425,3.1384578 6.3351467,4.3805537 Z'
+
 /**
      * Generates a v4 UUID
      */
@@ -196,5 +198,6 @@ export {
   downloadSvgsFromContainer,
   dataURLtoFile,
   mcpdDateToJsDate,
-  isNumber
+  isNumber,
+  bskyIcon
 }

src/views/DashboardContainer.vue

@@ -59,6 +59,7 @@
 
           <ul class="nav col-md-4 justify-content-center justify-content-md-end list-unstyled d-flex">
             <li class="ml-3"><a class="text-muted" href="https://ics.hutton.ac.uk/get-germinate"><MdiIcon :size="24" :path="mdiWeb" /></a></li>
+            <li class="ml-3"><a class="text-muted" href="https://bsky.app/profile/germinatehub.bsky.social"><MdiIcon :size="24" :path="bskyIcon" /></a></li>
             <li class="ml-3"><a class="text-muted" href="https://twitter.com/GerminateHub"><MdiIcon :size="24" :path="mdiTwitter" /></a></li>
             <li class="ml-3"><a class="text-muted" href="https://github.com/germinateplatform"><MdiIcon :size="24" :path="mdiGithub" /></a></li>
           </ul>
@@ -112,7 +113,7 @@ import UserSettingsDropdown from '@/components/dropdowns/UserSettingsDropdown'
 import SidebarAsyncJobs from '@/components/structure/SidebarAsyncJobs'
 import FeedbackButton from '@/components/util/FeedbackButton'
 import Tour from '@/components/util/Tour'
-import { germinateVersion } from '@/mixins/util'
+import { bskyIcon, germinateVersion } from '@/mixins/util'
 
 import { mdiMagnify, mdiHelpCircleOutline, mdiMenu, mdiThemeLightDark, mdiTwitter, mdiGithub, mdiWeb } from '@mdi/js'
 import { Pages } from '@/mixins/pages'
@@ -150,6 +151,7 @@ export default {
   data: function () {
     return {
       Pages,
+      bskyIcon,
       mdiHelpCircleOutline,
       mdiMagnify,
       mdiMenu,

src/views/about/AboutGerminate.vue

@@ -112,7 +112,7 @@ import MdiIcon from '@/components/icons/MdiIcon'
 import LocationMap from '@/components/map/LocationMap'
 import ChangelogModal from '@/components/modals/ChangelogModal'
 import { mdiEarth, mdiFileDocument, mdiGithub, mdiGlasses, mdiTwitter, mdiWeb, mdiTag, mdiInformationOutline } from '@mdi/js'
-import { germinateVersion } from '@/mixins/util'
+import { germinateVersion, bskyIcon } from '@/mixins/util'
 
 export default {
   data: function () {
@@ -153,6 +153,10 @@ export default {
           img: 'team/sebastian-raubach.jpg',
           about: () => this.$t('pageAboutGerminateTeamSebastian'),
           links: [{
+            path: bskyIcon,
+            title: 'Bluesky',
+            href: 'https://bsky.app/profile/bazraubach.bsky.social'
+          }, {
             path: mdiTwitter,
             title: 'Twitter',
             href: 'https://twitter.com/BazRaubach'
@@ -179,6 +183,10 @@ export default {
           img: 'team/paul-shaw.jpg',
           about: () => this.$t('pageAboutGerminateTeamPaul'),
           links: [{
+            path: bskyIcon,
+            title: 'Bluesky',
+            href: 'https://bsky.app/profile/cardinalb.bsky.social'
+          }, {
             path: mdiTwitter,
             title: 'Twitter',
             href: 'https://twitter.com/cardinalb'