Merge branch 'develop' into feature/PELAGOS-5394-Make-login-pages-loo…

…k-more-uniform
griidc · Jan 23, 2025 · 6df97f3 · 6df97f3
2 parents 35615bd + 7fd5ce1
commit 6df97f3
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 218 deletions.
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
     "devDependencies": {
-        "@babel/core": "^7.24.4",
+        "@babel/core": "^7.26.0",
         "@babel/preset-env": "7.26.0",
         "@babel/preset-react": "^7.26.3",
         "@fortawesome/fontawesome-free": "^5.11.1",
         "@hotwired/stimulus": "^3.0.0",
-        "@symfony/stimulus-bridge": "^3.0.0",
+        "@symfony/stimulus-bridge": "^3.2.3",
         "@symfony/webpack-encore": "^4.6.1",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "@vue/babel-preset-jsx": "^1.1.2",
         "autoprefixer": "^9.7.4",
-        "core-js": "^3.0.0",
+        "core-js": "^3.40.0",
         "eslint": "^7.29.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-import-resolver-alias": "^1.1.2",

diff --git a/templates/Admin/index.html.twig b/templates/Admin/index.html.twig
@@ -59,7 +59,7 @@
                 <li><a href="{{ path("app_ui_reportdatasetsubmission_makecsv", {"udi": "YOUR_UDI_HERE"}) }}">Dataset Submission Report - CSV</a></li>
                 <li><a href="{{ path('pelagos_app_ui_reportresearchgroup_detailreport') }}">Research Group Detail Report (JSON)</a></li>
                 <li><a href="{{ path('pelagos_api_grp_datasets_people_report') }}">GRP Datasets and People Report (CSV)</a></li>
-                <li><a href="{{ path('pelagos_api_grp_datasets_keywords_report') }}">GRP Datasets and Keywords Report (CSV)</a></li>
+                {# <li><a href="{{ path('pelagos_api_grp_datasets_keywords_report') }}">GRP Datasets and Keywords Report (CSV)</a></li> #}
             </ul>
         </li>
     </ul>

diff --git a/templates/DatasetMonitoring/v2/researchGroups.html.twig b/templates/DatasetMonitoring/v2/researchGroups.html.twig
@@ -59,7 +59,9 @@
                 cssClass: 'dsmonitoringcols',
                 cellTemplate: function(container, options) {
                     const url = `https://doi.org/${options.value}`;
-                    return $('<a>', { href: url, target: '_blank', class: 'pagelink' }).text(options.displayValue);
+                    if (!['Identified', 'None'].includes(options.data.status)) {
+                        return doi = $('<a>', { href: url, target: '_blank', class: 'pagelink' }).text(options.displayValue);
+                    }
                 },
             },{
                 dataField: 'title',