From 378f5b4afc404a5cd8c41998ec1e9e39975581d2 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 21 Mar 2021 09:43:42 +0100
Subject: [PATCH] Support nested structures in `Ui/Object/Action/Delete`

---
 .../Core/Ui/Object/Action/Delete.ts           |  7 +++++++
 .../files/acp/templates/menuItemList.tpl      | 20 ++-----------------
 .../Core/Ui/Object/Action/Delete.js           |  6 ++++++
 wcfsetup/install/lang/de.xml                  |  1 -
 wcfsetup/install/lang/en.xml                  |  1 -
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Ui/Object/Action/Delete.ts b/ts/WoltLabSuite/Core/Ui/Object/Action/Delete.ts
index b69a13277e..3ec1e78bca 100644
--- a/ts/WoltLabSuite/Core/Ui/Object/Action/Delete.ts
+++ b/ts/WoltLabSuite/Core/Ui/Object/Action/Delete.ts
@@ -11,6 +11,13 @@ import UiObjectActionHandler from "./Handler";
 import { DatabaseObjectActionResponse } from "../../../Ajax/Data";
 
 function deleteObject(data: DatabaseObjectActionResponse, objectElement: HTMLElement): void {
+  const childContainer = objectElement.querySelector(".jsObjectActionObjectChildren");
+  if (childContainer) {
+    Array.from(childContainer.children).forEach((child: HTMLElement) => {
+      objectElement.parentNode!.insertBefore(child, objectElement);
+    });
+  }
+
   objectElement.remove();
 }
 
diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl
index 5f5e1c6a44..4617f1c276 100644
--- a/wcfsetup/install/files/acp/templates/menuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl
@@ -13,22 +13,6 @@
 			}
 		});
 	});
-	
-	$(function() {
-		var deleteAction = new WCF.Action.Delete('wcf\\data\\menu\\item\\MenuItemAction', '.sortableNode', '> .sortableNodeLabel .jsDeleteButton');
-		var mpTriggerEffect = deleteAction.triggerEffect;
-		deleteAction.triggerEffect = function (objectIDs) {
-			// move children up by one
-			objectIDs.forEach(function (objectId) {
-				var item = elBySel('#menuItemList li[data-object-id="' + objectId + '"]');
-				elBySelAll('.sortableList[data-object-id="' + objectId + '"] > li', item, function(childItem) {
-					item.parentNode.insertBefore(childItem, item);
-				});
-			});
-			
-			mpTriggerEffect.call(deleteAction, objectIDs);
-		};
-	});
 </script>
 
 <header class="contentHeader">
@@ -64,7 +48,7 @@
 								{/if}
 								<a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
 								{if $menuItemNode->canDelete()}
-									<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItemNode->itemID}" data-confirm-message-html="{lang __encode=true}wcf.acp.menu.item.delete.confirmMessage{/lang}"></span>
+									{objectAction action="delete" objectTitle=$menuItemNode->getTitle()}
 								{else}
 									<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 								{/if}
@@ -73,7 +57,7 @@
 							</span>
 						</span>
 					
-						<ol class="sortableList" data-object-id="{@$menuItemNode->itemID}">{if !$menuItemNode->hasChildren()}</ol></li>{/if}
+						<ol class="sortableList jsObjectActionObjectChildren" data-object-id="{@$menuItemNode->itemID}">{if !$menuItemNode->hasChildren()}</ol></li>{/if}
 						
 						{if !$menuItemNode->hasChildren() && $menuItemNode->isLastSibling()}
 							{@"</ol></li>"|str_repeat:$menuItemNode->getOpenParentNodes()}
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Delete.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Delete.js
index 4261900ba1..032f5f0aeb 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Delete.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Delete.js
@@ -12,6 +12,12 @@ define(["require", "exports", "tslib", "./Handler"], function (require, exports,
     exports.setup = void 0;
     Handler_1 = tslib_1.__importDefault(Handler_1);
     function deleteObject(data, objectElement) {
+        const childContainer = objectElement.querySelector(".jsObjectActionObjectChildren");
+        if (childContainer) {
+            Array.from(childContainer.children).forEach((child) => {
+                objectElement.parentNode.insertBefore(child, objectElement);
+            });
+        }
         objectElement.remove();
     }
     function setup() {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 5af1264a74..d206e5b104 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1178,7 +1178,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
 		<item name="wcf.acp.menu.list"><![CDATA[Menüs]]></item>
 		<item name="wcf.acp.menu.item.add"><![CDATA[Menüpunkt hinzufügen]]></item>
 		<item name="wcf.acp.menu.item.action.description"><![CDATA[Menü: {$menu->getTitle()}]]></item>
-		<item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Menüpunkt <span class="confirmationObject">{$menuItemNode->getTitle()}</span> wirklich löschen?]]></item>
 		<item name="wcf.acp.menu.item.edit"><![CDATA[Menüpunkt bearbeiten]]></item>
 		<item name="wcf.acp.menu.item.externalURL"><![CDATA[Externe URL]]></item>
 		<item name="wcf.acp.menu.item.isDisabled"><![CDATA[Menüpunkt deaktivieren]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index d919dac7af..f617ca28f4 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1156,7 +1156,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
 		<item name="wcf.acp.menu.list"><![CDATA[Menus]]></item>
 		<item name="wcf.acp.menu.item.add"><![CDATA[Add Menu Item]]></item>
 		<item name="wcf.acp.menu.item.action.description"><![CDATA[Menu: {$menu->getTitle()}]]></item>
-		<item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[Do you really want to delete the menu item <span class="confirmationObject">{$menuItemNode->getTitle()}</span>?]]></item>
 		<item name="wcf.acp.menu.item.edit"><![CDATA[Edit Menu Item]]></item>
 		<item name="wcf.acp.menu.item.externalURL"><![CDATA[External URL]]></item>
 		<item name="wcf.acp.menu.item.isDisabled"><![CDATA[Disable menu item]]></item>
-- 
2.20.1