Record view / contact focus on feature: allow to customise the contac…

…t field name to filter (#8578)
geonetwork · Mar 5, 2025 · 8aabcfc · 8aabcfc
1 parent c5da28a
commit 8aabcfc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 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
@@ -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
@@ -41,7 +41,7 @@
         </address>
 
         <div
-          data-gn-search-filter-link="OrgForResourceObject.default"
+          data-gn-search-filter-link="{{focusOnFilterFieldName}}"
           data-filter="c.organisation"
           data-label="focusOnFrom"
         >
@@ -99,7 +99,7 @@
           </address>
 
           <div
-            data-gn-search-filter-link="OrgForResourceObject.default"
+            data-gn-search-filter-link="{{focusOnFilterFieldName}}"
             data-filter="c.organisation"
             data-label="focusOnFrom"
           >
@@ -157,7 +157,7 @@
           </address>
 
           <div
-            data-gn-search-filter-link="OrgForResourceObject.default"
+            data-gn-search-filter-link="{{focusOnFilterFieldName}}"
             data-filter="c.organisation"
             data-label="focusOnFrom"
           >

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
@@ -5,6 +5,7 @@ <h2 data-translate="">resourceContact</h2>
     data-gn-metadata-contacts="mdView.current.record.contactForResource"
     data-gn-mode="role"
     data-layout="icon"
+    data-focus-on-field-name="resource"
   ></div>
 </div>
 

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
@@ -3,6 +3,7 @@
     data-gn-metadata-contacts="mdView.current.record.contact"
     data-gn-mode="role"
     data-layout="icon"
+    data-type="metadata"
   ></div>
 </div>
 <div data-ng-if="showCitation" data-gn-metadata-citation="mdView.current.record"></div>
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
@@ -43,6 +43,7 @@ <h2 data-translate="">processSteps</h2>
       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"
     ></div>
   </div>

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
@@ -102,6 +102,7 @@ <h3 data-translate="">format</h3>
       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"
     ></div>
 

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
@@ -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"
     ></div>