From 476cdcfe866848bc50b2af9aeb8b1a2a7b0ee7f8 Mon Sep 17 00:00:00 2001 From: Pallavi Kumari Date: Sun, 19 Oct 2025 15:02:35 +0530 Subject: [PATCH 1/5] easier to delete sites --- messages/en-US.json | 9 +++++---- src/components/ConfirmDeleteDialog.tsx | 12 ++++++++++++ src/components/SitesTable.tsx | 10 ++-------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/messages/en-US.json b/messages/en-US.json index 44668c5d4..6ba164f3f 100644 --- a/messages/en-US.json +++ b/messages/en-US.json @@ -47,9 +47,8 @@ "edit": "Edit", "siteConfirmDelete": "Confirm Delete Site", "siteDelete": "Delete Site", - "siteMessageRemove": "Once removed, the site will no longer be accessible. All resources and targets associated with the site will also be removed.", - "siteMessageConfirm": "To confirm, please type the name of the site below.", - "siteQuestionRemove": "Are you sure you want to remove the site {selectedSite} from the organization?", + "siteMessageRemove": "Once removed the site will no longer be accessible. All targets associated with the site will also be removed.", + "siteQuestionRemove": "Are you sure you want to remove the site from the organization?", "siteManageSites": "Manage Sites", "siteDescription": "Allow connectivity to your network through secure tunnels", "siteCreate": "Create Site", @@ -1894,5 +1893,7 @@ "pathRewriteRegex": "Regex", "pathRewriteStrip": "Strip", "pathRewriteStripLabel": "strip", - "sidebarEnableEnterpriseLicense": "Enable Enterprise License" + "sidebarEnableEnterpriseLicense": "Enable Enterprise License", + "cannotbeUndone": "This can not be undone.", + "toConfirm": "to confirm" } diff --git a/src/components/ConfirmDeleteDialog.tsx b/src/components/ConfirmDeleteDialog.tsx index cd053a141..db6415dbb 100644 --- a/src/components/ConfirmDeleteDialog.tsx +++ b/src/components/ConfirmDeleteDialog.tsx @@ -44,6 +44,7 @@ import { Description } from "@radix-ui/react-toast"; import { createApiClient } from "@app/lib/api"; import { useEnvContext } from "@app/hooks/useEnvContext"; import { useTranslations } from "next-intl"; +import CopyToClipboard from "./CopyToClipboard"; type InviteUserFormProps = { open: boolean; @@ -110,6 +111,17 @@ export default function InviteUserForm({
{dialog} +
+ {t("cannotbeUndone")} +
+ +
+
+ {t("type")} + + {t("toConfirm")} +
+
+

- {t("siteQuestionRemove", { - selectedSite: - selectedSite?.name || selectedSite?.id - })} + {t("siteQuestionRemove")}

-

{t("siteMessageRemove")}

- -

{t("siteMessageConfirm")}

} buttonText={t("siteConfirmDelete")} From ae4a24f4aa1fe019aea7f8e7e606e32ec1d7dfb8 Mon Sep 17 00:00:00 2001 From: Pallavi Kumari Date: Sun, 19 Oct 2025 15:50:00 +0530 Subject: [PATCH 2/5] easier to delete resources --- messages/en-US.json | 3 +-- src/components/ConfirmDeleteDialog.tsx | 2 +- src/components/ResourcesTable.tsx | 30 +++++++++----------------- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/messages/en-US.json b/messages/en-US.json index 6ba164f3f..5dfe313b2 100644 --- a/messages/en-US.json +++ b/messages/en-US.json @@ -153,8 +153,7 @@ "protected": "Protected", "notProtected": "Not Protected", "resourceMessageRemove": "Once removed, the resource will no longer be accessible. All targets associated with the resource will also be removed.", - "resourceMessageConfirm": "To confirm, please type the name of the resource below.", - "resourceQuestionRemove": "Are you sure you want to remove the resource {selectedResource} from the organization?", + "resourceQuestionRemove": "Are you sure you want to remove the resource from the organization?", "resourceHTTP": "HTTPS Resource", "resourceHTTPDescription": "Proxy requests to your app over HTTPS using a subdomain or base domain.", "resourceRaw": "Raw TCP/UDP Resource", diff --git a/src/components/ConfirmDeleteDialog.tsx b/src/components/ConfirmDeleteDialog.tsx index db6415dbb..499d08874 100644 --- a/src/components/ConfirmDeleteDialog.tsx +++ b/src/components/ConfirmDeleteDialog.tsx @@ -118,7 +118,7 @@ export default function InviteUserForm({
{t("type")} - + {t("toConfirm")}
diff --git a/src/components/ResourcesTable.tsx b/src/components/ResourcesTable.tsx index ad8b4fab2..4f55b26d0 100644 --- a/src/components/ResourcesTable.tsx +++ b/src/components/ResourcesTable.tsx @@ -695,17 +695,12 @@ export default function ResourcesTable({ }} dialog={
-

- {t("resourceQuestionRemove", { - selectedResource: - selectedResource?.name || - selectedResource?.id - })} +

+ {t("resourceQuestionRemove")} +

+

+ {t("resourceMessageRemove")}

- -

{t("resourceMessageRemove")}

- -

{t("resourceMessageConfirm")}

} buttonText={t("resourceDeleteConfirm")} @@ -724,17 +719,12 @@ export default function ResourcesTable({ }} dialog={
-

- {t("resourceQuestionRemove", { - selectedResource: - selectedInternalResource?.name || - selectedInternalResource?.id - })} +

+ {t("resourceQuestionRemove")} +

+

+ {t("resourceMessageRemove")}

- -

{t("resourceMessageRemove")}

- -

{t("resourceMessageConfirm")}

} buttonText={t("resourceDeleteConfirm")} From f258c41f15efb4036d3279ba8e7f29a23ef87d46 Mon Sep 17 00:00:00 2001 From: Pallavi Kumari Date: Sun, 19 Oct 2025 20:37:07 +0530 Subject: [PATCH 3/5] easier to delete --- messages/en-US.json | 24 +++++++++---------- .../remote-exit-nodes/ExitNodesTable.tsx | 7 +----- src/app/[orgId]/settings/general/page.tsx | 5 +--- src/app/admin/license/page.tsx | 7 +----- src/app/admin/users/AdminUsersTable.tsx | 9 +------ src/components/ApiKeysTable.tsx | 7 +----- src/components/ClientsTable.tsx | 15 ++---------- src/components/DomainsTable.tsx | 5 +--- src/components/InvitationsTable.tsx | 5 +--- src/components/OrgApiKeysTable.tsx | 7 +----- src/components/private/OrgIdpTable.tsx | 5 +--- 11 files changed, 22 insertions(+), 74 deletions(-) diff --git a/messages/en-US.json b/messages/en-US.json index 5dfe313b2..d6a156d72 100644 --- a/messages/en-US.json +++ b/messages/en-US.json @@ -218,7 +218,7 @@ "orgDeleteConfirm": "Confirm Delete Organization", "orgMessageRemove": "This action is irreversible and will delete all associated data.", "orgMessageConfirm": "To confirm, please type the name of the organization below.", - "orgQuestionRemove": "Are you sure you want to remove the organization {selectedOrg}?", + "orgQuestionRemove": "Are you sure you want to remove the organization?", "orgUpdated": "Organization updated", "orgUpdatedDescription": "The organization has been updated.", "orgErrorUpdate": "Failed to update organization", @@ -285,9 +285,8 @@ "apiKeysAdd": "Generate API Key", "apiKeysErrorDelete": "Error deleting API key", "apiKeysErrorDeleteMessage": "Error deleting API key", - "apiKeysQuestionRemove": "Are you sure you want to remove the API key {selectedApiKey} from the organization?", + "apiKeysQuestionRemove": "Are you sure you want to remove the API key from the organization?", "apiKeysMessageRemove": "Once removed, the API key will no longer be able to be used.", - "apiKeysMessageConfirm": "To confirm, please type the name of the API key below.", "apiKeysDeleteConfirm": "Confirm Delete API Key", "apiKeysDelete": "Delete API Key", "apiKeysManage": "Manage API Keys", @@ -303,8 +302,7 @@ "userDeleteConfirm": "Confirm Delete User", "userDeleteServer": "Delete User from Server", "userMessageRemove": "The user will be removed from all organizations and be completely removed from the server.", - "userMessageConfirm": "To confirm, please type the name of the user below.", - "userQuestionRemove": "Are you sure you want to permanently delete {selectedUser} from the server?", + "userQuestionRemove": "Are you sure you want to permanently delete user from the server?", "licenseKey": "License Key", "valid": "Valid", "numberOfSites": "Number of Sites", @@ -337,7 +335,7 @@ "fossorialLicense": "View Fossorial Commercial License & Subscription Terms", "licenseMessageRemove": "This will remove the license key and all associated permissions granted by it.", "licenseMessageConfirm": "To confirm, please type the license key below.", - "licenseQuestionRemove": "Are you sure you want to delete the license key {selectedKey} ?", + "licenseQuestionRemove": "Are you sure you want to delete the license key ?", "licenseKeyDelete": "Delete License Key", "licenseKeyDeleteConfirm": "Confirm Delete License Key", "licenseTitle": "Manage License Status", @@ -370,7 +368,7 @@ "inviteRemoveErrorDescription": "An error occurred while removing the invitation.", "inviteRemoved": "Invitation removed", "inviteRemovedDescription": "The invitation for {email} has been removed.", - "inviteQuestionRemove": "Are you sure you want to remove the invitation {email}?", + "inviteQuestionRemove": "Are you sure you want to remove the invitation?", "inviteMessageRemove": "Once removed, this invitation will no longer be valid. You can always re-invite the user later.", "inviteMessageConfirm": "To confirm, please type the email address of the invitation below.", "inviteQuestionRegenerate": "Are you sure you want to regenerate the invitation for {email}? This will revoke the previous invitation.", @@ -740,7 +738,7 @@ "idpManageDescription": "View and manage identity providers in the system", "idpDeletedDescription": "Identity provider deleted successfully", "idpOidc": "OAuth2/OIDC", - "idpQuestionRemove": "Are you sure you want to permanently delete the identity provider {name}?", + "idpQuestionRemove": "Are you sure you want to permanently delete the identity provider?", "idpMessageRemove": "This will remove the identity provider and all associated configurations. Users who authenticate through this provider will no longer be able to log in.", "idpMessageConfirm": "To confirm, please type the name of the identity provider below.", "idpConfirmDelete": "Confirm Delete Identity Provider", @@ -1209,9 +1207,8 @@ "domainCreate": "Create Domain", "domainCreatedDescription": "Domain created successfully", "domainDeletedDescription": "Domain deleted successfully", - "domainQuestionRemove": "Are you sure you want to remove the domain {domain} from your account?", + "domainQuestionRemove": "Are you sure you want to remove the domain from your account?", "domainMessageRemove": "Once removed, the domain will no longer be associated with your account.", - "domainMessageConfirm": "To confirm, please type the domain name below.", "domainConfirmDelete": "Confirm Delete Domain", "domainDelete": "Delete Domain", "domain": "Domain", @@ -1561,9 +1558,8 @@ "searchRemoteExitNodes": "Search nodes...", "remoteExitNodeAdd": "Add Node", "remoteExitNodeErrorDelete": "Error deleting node", - "remoteExitNodeQuestionRemove": "Are you sure you want to remove the node {selectedNode} from the organization?", + "remoteExitNodeQuestionRemove": "Are you sure you want to remove the node from the organization?", "remoteExitNodeMessageRemove": "Once removed, the node will no longer be accessible.", - "remoteExitNodeMessageConfirm": "To confirm, please type the name of the node below.", "remoteExitNodeConfirmDelete": "Confirm Delete Node", "remoteExitNodeDelete": "Delete Node", "sidebarRemoteExitNodes": "Remote Nodes", @@ -1894,5 +1890,7 @@ "pathRewriteStripLabel": "strip", "sidebarEnableEnterpriseLicense": "Enable Enterprise License", "cannotbeUndone": "This can not be undone.", - "toConfirm": "to confirm" + "toConfirm": "to confirm", + "deleteClientQuestion": "Are you sure you want to remove the client from the site and organization?", + "clientMessageRemove": "Once removed, the client will no longer be able to connect to the site." } diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx index c7e332d70..8f89efa18 100644 --- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx +++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx @@ -272,15 +272,10 @@ export default function ExitNodesTable({ dialog={

- {t("remoteExitNodeQuestionRemove", { - selectedNode: - selectedNode?.name || selectedNode?.id - })} + {t("remoteExitNodeQuestionRemove")}

{t("remoteExitNodeMessageRemove")}

- -

{t("remoteExitNodeMessageConfirm")}

} buttonText={t("remoteExitNodeConfirmDelete")} diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx index 1801bcf2b..77c4bde60 100644 --- a/src/app/[orgId]/settings/general/page.tsx +++ b/src/app/[orgId]/settings/general/page.tsx @@ -169,12 +169,9 @@ export default function GeneralPage() { dialog={

- {t("orgQuestionRemove", { - selectedOrg: org?.org.name - })} + {t("orgQuestionRemove")}

{t("orgMessageRemove")}

-

{t("orgMessageConfirm")}

} buttonText={t("orgDeleteConfirm")} diff --git a/src/app/admin/license/page.tsx b/src/app/admin/license/page.tsx index 665212fcc..270555183 100644 --- a/src/app/admin/license/page.tsx +++ b/src/app/admin/license/page.tsx @@ -317,16 +317,11 @@ export default function LicensePage() { dialog={

- {t("licenseQuestionRemove", { - selectedKey: obfuscateLicenseKey( - selectedLicenseKey.licenseKey - ) - })} + {t("licenseQuestionRemove")}

{t("licenseMessageRemove")}

-

{t("licenseMessageConfirm")}

} buttonText={t("licenseKeyDeleteConfirm")} diff --git a/src/app/admin/users/AdminUsersTable.tsx b/src/app/admin/users/AdminUsersTable.tsx index 8e75ff248..ad141f997 100644 --- a/src/app/admin/users/AdminUsersTable.tsx +++ b/src/app/admin/users/AdminUsersTable.tsx @@ -239,19 +239,12 @@ export default function UsersTable({ users }: Props) { dialog={

- {t("userQuestionRemove", { - selectedUser: - selected?.email || - selected?.name || - selected?.username - })} + {t("userQuestionRemove")}

{t("userMessageRemove")}

- -

{t("userMessageConfirm")}

} buttonText={t("userDeleteConfirm")} diff --git a/src/components/ApiKeysTable.tsx b/src/components/ApiKeysTable.tsx index adc150cf3..a4033fa52 100644 --- a/src/components/ApiKeysTable.tsx +++ b/src/components/ApiKeysTable.tsx @@ -179,17 +179,12 @@ export default function ApiKeysTable({ apiKeys }: ApiKeyTableProps) { dialog={

- {t("apiKeysQuestionRemove", { - selectedApiKey: - selected?.name || selected?.id - })} + {t("apiKeysQuestionRemove")}

{t("apiKeysMessageRemove")}

- -

{t("apiKeysMessageConfirm")}

} buttonText={t("apiKeysDeleteConfirm")} diff --git a/src/components/ClientsTable.tsx b/src/components/ClientsTable.tsx index 425b8395c..b201a7ac2 100644 --- a/src/components/ClientsTable.tsx +++ b/src/components/ClientsTable.tsx @@ -279,24 +279,13 @@ export default function ClientsTable({ clients, orgId }: ClientTableProps) { dialog={

- Are you sure you want to remove the client{" "} - - {selectedClient?.name || selectedClient?.id} - {" "} - from the site and organization? + {t("deleteClientQuestion")}

-

- Once removed, the client will no longer be - able to connect to the site.{" "} + {t("clientMessageRemove")}

- -

- To confirm, please type the name of the client - below. -

} buttonText="Confirm Delete Client" diff --git a/src/components/DomainsTable.tsx b/src/components/DomainsTable.tsx index 5bafe935b..2a960bd2a 100644 --- a/src/components/DomainsTable.tsx +++ b/src/components/DomainsTable.tsx @@ -239,14 +239,11 @@ export default function DomainsTable({ domains }: Props) { dialog={

- {t("domainQuestionRemove", { - domain: selectedDomain.baseDomain - })} + {t("domainQuestionRemove")}

{t("domainMessageRemove")}

-

{t("domainMessageConfirm")}

} buttonText={t("domainConfirmDelete")} diff --git a/src/components/InvitationsTable.tsx b/src/components/InvitationsTable.tsx index 900003d77..d933d518a 100644 --- a/src/components/InvitationsTable.tsx +++ b/src/components/InvitationsTable.tsx @@ -177,12 +177,9 @@ export default function InvitationsTable({ dialog={

- {t("inviteQuestionRemove", { - email: selectedInvitation?.email || "" - })} + {t("inviteQuestionRemove")}

{t("inviteMessageRemove")}

-

{t("inviteMessageConfirm")}

} buttonText={t("inviteRemoveConfirm")} diff --git a/src/components/OrgApiKeysTable.tsx b/src/components/OrgApiKeysTable.tsx index d4c81e806..324e312fd 100644 --- a/src/components/OrgApiKeysTable.tsx +++ b/src/components/OrgApiKeysTable.tsx @@ -187,17 +187,12 @@ export default function OrgApiKeysTable({ dialog={

- {t("apiKeysQuestionRemove", { - selectedApiKey: - selected?.name || selected?.id - })} + {t("apiKeysQuestionRemove")}

{t("apiKeysMessageRemove")}

- -

{t("apiKeysMessageConfirm")}

} buttonText={t("apiKeysDeleteConfirm")} diff --git a/src/components/private/OrgIdpTable.tsx b/src/components/private/OrgIdpTable.tsx index 436904a0a..19961c940 100644 --- a/src/components/private/OrgIdpTable.tsx +++ b/src/components/private/OrgIdpTable.tsx @@ -179,14 +179,11 @@ export default function IdpTable({ idps, orgId }: Props) { dialog={

- {t("idpQuestionRemove", { - name: selectedIdp.name - })} + {t("idpQuestionRemove")}

{t("idpMessageRemove")}

-

{t("idpMessageConfirm")}

} buttonText={t("idpConfirmDelete")} From 7c8c440f679237c1b3bdaa7d19246f7838f63e8d Mon Sep 17 00:00:00 2001 From: Pallavi Kumari Date: Sun, 19 Oct 2025 21:36:47 +0530 Subject: [PATCH 4/5] fix text --- src/app/[orgId]/settings/general/page.tsx | 6 +++--- src/app/admin/users/AdminUsersTable.tsx | 2 +- src/components/ApiKeysTable.tsx | 2 +- src/components/ClientsTable.tsx | 2 -- src/components/DomainsTable.tsx | 2 +- src/components/OrgApiKeysTable.tsx | 2 +- src/components/private/OrgIdpTable.tsx | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx index 77c4bde60..7074c02d9 100644 --- a/src/app/[orgId]/settings/general/page.tsx +++ b/src/app/[orgId]/settings/general/page.tsx @@ -167,11 +167,11 @@ export default function GeneralPage() { setIsDeleteModalOpen(val); }} dialog={ -
-

+

+

{t("orgQuestionRemove")}

-

{t("orgMessageRemove")}

+

{t("orgMessageRemove")}

} buttonText={t("orgDeleteConfirm")} diff --git a/src/app/admin/users/AdminUsersTable.tsx b/src/app/admin/users/AdminUsersTable.tsx index ad141f997..991a2c29f 100644 --- a/src/app/admin/users/AdminUsersTable.tsx +++ b/src/app/admin/users/AdminUsersTable.tsx @@ -243,7 +243,7 @@ export default function UsersTable({ users }: Props) {

- {t("userMessageRemove")} + {t("userMessageRemove")}

} diff --git a/src/components/ApiKeysTable.tsx b/src/components/ApiKeysTable.tsx index a4033fa52..c9a13a2d4 100644 --- a/src/components/ApiKeysTable.tsx +++ b/src/components/ApiKeysTable.tsx @@ -183,7 +183,7 @@ export default function ApiKeysTable({ apiKeys }: ApiKeyTableProps) {

- {t("apiKeysMessageRemove")} + {t("apiKeysMessageRemove")}

} diff --git a/src/components/ClientsTable.tsx b/src/components/ClientsTable.tsx index b201a7ac2..ed820a290 100644 --- a/src/components/ClientsTable.tsx +++ b/src/components/ClientsTable.tsx @@ -282,9 +282,7 @@ export default function ClientsTable({ clients, orgId }: ClientTableProps) { {t("deleteClientQuestion")}

- {t("clientMessageRemove")} -

} diff --git a/src/components/DomainsTable.tsx b/src/components/DomainsTable.tsx index 2a960bd2a..b051a8eb5 100644 --- a/src/components/DomainsTable.tsx +++ b/src/components/DomainsTable.tsx @@ -242,7 +242,7 @@ export default function DomainsTable({ domains }: Props) { {t("domainQuestionRemove")}

- {t("domainMessageRemove")} + {t("domainMessageRemove")}

} diff --git a/src/components/OrgApiKeysTable.tsx b/src/components/OrgApiKeysTable.tsx index 324e312fd..a87c32938 100644 --- a/src/components/OrgApiKeysTable.tsx +++ b/src/components/OrgApiKeysTable.tsx @@ -191,7 +191,7 @@ export default function OrgApiKeysTable({

- {t("apiKeysMessageRemove")} + {t("apiKeysMessageRemove")}

} diff --git a/src/components/private/OrgIdpTable.tsx b/src/components/private/OrgIdpTable.tsx index 19961c940..014e78f63 100644 --- a/src/components/private/OrgIdpTable.tsx +++ b/src/components/private/OrgIdpTable.tsx @@ -182,7 +182,7 @@ export default function IdpTable({ idps, orgId }: Props) { {t("idpQuestionRemove")}

- {t("idpMessageRemove")} + {t("idpMessageRemove")}

} From e59cd6672bda01c80f5479586642a889b5e4d560 Mon Sep 17 00:00:00 2001 From: Pallavi Kumari Date: Sun, 19 Oct 2025 22:23:57 +0530 Subject: [PATCH 5/5] fix space --- messages/en-US.json | 3 +-- .../(private)/remote-exit-nodes/ExitNodesTable.tsx | 2 +- src/app/[orgId]/settings/general/page.tsx | 2 +- src/app/admin/license/page.tsx | 2 +- src/app/admin/users/AdminUsersTable.tsx | 2 +- src/components/AdminIdpTable.tsx | 2 +- src/components/AdminUsersTable.tsx | 2 +- src/components/ApiKeysTable.tsx | 2 +- src/components/ClientsTable.tsx | 2 +- src/components/DomainsTable.tsx | 2 +- src/components/InvitationsTable.tsx | 2 +- src/components/OrgApiKeysTable.tsx | 2 +- src/components/UsersTable.tsx | 13 ++----------- src/components/private/OrgIdpTable.tsx | 2 +- 14 files changed, 15 insertions(+), 25 deletions(-) diff --git a/messages/en-US.json b/messages/en-US.json index d6a156d72..6b31db25a 100644 --- a/messages/en-US.json +++ b/messages/en-US.json @@ -394,9 +394,8 @@ "userErrorOrgRemoveDescription": "An error occurred while removing the user.", "userOrgRemoved": "User removed", "userOrgRemovedDescription": "The user {email} has been removed from the organization.", - "userQuestionOrgRemove": "Are you sure you want to remove {email} from the organization?", + "userQuestionOrgRemove": "Are you sure you want to remove this user from the organization?", "userMessageOrgRemove": "Once removed, this user will no longer have access to the organization. You can always re-invite them later, but they will need to accept the invitation again.", - "userMessageOrgConfirm": "To confirm, please type the name of the of the user below.", "userRemoveOrgConfirm": "Confirm Remove User", "userRemoveOrg": "Remove User from Organization", "users": "Users", diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx index 8f89efa18..6e9ab2375 100644 --- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx +++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx @@ -270,7 +270,7 @@ export default function ExitNodesTable({ setSelectedNode(null); }} dialog={ -
+

{t("remoteExitNodeQuestionRemove")}

diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx index 7074c02d9..b301fd32c 100644 --- a/src/app/[orgId]/settings/general/page.tsx +++ b/src/app/[orgId]/settings/general/page.tsx @@ -167,7 +167,7 @@ export default function GeneralPage() { setIsDeleteModalOpen(val); }} dialog={ -
+

{t("orgQuestionRemove")}

diff --git a/src/app/admin/license/page.tsx b/src/app/admin/license/page.tsx index 270555183..d01b215ae 100644 --- a/src/app/admin/license/page.tsx +++ b/src/app/admin/license/page.tsx @@ -315,7 +315,7 @@ export default function LicensePage() { setSelectedLicenseKey(null); }} dialog={ -
+

{t("licenseQuestionRemove")}

diff --git a/src/app/admin/users/AdminUsersTable.tsx b/src/app/admin/users/AdminUsersTable.tsx index 991a2c29f..c71c0ba98 100644 --- a/src/app/admin/users/AdminUsersTable.tsx +++ b/src/app/admin/users/AdminUsersTable.tsx @@ -237,7 +237,7 @@ export default function UsersTable({ users }: Props) { setSelected(null); }} dialog={ -
+

{t("userQuestionRemove")}

diff --git a/src/components/AdminIdpTable.tsx b/src/components/AdminIdpTable.tsx index 2db1415e2..cea32da3f 100644 --- a/src/components/AdminIdpTable.tsx +++ b/src/components/AdminIdpTable.tsx @@ -193,7 +193,7 @@ export default function IdpTable({ idps }: Props) { setSelectedIdp(null); }} dialog={ -
+

{t("idpQuestionRemove", { name: selectedIdp.name diff --git a/src/components/AdminUsersTable.tsx b/src/components/AdminUsersTable.tsx index 6bca4a74f..5030377af 100644 --- a/src/components/AdminUsersTable.tsx +++ b/src/components/AdminUsersTable.tsx @@ -256,7 +256,7 @@ export default function UsersTable({ users }: Props) { setSelected(null); }} dialog={ -

+

{t("userQuestionRemove", { selectedUser: diff --git a/src/components/ApiKeysTable.tsx b/src/components/ApiKeysTable.tsx index c9a13a2d4..1fcae24dc 100644 --- a/src/components/ApiKeysTable.tsx +++ b/src/components/ApiKeysTable.tsx @@ -177,7 +177,7 @@ export default function ApiKeysTable({ apiKeys }: ApiKeyTableProps) { setSelected(null); }} dialog={ -

+

{t("apiKeysQuestionRemove")}

diff --git a/src/components/ClientsTable.tsx b/src/components/ClientsTable.tsx index ed820a290..95a6b55da 100644 --- a/src/components/ClientsTable.tsx +++ b/src/components/ClientsTable.tsx @@ -277,7 +277,7 @@ export default function ClientsTable({ clients, orgId }: ClientTableProps) { setSelectedClient(null); }} dialog={ -
+

{t("deleteClientQuestion")}

diff --git a/src/components/DomainsTable.tsx b/src/components/DomainsTable.tsx index b051a8eb5..ca8d2a7c6 100644 --- a/src/components/DomainsTable.tsx +++ b/src/components/DomainsTable.tsx @@ -237,7 +237,7 @@ export default function DomainsTable({ domains }: Props) { setSelectedDomain(null); }} dialog={ -
+

{t("domainQuestionRemove")}

diff --git a/src/components/InvitationsTable.tsx b/src/components/InvitationsTable.tsx index d933d518a..20a9755bf 100644 --- a/src/components/InvitationsTable.tsx +++ b/src/components/InvitationsTable.tsx @@ -175,7 +175,7 @@ export default function InvitationsTable({ setSelectedInvitation(null); }} dialog={ -
+

{t("inviteQuestionRemove")}

diff --git a/src/components/OrgApiKeysTable.tsx b/src/components/OrgApiKeysTable.tsx index a87c32938..61c140245 100644 --- a/src/components/OrgApiKeysTable.tsx +++ b/src/components/OrgApiKeysTable.tsx @@ -185,7 +185,7 @@ export default function OrgApiKeysTable({ setSelected(null); }} dialog={ -
+

{t("apiKeysQuestionRemove")}

diff --git a/src/components/UsersTable.tsx b/src/components/UsersTable.tsx index be8aea492..b6827dff1 100644 --- a/src/components/UsersTable.tsx +++ b/src/components/UsersTable.tsx @@ -273,20 +273,11 @@ export default function UsersTable({ users: u }: UsersTableProps) { setSelectedUser(null); }} dialog={ -
+

- {t("userQuestionOrgRemove", { - email: - selectedUser?.email || - selectedUser?.name || - selectedUser?.username || - "" - })} + {t("userQuestionOrgRemove")}

-

{t("userMessageOrgRemove")}

- -

{t("userMessageOrgConfirm")}

} buttonText={t("userRemoveOrgConfirm")} diff --git a/src/components/private/OrgIdpTable.tsx b/src/components/private/OrgIdpTable.tsx index 014e78f63..059d175f5 100644 --- a/src/components/private/OrgIdpTable.tsx +++ b/src/components/private/OrgIdpTable.tsx @@ -177,7 +177,7 @@ export default function IdpTable({ idps, orgId }: Props) { setSelectedIdp(null); }} dialog={ -
+

{t("idpQuestionRemove")}