Merge pull request #247 from UtrechtUniversity/main

Merge main into development to include release bugfixes

Author: lsamshuijzen

.github/workflows/build-push-image.yml

@@ -4,12 +4,12 @@ name: "Build MSL-API image and push it to registry"
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
 
 jobs:
   push-image:
     if: github.repository == 'utrechtuniversity/msl_api'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write
@@ -20,23 +20,23 @@ jobs:
       id: extract_branch
 
     - name: Check out EPOS-MSL catalog repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: epos-msl
         repository: UtrechtUniversity/epos-msl
         ref: ${{ steps.extract_branch.outputs.branch }}
 
     - name: Authenticate to the container registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v4
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@v7
       with:
         context: epos-msl/docker/images/msl-api
         file: epos-msl/docker/images/msl-api/Dockerfile
         push: true
-        tags: ghcr.io/utrechtuniversity/epos-msl-cat-mslapi:latest
+        tags: ghcr.io/utrechtuniversity/epos-msl-cat-mslapi:development

app/Enums/LabDomain.php

@@ -8,7 +8,7 @@
 enum LabDomain: string
 {
     case ROCK_PHYSICS = 'Rock and melt physics';
-    case ANALOGUE = 'Analogue modelling of geologic processes';
+    case ANALOGUE = 'Analogue modelling of geological processes';
     case MICROSCOPY = 'Microscopy and tomography';
     case PALEO = 'Paleomagnetism';
     case GEO_CHEMISTRY = 'Geochemistry';

resources/views/public/components/forms/select-question.blade.php

@@ -16,16 +16,17 @@ class="select form-field-text focus:select-secondary
                 bg-white @endif
             
             ">
-            <option disabled @if (old($sectionName) === null) selected @endif>{{ $placeholder }}</option>
-            {{-- from https://laravel.com/docs/11.x/blade#additional-attributes --}}
+            <option disabled @if (old($sectionName, '') === '') selected @endif>{{ $placeholder }}</option>
             @foreach ($options as $key => $option)
-                <option value="{{ $key }}" @selected(old($sectionName) == $key)>
+                <option value="{{ $key }}" @selected(old($sectionName, '') === (string) $key)>
                     {{ $option }}
                 </option>
             @endforeach
         </select>
         @if ($errors->has($sectionName))
             <p class="error-highlight"> {{ $errors->first($sectionName) }} </p>
         @endif
+
+
     </div>
 </div>

resources/views/public/components/list-views/table-list.blade.php

@@ -3,6 +3,7 @@
     'withKeys' => true,
     'numericKeys' => false,
     'textSize' => 'sm',
+    'wordBreakContent' => false,
 ])
 <div class="w-full py-2">
     <table class="table-fixed w-full">
@@ -24,7 +25,11 @@
                             </td>
                         @endif
 
-                        <td class="text-{{ $textSize }} p-0">
+                        @if ($wordBreakContent)
+                            <td class="text-{{ $textSize }} p-0 wrap-break-word">
+                        @else
+                            <td class="text-{{ $textSize }} p-0">
+                        @endif
                             @if (filter_var($value, FILTER_VALIDATE_URL))
                                 <a class='underline hover-interactive' href={{ $value }}>{{ $value }}</a>
                             @else

resources/views/public/data-publication-detail.blade.php

@@ -478,8 +478,10 @@
                             @php
                                 $dataPublicationList = [];
                                 if ($relatedidentifier->msl_related_identifier_type == 'DOI') {
-                                    $dataPublicationList[] =
-                                        'https://doi.org/' . $relatedidentifier->msl_related_identifier_type;
+                                    $relatedIdentifierValue = $relatedidentifier->msl_related_identifier;
+                                    $dataPublicationList[] = str_starts_with($relatedIdentifierValue, 'http')
+                                        ? $relatedIdentifierValue
+                                        : 'https://doi.org/' . $relatedIdentifierValue;
                                 } else {
                                     if ($relatedidentifier->msl_related_identifier_type != '') {
                                         $dataPublicationList[] = $relatedidentifier->msl_related_identifier_type;
@@ -571,6 +573,7 @@
                                     'Scheme URI' => $right->msl_right_scheme_uri,
                                 ],
                                 'withKeys' => true,
+                                'wordBreakContent' => true,
                             ])
                         @endforeach
                     </div>

resources/views/public/index.blade.php

@@ -35,17 +35,17 @@ class="w-full
                     <a class="flex flex-col justify-between w-1/3 hover-interactive shadow-xl rounded-xl hover:rounded-xl p-2 bg-primary-100 "
                         href="{{ route('data-access') }}">
                         <h2 class="font-bold ">{{ $datasetsCount }}</h2>
-                        <h5>Datasets</h5>
+                        <h6>Datasets</h6>
                     </a>
                     <a class="flex flex-col justify-between w-1/3 hover-interactive shadow-xl rounded-xl hover:rounded-xl p-2 bg-primary-100 "
                         href="{{ route('labs-map') }}">
                         <h2 class="font-bold ">{{ $labCount }}</h2>
-                        <h5>Labs</h5>
+                        <h6>Labs</h6>
                     </a>
                     <a class="flex flex-col justify-between w-1/3 hover-interactive shadow-xl rounded-xl hover:rounded-xl p-2 bg-primary-100 "
                         href="{{ route('data-repositories') }}">
                         <h2 class="font-bold ">{{ $reposCount }}</h2>
-                        <h5 class="">Repos</h5>
+                        <h6>Repositories</h6>
                     </a>
                 </div>
 

resources/views/public/lab-detail-equipment.blade.php

@@ -71,23 +71,23 @@
                                                             Type
                                                         </p>
                                                         <p class="w-1/2 text-left">
-                                                            {{ $addon->msl_equipment_addon_type }}</p>
+                                                            {{ $addon['msl_equipment_addon_type'] }}</p>
                                                     </div>
 
                                                     <div class="w-full flex flex-row p-2">
                                                         <p class="w-1/2 place-content-center text-left font-bold">
                                                             Group
                                                         </p>
                                                         <p class="w-1/2 text-left">
-                                                            {{ $addon->msl_equipment_addon_group }}</p>
+                                                            {{ $addon['msl_equipment_addon_group'] }}</p>
                                                     </div>
 
                                                     <div class="w-full flex flex-row p-2">
                                                         <p class="w-1/2 place-content-center text-left font-bold">
                                                             Description
                                                         </p>
                                                         <p class="w-1/2 text-left">
-                                                            {{ $addon->msl_equipment_addon_description }}</p>
+                                                            {{ $addon['msl_equipment_addon_description'] }}</p>
                                                     </div>
                                                 </div>
                                             @endforeach