easier to delete

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 user from the server?",
-    "userQuestionRemove": "Are you sure you want to permanently delete {selectedUser} 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."
 }

src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx

@@ -272,15 +272,10 @@ export default function ExitNodesTable({
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("remoteExitNodeQuestionRemove", {
+                                {t("remoteExitNodeQuestionRemove")}
-                                    selectedNode:
-                                        selectedNode?.name || selectedNode?.id
-                                })}
                             </p>
 
                             <p>{t("remoteExitNodeMessageRemove")}</p>
-
-                            <p>{t("remoteExitNodeMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("remoteExitNodeConfirmDelete")}

src/app/[orgId]/settings/general/page.tsx

@@ -169,12 +169,9 @@ export default function GeneralPage() {
                 dialog={
                     <div>
                         <p className="mb-2">
-                            {t("orgQuestionRemove", {
+                            {t("orgQuestionRemove")}
-                                selectedOrg: org?.org.name
-                            })}
                         </p>
                         <p className="mb-2">{t("orgMessageRemove")}</p>
-                        <p>{t("orgMessageConfirm")}</p>
                     </div>
                 }
                 buttonText={t("orgDeleteConfirm")}

src/app/admin/license/page.tsx

@@ -317,16 +317,11 @@ export default function LicensePage() {
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("licenseQuestionRemove", {
+                                {t("licenseQuestionRemove")}
-                                    selectedKey: obfuscateLicenseKey(
-                                        selectedLicenseKey.licenseKey
-                                    )
-                                })}
                             </p>
                             <p>
                                 <b>{t("licenseMessageRemove")}</b>
                             </p>
-                            <p>{t("licenseMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("licenseKeyDeleteConfirm")}

src/app/admin/users/AdminUsersTable.tsx

@@ -239,19 +239,12 @@ export default function UsersTable({ users }: Props) {
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("userQuestionRemove", {
+                                {t("userQuestionRemove")}
-                                    selectedUser:
-                                        selected?.email ||
-                                        selected?.name ||
-                                        selected?.username
-                                })}
                             </p>
 
                             <p>
                                 <b>{t("userMessageRemove")}</b>
                             </p>
-
-                            <p>{t("userMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("userDeleteConfirm")}

src/components/ApiKeysTable.tsx

@@ -179,17 +179,12 @@ export default function ApiKeysTable({ apiKeys }: ApiKeyTableProps) {
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("apiKeysQuestionRemove", {
+                                {t("apiKeysQuestionRemove")}
-                                    selectedApiKey:
-                                        selected?.name || selected?.id
-                                })}
                             </p>
 
                             <p>
                                 <b>{t("apiKeysMessageRemove")}</b>
                             </p>
-
-                            <p>{t("apiKeysMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("apiKeysDeleteConfirm")}

src/components/ClientsTable.tsx

@@ -279,24 +279,13 @@ export default function ClientsTable({ clients, orgId }: ClientTableProps) {
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                Are you sure you want to remove the client{" "}
+                                {t("deleteClientQuestion")}
-                                <b>
-                                    {selectedClient?.name || selectedClient?.id}
-                                </b>{" "}
-                                from the site and organization?
                             </p>
-
                             <p>
                                 <b>
-                                    Once removed, the client will no longer be
+                                    {t("clientMessageRemove")}
-                                    able to connect to the site.{" "}
                                 </b>
                             </p>
-
-                            <p>
-                                To confirm, please type the name of the client
-                                below.
-                            </p>
                         </div>
                     }
                     buttonText="Confirm Delete Client"

src/components/DomainsTable.tsx

@@ -239,14 +239,11 @@ export default function DomainsTable({ domains }: Props) {
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("domainQuestionRemove", {
+                                {t("domainQuestionRemove")}
-                                    domain: selectedDomain.baseDomain
-                                })}
                             </p>
                             <p>
                                 <b>{t("domainMessageRemove")}</b>
                             </p>
-                            <p>{t("domainMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("domainConfirmDelete")}

src/components/InvitationsTable.tsx

@@ -177,12 +177,9 @@ export default function InvitationsTable({
                 dialog={
                     <div className="space-y-4">
                         <p>
-                            {t("inviteQuestionRemove", {
+                            {t("inviteQuestionRemove")}
-                                email: selectedInvitation?.email || ""
-                            })}
                         </p>
                         <p>{t("inviteMessageRemove")}</p>
-                        <p>{t("inviteMessageConfirm")}</p>
                     </div>
                 }
                 buttonText={t("inviteRemoveConfirm")}

src/components/OrgApiKeysTable.tsx

@@ -187,17 +187,12 @@ export default function OrgApiKeysTable({
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("apiKeysQuestionRemove", {
+                                {t("apiKeysQuestionRemove")}
-                                    selectedApiKey:
-                                        selected?.name || selected?.id
-                                })}
                             </p>
 
                             <p>
                                 <b>{t("apiKeysMessageRemove")}</b>
                             </p>
-
-                            <p>{t("apiKeysMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("apiKeysDeleteConfirm")}

src/components/private/OrgIdpTable.tsx

@@ -179,14 +179,11 @@ export default function IdpTable({ idps, orgId }: Props) {
                     dialog={
                         <div className="space-y-4">
                             <p>
-                                {t("idpQuestionRemove", {
+                                {t("idpQuestionRemove")}
-                                    name: selectedIdp.name
-                                })}
                             </p>
                             <p>
                                 <b>{t("idpMessageRemove")}</b>
                             </p>
-                            <p>{t("idpMessageConfirm")}</p>
                         </div>
                     }
                     buttonText={t("idpConfirmDelete")}