From 8de2f4920a5220c3a4382625a63bf0eed4640b4d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 2 Oct 2020 21:12:31 +0200
Subject: [PATCH] Do not show cryptic confirm dialog when editing group

---
 .../src/views/users/group.controller.js       | 45 +++++++++++--------
 .../src/views/users/group.html                |  6 +--
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
index c29bda19ed..fd5cfc4e4f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
@@ -23,7 +23,9 @@
         vm.openContentPicker = openContentPicker;
         vm.openMediaPicker = openMediaPicker;
         vm.openUserPicker = openUserPicker;
-        vm.removeSelectedItem = removeSelectedItem;
+        vm.removeSection = removeSection;
+        vm.removeAssignedPermissions = removeAssignedPermissions;
+        vm.removeUser = removeUser;
         vm.clearStartNode = clearStartNode;
         vm.save = save;
         vm.openGranularPermissionsPicker = openGranularPermissionsPicker;
@@ -281,28 +283,33 @@
 
         }
 
-        function removeSelectedItem(index, selection) {
-            if (selection && selection.length > 0) {
+        function removeSection(index) {
+            vm.userGroup.sections.splice(index, 1);
+        }
 
-                const dialog = {
-                    view: "views/users/views/overlays/remove.html",
-                    username: selection[index].username,
-                    userGroupName: vm.userGroup.name.toLowerCase(),
-                    submitButtonLabelKey: "defaultdialogs_yesRemove",
-                    submitButtonStyle: "danger",
+        function removeAssignedPermissions(index) {
+            vm.userGroup.assignedPermissions.splice(index, 1);
+        }
 
-                    submit: function () {
-                        selection.splice(index, 1);
+        function removeUser(index) {
+            const dialog = {
+                view: "views/users/views/overlays/remove.html",
+                username: vm.userGroup.users[index].username,
+                userGroupName: vm.userGroup.name.toLowerCase(),
+                submitButtonLabelKey: "defaultdialogs_yesRemove",
+                submitButtonStyle: "danger",
 
-                        overlayService.close();
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
+                submit: function () {
+                    vm.userGroup.users.splice(index, 1);
 
-                overlayService.open(dialog);
-            }
+                    overlayService.close();
+                },
+                close: function () {
+                    overlayService.close();
+                }
+            };
+
+            overlayService.open(dialog);
         }
 
         function clearStartNode(type) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index 2df7afc066..f423d06c3c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -35,7 +35,7 @@
                                                           icon="section.icon"
                                                           name="section.name"
                                                           allow-remove="true"
-                                                          on-remove="vm.removeSelectedItem($index, vm.userGroup.sections)">
+                                                          on-remove="vm.removeSection($index)">
                                         </umb-node-preview>
 
                                         <button type="button"
@@ -115,7 +115,7 @@
                                                           name="node.name"
                                                           permissions="node.allowedPermissions"
                                                           allow-remove="true"
-                                                          on-remove="vm.removeSelectedItem($index, vm.userGroup.assignedPermissions)"
+                                                          on-remove="vm.removeAssignedPermissions($index)"
                                                           allow-edit="true"
                                                           on-edit="vm.setPermissionsForNode(node)">
                                         </umb-node-preview>
@@ -143,7 +143,7 @@
                                                       name="user.name"
                                                       avatars="user.avatars"
                                                       allow-remove="true"
-                                                      on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
+                                                      on-remove="vm.removeUser($index)">
                                     </umb-user-preview>
 
                                     <button type="button"