From 6aa0a94f3401d0f0673aefcffaf2ab0668c2510c Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor.kozlov@gmail.com>
Date: Thu, 15 Aug 2024 17:01:20 +0300
Subject: [PATCH 1/2] #3413 - Redirect Manager: Interface triggers an error
 because of wrong deprecated resource type

---
 CHANGELOG.md                                  |  1 +
 .../redirect-row/redirect-row.html            | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d4c4c900e..8c143da0b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 ## Unreleased ([details][unreleased changes details])
 
 ## 6.6.4 - 2024-08-14
+- #3413 - Redirect Manager: Interface triggers an error because of wrong deprecated resource type
 
 ### Fixed
 
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html
new file mode 100644
index 0000000000..22df49caa4
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html
@@ -0,0 +1,25 @@
+<!--
+  ~ ACS AEM Commons
+  ~
+  ~ Copyright (C) 2013 - 2023 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --><!--
+
+      Render a redirect as html.
+      Used by the "Configure Redirection Rule" dialog to update the table of redirects
+ -->
+<sly
+        data-sly-use.redirectsTemplate="../template.html"
+        data-sly-call="${redirectsTemplate.row @ redirectResource = resource}"
+/>

From 13ef794ff9ce45ac739b3094e06d0eba95acd3e9 Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor.kozlov@gmail.com>
Date: Fri, 16 Aug 2024 15:30:42 +0300
Subject: [PATCH 2/2] #3413 - more js tweaks

---
 .../utilities/manage-redirects/clientlibs/app.js         | 9 ++++++---
 .../manage-redirects/redirect-row/redirect-row.html      | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/clientlibs/app.js b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/clientlibs/app.js
index bc9cfcdd30..64af5c06a7 100755
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/clientlibs/app.js
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/clientlibs/app.js
@@ -115,15 +115,18 @@
       $.ajax({
         url: redirectPath + ".html"
       }).done(function (trHtml) {
+        var tr;
         if (response.isCreate) {
           var editRedirectTable = $(TABLE_SELECTOR);
-          var tr = editRedirectTable
+          tr = editRedirectTable
             .find("tbody")[0]
             .appendChild(document.createElement("tr"));
-          $(tr).replaceWith(trHtml);
+          tr.id = redirectId;
+          tr.dataset.path = redirectPath;
         } else {
-          $("#" + redirectId).replaceWith(trHtml);
+          tr = $("#" + redirectId)[0];
         }
+        tr.innerHTML = trHtml;
         var ui = $(window).adaptTo("foundation-ui");
         ui.clearWait();
       });
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html
index 22df49caa4..304a5e0cfb 100644
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/manage-redirects/redirect-row/redirect-row.html
@@ -21,5 +21,5 @@
  -->
 <sly
         data-sly-use.redirectsTemplate="../template.html"
-        data-sly-call="${redirectsTemplate.row @ redirectResource = resource}"
+        data-sly-call="${redirectsTemplate.row @ redirectResource = resource, allowRearrange = true}"
 />