From 17cd31e7f9c47e8bf7a3fb9bcaf8b700e7254fd7 Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Mon, 13 May 2024 12:13:01 +0200
Subject: [PATCH] Workflow / Edit action / Fix link in search results

Follow up of https://github.com/geonetwork/core-geonetwork/pull/6321

This was noticed because then when an approved record is found, the edit
action in the search result page was opening the editor with a link
http://localhost:8080/geonetwork/srv/eng/catalog.edit#/metadata/ApprovedID

Then the editor was opening the editor form with the UUID.

And in such case the editor does not do the redirection (in
MetadataEditingApi.java#L153).
---
 .../resources/catalog/components/elasticsearch/EsFacet.js | 1 +
 .../catalog/views/default/directives/directive.js         | 8 ++++++--
 .../views/default/directives/partials/linksbtn.html       | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js b/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
index 85e4820e2b5..b28496a5c7d 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
@@ -50,6 +50,7 @@
           "resourceDate",
           "resourceEdition",
           "draft",
+          "draftId",
           "owner",
           "link",
           "status*",
diff --git a/web-ui/src/main/resources/catalog/views/default/directives/directive.js b/web-ui/src/main/resources/catalog/views/default/directives/directive.js
index 41a0cbe1905..6b3e824b775 100644
--- a/web-ui/src/main/resources/catalog/views/default/directives/directive.js
+++ b/web-ui/src/main/resources/catalog/views/default/directives/directive.js
@@ -81,12 +81,16 @@
 
   module.directive("gnLinksBtn", [
     "gnTplResultlistLinksbtn",
-    function (gnTplResultlistLinksbtn) {
+    "gnMetadataActions",
+    function (gnTplResultlistLinksbtn, gnMetadataActions) {
       return {
         restrict: "E",
         replace: true,
         scope: true,
-        templateUrl: gnTplResultlistLinksbtn
+        templateUrl: gnTplResultlistLinksbtn,
+        link: function linkFn(scope) {
+          scope.gnMetadataActions = gnMetadataActions;
+        }
       };
     }
   ]);
diff --git a/web-ui/src/main/resources/catalog/views/default/directives/partials/linksbtn.html b/web-ui/src/main/resources/catalog/views/default/directives/partials/linksbtn.html
index 730eb984312..f80db6a4bb6 100644
--- a/web-ui/src/main/resources/catalog/views/default/directives/partials/linksbtn.html
+++ b/web-ui/src/main/resources/catalog/views/default/directives/partials/linksbtn.html
@@ -2,7 +2,7 @@
   <a
     class="gn-md-edit-btn btn btn-default btn-sm"
     data-ng-show="user.canEditRecord(md)"
-    data-ng-href="catalog.edit#/metadata/{{md.id}}?redirectUrl=catalog.search%23%2Fmetadata%2F{{md.uuid}}"
+    data-ng-href="catalog.edit#/metadata/{{gnMetadataActions.getMetadataIdToEdit(md)}}?redirectUrl=catalog.search%23%2Fmetadata%2F{{md.uuid}}"
     title="{{'edit' | translate}}"
     aria-label="{{'edit' | translate}}"
   >