From 37a2fdcede647ff95d5b670db3b25c85992c4d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Garc=C3=ADa?= Date: Mon, 23 Dec 2024 14:07:24 +0100 Subject: [PATCH] Record view / contact focus on feature: allow to customise the contact field name to filter --- .../components/search/mdview/mdviewDirective.js | 13 ++++++++++++- .../components/search/mdview/partials/contact.html | 6 +++--- .../src/main/resources/catalog/js/CatController.js | 1 - .../views/default/templates/recordView/contact.html | 1 + .../templates/recordView/metadatacontact.html | 1 + .../default/templates/recordView/processsteps.html | 1 + .../default/templates/recordView/type-dataset.html | 1 + .../default/templates/recordView/type-series.html | 1 + 8 files changed, 20 insertions(+), 5 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/mdviewDirective.js b/web-ui/src/main/resources/catalog/components/search/mdview/mdviewDirective.js index e1ca1871d49..6eb5c01a5f9 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/mdviewDirective.js +++ b/web-ui/src/main/resources/catalog/components/search/mdview/mdviewDirective.js @@ -437,13 +437,24 @@ // Group by 'default', 'role', 'org-role' mode: "@gnMode", // 'icon' or 'list' (default) - layout: "@layout" + layout: "@layout", + type: "@type" }, link: function (scope, element, attrs, controller) { if (["default", "role", "org-role"].indexOf(scope.mode) == -1) { scope.mode = "default"; } + if (scope.type === "metadata") { + scope.focusOnFilterFieldName = "OrgObject.default"; + } else if (scope.type === "distribution") { + scope.focusOnFilterFieldName = "OrgForDistributionObject.default"; + } else if (scope.type === "processing") { + scope.focusOnFilterFieldName = "OrgForProcessingObject.default"; + } else { + scope.focusOnFilterFieldName = "OrgForResourceObject.default"; + } + scope.calculateContacts = function () { if (scope.mode != "default") { var groupByOrgAndMailOrName = function (resources) { diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html index e6f41c63bf2..b683be3faf6 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html +++ b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html @@ -41,7 +41,7 @@
@@ -99,7 +99,7 @@
@@ -157,7 +157,7 @@
diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js index 37b471c313f..b53f7d5d7f4 100644 --- a/web-ui/src/main/resources/catalog/js/CatController.js +++ b/web-ui/src/main/resources/catalog/js/CatController.js @@ -1757,7 +1757,6 @@ $scope.publicationOptions = []; $scope.getFacetLabel = gnFacetMetaLabel.getFacetLabel; - $http.get("../api/records/sharing/options").then(function (response) { $scope.publicationOptions = response.data; }); diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/contact.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/contact.html index 40581a49b13..3b973f493b2 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/contact.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/contact.html @@ -5,6 +5,7 @@

resourceContact

data-gn-metadata-contacts="mdView.current.record.contactForResource" data-gn-mode="role" data-layout="icon" + data-focus-on-field-name="resource" >
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadatacontact.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadatacontact.html index 470c93f6125..b7e9070bb95 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadatacontact.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadatacontact.html @@ -3,6 +3,7 @@ data-gn-metadata-contacts="mdView.current.record.contact" data-gn-mode="role" data-layout="icon" + data-type="metadata" >
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/processsteps.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/processsteps.html index f53104914db..19281263439 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/processsteps.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/processsteps.html @@ -43,6 +43,7 @@

processSteps

data-ng-if="mdView.current.record.contactForProcessing" data-gn-metadata-contacts="mdView.current.record.contactForProcessing" data-gn-mode="default" + data-type="processing" data-layout="icon" > diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html index e6d0a7fe239..643078c0716 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html @@ -102,6 +102,7 @@

format

data-ng-if="mdView.current.record.contactForDistribution" data-gn-metadata-contacts="mdView.current.record.contactForDistribution" data-gn-mode="default" + data-type="distribution" data-layout="icon" > diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html index 3822682fc2a..ea1f4b15ccd 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html @@ -85,6 +85,7 @@ data-ng-if="mdView.current.record.contactForDistribution" data-gn-metadata-contacts="mdView.current.record.contactForDistribution" data-gn-mode="default" + data-type="distribution" data-layout="icon" >