diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index fd4e1d25a..a8458d553 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -66,12 +66,17 @@ let createAccount (admin:IAdminService) (account:BTSAccount) = promise { } let deleteAccount (admin:IAdminService) (account:BTSAccount) = promise { - let! result = admin.delete_account { id = account.id } - if result.isSuccess then - let! data = admin.get_admin_data() - return UpdateAdminData data - else - return ErrorOccured (sprintf "Error deleting account: %s" result.errorText) + match Fable.Import.Browser.window.confirm "Are you sure?" with + | false -> + let! data = admin.get_admin_data() + return UpdateAdminData data + | true -> + let! result = admin.delete_account { id = account.id } + if result.isSuccess then + let! data = admin.get_admin_data() + return UpdateAdminData data + else + return ErrorOccured (sprintf "Error deleting account: %s" result.errorText) } let erase (arr:'a[]) i = diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 7eab1a660..6b593b63b 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -60,8 +60,7 @@ let generalView model dispatch = let removefn,removeEnabled = match model.scratch with | account when isNewAccount account -> ignore,Disabled - | account when account.isActive -> ignore,Disabled - | account when not account.isActive -> + | account -> (fun _ -> dispatch <| DeleteAccount account), Enabled let account = model.scratch diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 67f48cad5..31a2573e9 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -116,12 +116,17 @@ let saveUser (admin:IAdminService) (user:BTSUser) = promise { } let deleteUser (admin:IAdminService) (user:BTSUser) = promise { - let! result = admin.delete_user { id = user.id } - if (result.isSuccess) then - let! data = admin.get_admin_data() - return UpdateAdminData data - else - return ErrorOccured (sprintf "Error deleting user: %s" result.errorText) + match Fable.Import.Browser.window.confirm "Are you sure?" with + | false -> + let! data = admin.get_admin_data() + return UpdateAdminData data + | true -> + let! result = admin.delete_user { id = user.id } + if (result.isSuccess) then + let! data = admin.get_admin_data() + return UpdateAdminData data + else + return ErrorOccured (sprintf "Error deleting user: %s" result.errorText) } let createUser (admin:IAdminService) (user:BTSUser) = promise { diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index f09f0b862..161a964a3 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -34,10 +34,9 @@ let saveButton (model:Users.Types.Model) dispatch = let generalTabContent (model:Model) (dispatch:Msg->Unit) = let removefn, removeEnabled = - match (model.scratchUser.id > 0), model.scratchUser.isActive with - | false, true -> ignore, Button.Disabled - | true, true -> ignore, Button.Disabled - | true, false -> + match (model.scratchUser.id > 0)with + | false -> ignore, Button.Disabled + | true -> (fun _ -> dispatch <| Delete model.scratchUser), Button.Enabled div [] [