From f253803dc2f8b06d8932204cdb9e4d14fd84bce0 Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Thu, 14 Jul 2022 15:29:30 +0100 Subject: [PATCH] exported deleteUserModal as component --- .../portal/manage/users/[userId].svelte | 32 +++---------------- .../users/_components/DeleteUserModal.svelte | 31 ++++++++++++++++++ 2 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/DeleteUserModal.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index 6dfb139fa3..287fa0f57e 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -17,7 +17,6 @@ Popover, Select, Modal, - ModalContent, notifications, StatusLight, } from "@budibase/bbui" @@ -29,10 +28,11 @@ import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" import { RoleUtils } from "@budibase/frontend-core" import UserGroupPicker from "components/settings/UserGroupPicker.svelte" + import DeleteUserModal from "./_components/DeleteUserModal.svelte" export let userId - let deleteUserModal + let deleteModal let resetPasswordModal let popoverAnchor let searchTerm = "" @@ -83,15 +83,6 @@ : "appUser" const userFetch = fetchData(`/api/global/users/${userId}`) - async function deleteUser() { - try { - await users.delete(userId) - notifications.success(`User ${$userFetch?.data?.email} deleted.`) - $goto("./") - } catch (error) { - notifications.error("Error deleting user") - } - } function getHighestRole(roles) { let highestRole @@ -207,9 +198,7 @@ Force Password Reset - Delete + Delete @@ -331,19 +320,8 @@ - - - - Are you sure you want to delete {$userFetch?.data?.email} - - + + + import { goto } from "@roxi/routify" + import { Body, ModalContent, notifications } from "@budibase/bbui" + + import { users } from "stores/portal" + + export let user + + async function deleteUser() { + try { + await users.delete(user._id) + notifications.success(`User ${user?.email} deleted.`) + $goto("./") + } catch (error) { + notifications.error("Error deleting user") + } + } + + + + + Are you sure you want to delete {user?.email} + +