Merge pull request #1183 from griidc/release/6.23.0

Release/6.23.0
griidc · May 31, 2022 · a6426e2 · a6426e2
2 parents c452744 + ff5c10e
commit a6426e2
Show file tree

Hide file tree

Showing 13 changed files with 840 additions and 1,078 deletions.
diff --git a/assets/js/vue/components/search/DatasetRow.vue b/assets/js/vue/components/search/DatasetRow.vue
@@ -10,7 +10,7 @@
             </div>
             <b-card-title style="font-size: 1.3rem !important;">{{ datasetRowData.title }}</b-card-title>
             <b-card-text class="d-flex justify-content-between" >
-                <div v-if="Object.keys(datasetRowData.datasetSubmission).length > 0">
+                <div v-if="datasetRowData.datasetSubmission && Object.keys(datasetRowData.datasetSubmission).length > 0">
                     <div v-if="datasetRowData.datasetSubmission.authors" style="max-width: 550px">
                         Authors: {{ datasetRowData.datasetSubmission.authors }}
                     </div>
@@ -22,7 +22,7 @@
                     </div>
                 </div>
                 <div>
-                    <div v-if="datasetRowData.availabilityStatus !== 0 && datasetRowData.doi.doi">
+                    <div v-if="datasetRowData.availabilityStatus !== 0 && datasetRowData.doi && Object.keys(datasetRowData.doi).length > 0 && datasetRowData.doi.doi">
                         DOI: {{ datasetRowData.doi.doi }}
                     </div>
                     <div>

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "doctrine/doctrine-migrations-bundle": "^2.0",
         "doctrine/orm": "^2.5",
         "easycorp/easyadmin-bundle": "^3.5",
-        "friendsofsymfony/elastica-bundle": "^5.1.1",
+        "friendsofsymfony/elastica-bundle": "^6.1.0",
         "friendsofsymfony/jsrouting-bundle": "^2.1",
         "friendsofsymfony/rest-bundle": "^2.5",
         "guzzlehttp/guzzle": "~6.0",
@@ -72,7 +72,7 @@
         },
         "sort-packages": true,
         "platform": {
-            "php": "7.3.0"
+            "php": "7.4.29"
         },
         "allow-plugins": {
             "symfony/flex": true