From ca824b01d68bfb062a7209778ca8ccd48014078d Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 17:02:12 +0200
Subject: [PATCH] v8: Add confirm overlay when deleting user account (#5487)

---
 .../common/overlays/confirm/confirm.html      | 13 ++++++++
 .../src/views/users/user.controller.js        | 31 ++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
new file mode 100644
index 0000000000..79dd6bd4f6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
@@ -0,0 +1,13 @@
+<div>
+
+    <div ng-if="model.confirmMessage"
+         class="umb-alert mb2"
+         ng-class="{ 'umb-alert--warning': model.confirmMessageStyle === 'warning',
+                     'umb-alert--danger': model.confirmMessageStyle === 'danger',
+                     'umb-alert--info': model.confirmMessageStyle === 'info'}">
+        {{model.confirmMessage}}
+    </div>
+
+    <p>{{model.content}}</p>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 4cbd779236..bbce18f017 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UserEditController($scope, eventsService, $q, $timeout, $location, $routeParams, formHelper, usersResource, userService, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper, editorService) {
+    function UserEditController($scope, eventsService, $q, $location, $routeParams, formHelper, usersResource, userService, contentEditingHelper, localizationService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper, editorService, overlayService) {
 
         var vm = this;
 
@@ -372,11 +372,32 @@
             vm.deleteNotLoggedInUserButtonState = "busy";
 
             var confirmationMessage = vm.labels.deleteUserConfirmation;
-            if (!confirm(confirmationMessage)) {
-                vm.deleteNotLoggedInUserButtonState = "danger";
-                return;
-            }
 
+            localizationService.localizeMany(["general_delete", "general_cancel", "contentTypeEditor_yesDelete"])
+                .then(function (data) {
+
+                    const overlay = {
+                        view: "confirm",
+                        title: data[0],
+                        content: confirmationMessage,
+                        closeButtonLabel: data[1],
+                        submitButtonLabel: data[2],
+                        submitButtonStyle: "danger",
+                        close: function () {
+                            vm.deleteNotLoggedInUserButtonState = "danger";
+                            overlayService.close();
+                        },
+                        submit: function () {
+                            performDelete();
+                            overlayService.close();
+                        }
+                    };
+                    overlayService.open(overlay);
+
+                });
+        }
+
+        function performDelete() {
             usersResource.deleteNonLoggedInUser(vm.user.id).then(function (data) {
                 formHelper.showNotifications(data);
                 goToPage(vm.breadcrumbs[0]);