From 7245652671b2fd694d7fe9b5aec6fa371b48391e Mon Sep 17 00:00:00 2001 From: Andrew Dryga Date: Mon, 14 Oct 2024 14:05:33 -0600 Subject: [PATCH] fix(portal): Make sure modals start with Confirm.. (#7032) Closes #6713 --- elixir/apps/web/lib/web/live/actors/groups.ex | 10 ++++++++-- elixir/apps/web/lib/web/live/actors/show.ex | 15 +++++++++------ elixir/apps/web/lib/web/live/clients/show.ex | 6 ++++-- elixir/apps/web/lib/web/live/gateways/show.ex | 2 +- elixir/apps/web/lib/web/live/groups/show.ex | 2 +- elixir/apps/web/lib/web/live/policies/show.ex | 7 ++++--- elixir/apps/web/lib/web/live/relay_groups/show.ex | 4 ++-- elixir/apps/web/lib/web/live/relays/show.ex | 2 +- elixir/apps/web/lib/web/live/resources/show.ex | 2 +- .../web/lib/web/live/settings/api_clients/show.ex | 11 ++++++----- .../identity_providers/google_workspace/show.ex | 9 +++++---- .../settings/identity_providers/jumpcloud/show.ex | 9 +++++---- .../identity_providers/microsoft_entra/show.ex | 9 +++++---- .../live/settings/identity_providers/okta/show.ex | 9 +++++---- .../identity_providers/openid_connect/show.ex | 9 +++++---- .../settings/identity_providers/system/show.ex | 5 +++-- elixir/apps/web/lib/web/live/sites/show.ex | 4 ++-- 17 files changed, 67 insertions(+), 48 deletions(-) diff --git a/elixir/apps/web/lib/web/live/actors/groups.ex b/elixir/apps/web/lib/web/live/actors/groups.ex index 1d164c96f..33ea59d90 100644 --- a/elixir/apps/web/lib/web/live/actors/groups.ex +++ b/elixir/apps/web/lib/web/live/actors/groups.ex @@ -140,8 +140,14 @@ defmodule Web.Actors.EditGroups do

- <.button_with_confirmation id="save_changes" style="primary" class="m-4" on_confirm="submit"> - <:dialog_title>Apply changes to Actor Groups + <.button_with_confirmation + id="save_changes" + style="primary" + confirm_style="primary" + class="m-4" + on_confirm="submit" + > + <:dialog_title>Confirm changes to Actor Groups <:dialog_content> <%= confirm_message(@added, @removed) %> diff --git a/elixir/apps/web/lib/web/live/actors/show.ex b/elixir/apps/web/lib/web/live/actors/show.ex index ca2a0fb5f..ecb11b0d1 100644 --- a/elixir/apps/web/lib/web/live/actors/show.ex +++ b/elixir/apps/web/lib/web/live/actors/show.ex @@ -157,10 +157,11 @@ defmodule Web.Actors.Show do <.button_with_confirmation id="disable_actor" style="warning" + confirm_style="primary" icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Apply changes to Actor Groups + <:dialog_title>Confirm disabling the Actor <:dialog_content> Are you sure you want to disable this <%= String.downcase(actor_type(@actor.type)) %> and revoke all its tokens? @@ -177,10 +178,11 @@ defmodule Web.Actors.Show do <.button_with_confirmation id="enable_actor" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Apply changes to Actor Groups + <:dialog_title>Confirm enabling the Actor <:dialog_content> Are you sure you want to enable this <%= String.downcase(actor_type(@actor.type)) %>? @@ -281,7 +283,7 @@ defmodule Web.Actors.Show do on_confirm_id={identity.id} size="xs" > - <:dialog_title>Delete Identity + <:dialog_title>Confirm Identity deletion <:dialog_content> Are you sure you want to delete this identity? This will immediately @@ -344,10 +346,11 @@ defmodule Web.Actors.Show do <.button_with_confirmation id="revoke_all_tokens" style="danger" + confirm_style="primary" icon="hero-trash-solid" on_confirm="revoke_all_tokens" > - <:dialog_title>Revoke All Tokens + <:dialog_title>Confirm revocation of all actor tokens <:dialog_content> Are you sure you want to revoke all tokens? This will immediately sign the actor out of all clients. @@ -429,7 +432,7 @@ defmodule Web.Actors.Show do on_confirm_id={token.id} size="xs" > - <:dialog_title>Revoke the Token + <:dialog_title>Confirm token revocation <:dialog_content> Are you sure you want to revoke the token? This will immediately @@ -568,7 +571,7 @@ defmodule Web.Actors.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete <%= actor_type(@actor.type) %> + <:dialog_title>Confirm <%= actor_type(@actor.type) %> deletion <:dialog_content> Are you sure you want to delete this <%= String.downcase(actor_type(@actor.type)) %> along with all associated identities? diff --git a/elixir/apps/web/lib/web/live/clients/show.ex b/elixir/apps/web/lib/web/live/clients/show.ex index d74e7bc62..13ca3fe04 100644 --- a/elixir/apps/web/lib/web/live/clients/show.ex +++ b/elixir/apps/web/lib/web/live/clients/show.ex @@ -182,9 +182,10 @@ defmodule Web.Clients.Show do icon="hero-shield-exclamation" on_confirm="remove_client_verification" > - <:dialog_title>Remove verification + <:dialog_title>Confirm removal of Client verification <:dialog_content> Are you sure you want to remove verification of this Client? + It will no longer be able to access Resources using Policies that require verification. <:dialog_confirm_button> Remove @@ -199,10 +200,11 @@ defmodule Web.Clients.Show do <.button_with_confirmation id="verify_client" style="warning" + confirm_style="primary" icon="hero-shield-check" on_confirm="verify_client" > - <:dialog_title>Verify Client + <:dialog_title>Confirm verification of Client <:dialog_content> Are you sure you want to verify this Client? diff --git a/elixir/apps/web/lib/web/live/gateways/show.ex b/elixir/apps/web/lib/web/live/gateways/show.ex index d83cca4fe..65e0b43d0 100644 --- a/elixir/apps/web/lib/web/live/gateways/show.ex +++ b/elixir/apps/web/lib/web/live/gateways/show.ex @@ -114,7 +114,7 @@ defmodule Web.Gateways.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Gateway + <:dialog_title>Confirm deletion of Gateway <:dialog_content>

Are you sure you want to delete this Gateway? diff --git a/elixir/apps/web/lib/web/live/groups/show.ex b/elixir/apps/web/lib/web/live/groups/show.ex index 14ad4a3d6..40816e9c1 100644 --- a/elixir/apps/web/lib/web/live/groups/show.ex +++ b/elixir/apps/web/lib/web/live/groups/show.ex @@ -251,7 +251,7 @@ defmodule Web.Groups.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Group + <:dialog_title>Confirm deletion of Group <:dialog_content> Are you sure you want to delete this Group and all related Policies? diff --git a/elixir/apps/web/lib/web/live/policies/show.ex b/elixir/apps/web/lib/web/live/policies/show.ex index 097494970..b3528cd89 100644 --- a/elixir/apps/web/lib/web/live/policies/show.ex +++ b/elixir/apps/web/lib/web/live/policies/show.ex @@ -99,7 +99,7 @@ defmodule Web.Policies.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Policy + <:dialog_title>Confirm disabling the Policy <:dialog_content> Are you sure you want to disable this policy? This will immediately @@ -117,10 +117,11 @@ defmodule Web.Policies.Show do :if={not is_nil(@policy.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Policy + <:dialog_title>Confirm enabling the Policy <:dialog_content> Are you sure you want to enable this policy? This will immediately @@ -294,7 +295,7 @@ defmodule Web.Policies.Show do on_confirm="delete" on_confirm_id={@policy.id} > - <:dialog_title>Delete Policy + <:dialog_title>Confirm deletion of Policy <:dialog_content> Are you sure you want to delete this Policy? All sessions authorized by it will be expired. diff --git a/elixir/apps/web/lib/web/live/relay_groups/show.ex b/elixir/apps/web/lib/web/live/relay_groups/show.ex index 667ff213b..cb401b90b 100644 --- a/elixir/apps/web/lib/web/live/relay_groups/show.ex +++ b/elixir/apps/web/lib/web/live/relay_groups/show.ex @@ -106,7 +106,7 @@ defmodule Web.RelayGroups.Show do icon="hero-trash-solid" on_confirm="revoke_all_tokens" > - <:dialog_title>Revoke all tokens + <:dialog_title>Confirm revocation of all tokens <:dialog_content> Are you sure you want to revoke all tokens for this Relay Group? This will immediately disconnect all associated Relays. @@ -162,7 +162,7 @@ defmodule Web.RelayGroups.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Instance Group + <:dialog_title>Confirm deletion of the Instance Group <:dialog_content> Are you sure you want to delete this Instance Group? All relay instances will be disconnected. diff --git a/elixir/apps/web/lib/web/live/relays/show.ex b/elixir/apps/web/lib/web/live/relays/show.ex index 4825e5909..a8c8d9e9a 100644 --- a/elixir/apps/web/lib/web/live/relays/show.ex +++ b/elixir/apps/web/lib/web/live/relays/show.ex @@ -120,7 +120,7 @@ defmodule Web.Relays.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Relay + <:dialog_title>Confirm deletion of Relay <:dialog_content>

Are you sure you want to delete this relay? diff --git a/elixir/apps/web/lib/web/live/resources/show.ex b/elixir/apps/web/lib/web/live/resources/show.ex index 5af9ebdb4..b62153ba5 100644 --- a/elixir/apps/web/lib/web/live/resources/show.ex +++ b/elixir/apps/web/lib/web/live/resources/show.ex @@ -388,7 +388,7 @@ defmodule Web.Resources.Show do on_confirm="delete" on_confirm_id={@resource.id} > - <:dialog_title>Delete Resource + <:dialog_title>Confirm deletion of Resource <:dialog_content> Are you sure want to delete this Resource along with all associated Policies? This will immediately end all active sessions opened for this Resource. diff --git a/elixir/apps/web/lib/web/live/settings/api_clients/show.ex b/elixir/apps/web/lib/web/live/settings/api_clients/show.ex index 8d16945cf..56cfec527 100644 --- a/elixir/apps/web/lib/web/live/settings/api_clients/show.ex +++ b/elixir/apps/web/lib/web/live/settings/api_clients/show.ex @@ -69,7 +69,7 @@ defmodule Web.Settings.ApiClients.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the API Client + <:dialog_title>Confirm disabling the API Client <:dialog_content> Are you sure want to disable this API Client and revoke all its tokens? @@ -86,10 +86,11 @@ defmodule Web.Settings.ApiClients.Show do <.button_with_confirmation id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the API Client + <:dialog_title>Confirm enabling the API Client <:dialog_content> Are you sure want to enable this API Client? @@ -138,7 +139,7 @@ defmodule Web.Settings.ApiClients.Show do icon="hero-trash" on_confirm="revoke_all_tokens" > - <:dialog_title>Revoke all API Client Tokens + <:dialog_title>Confirm revocation of all API Client tokens <:dialog_content> Are you sure you want to revoke all Tokens for this API client? @@ -191,7 +192,7 @@ defmodule Web.Settings.ApiClients.Show do on_confirm_id={token.id} size="xs" > - <:dialog_title>Revoke the Token + <:dialog_title>Confirm revocation of API Token <:dialog_content> Are you sure you want to revoke this token? @@ -223,7 +224,7 @@ defmodule Web.Settings.ApiClients.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete API Client + <:dialog_title>Confirm deletion of API Client <:dialog_content> Are you sure want to delete this API Client along with all associated tokens? diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex index 98b058279..608cecca6 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex @@ -60,7 +60,7 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Provider + <:dialog_title>Confirm disabling the Provider <:dialog_content> Are you sure you want to disable this Provider? This will immediately @@ -79,10 +79,11 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do :if={not is_nil(@provider.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Provider + <:dialog_title>Confirm enabling the Provider <:dialog_content> Are you sure you want to enable this provider? @@ -135,7 +136,7 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do on_confirm="delete_stale_actors" class="mt-4" > - <:dialog_title>Delete Stale Actors + <:dialog_title>Confirm deletion of stale Actors <:dialog_content> Are you sure you want to delete all Actors that were synced synced from this provider and do not have any other identities? @@ -212,7 +213,7 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Identity Provider + <:dialog_title>Confirm deletion of Identity Provider <:dialog_content> Are you sure you want to delete this provider? This will remove all Actors and Groups associated with this provider. diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex index 2dd750899..5aaa2aca6 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex @@ -62,7 +62,7 @@ defmodule Web.Settings.IdentityProviders.JumpCloud.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Provider + <:dialog_title>Confirm disabling the Provider <:dialog_content> Are you sure you want to disable this Provider? This will immediately @@ -81,10 +81,11 @@ defmodule Web.Settings.IdentityProviders.JumpCloud.Show do :if={not is_nil(@provider.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Provider + <:dialog_title>Confirm enabling the Provider <:dialog_content> Are you sure you want to enable this provider? @@ -135,7 +136,7 @@ defmodule Web.Settings.IdentityProviders.JumpCloud.Show do on_confirm="delete_stale_actors" class="mt-4" > - <:dialog_title>Delete Stale Actors + <:dialog_title>Confirm deletion of stale Actors <:dialog_content> Are you sure you want to delete all Actors that were synced synced from this provider and do not have any other identities? @@ -223,7 +224,7 @@ defmodule Web.Settings.IdentityProviders.JumpCloud.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Identity Provider + <:dialog_title>Confirm deletion of Identity Provider <:dialog_content> Are you sure you want to delete this provider? This will remove all Actors and Groups associated with this provider. diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex index e1c88ee31..147e371d4 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex @@ -60,7 +60,7 @@ defmodule Web.Settings.IdentityProviders.MicrosoftEntra.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Provider + <:dialog_title>Confirm disabling the Provider <:dialog_content> Are you sure you want to disable this Provider? This will immediately @@ -79,10 +79,11 @@ defmodule Web.Settings.IdentityProviders.MicrosoftEntra.Show do :if={not is_nil(@provider.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Provider + <:dialog_title>Confirm enabling the Provider <:dialog_content> Are you sure you want to enable this provider? @@ -135,7 +136,7 @@ defmodule Web.Settings.IdentityProviders.MicrosoftEntra.Show do on_confirm="delete_stale_actors" class="mt-4" > - <:dialog_title>Delete Stale Actors + <:dialog_title>Confirm deletion of stale Actors <:dialog_content> Are you sure you want to delete all Actors that were synced synced from this provider and do not have any other identities? @@ -212,7 +213,7 @@ defmodule Web.Settings.IdentityProviders.MicrosoftEntra.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Identity Provider + <:dialog_title>Confirm deletion of Identity Provider <:dialog_content> Are you sure you want to delete this provider? This will remove all Actors and Groups associated with this provider. diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex index d518e4a04..eb47a97ff 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex @@ -60,7 +60,7 @@ defmodule Web.Settings.IdentityProviders.Okta.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Provider + <:dialog_title>Confirm disabling the Provider <:dialog_content> Are you sure you want to disable this Provider? This will immediately @@ -79,10 +79,11 @@ defmodule Web.Settings.IdentityProviders.Okta.Show do :if={not is_nil(@provider.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Provider + <:dialog_title>Confirm enabling the Provider <:dialog_content> Are you sure you want to enable this provider? @@ -133,7 +134,7 @@ defmodule Web.Settings.IdentityProviders.Okta.Show do on_confirm="delete_stale_actors" class="mt-4" > - <:dialog_title>Delete Stale Actors + <:dialog_title>Confirm deletion of stale Actors <:dialog_content> Are you sure you want to delete all Actors that were synced synced from this provider and do not have any other identities? @@ -230,7 +231,7 @@ defmodule Web.Settings.IdentityProviders.Okta.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Identity Provider + <:dialog_title>Confirm deletion of Identity Provider <:dialog_content> Are you sure you want to delete this provider? This will remove all Actors and Groups associated with this provider. diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex index 169f9e28e..faef3d197 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex @@ -55,7 +55,7 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Provider + <:dialog_title>Confirm disabling the Provider <:dialog_content> Are you sure you want to disable this Provider? This will immediately @@ -73,10 +73,11 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Show do :if={not is_nil(@provider.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Provider + <:dialog_title>Confirm enabling the Provider <:dialog_content> Are you sure you want to enable this provider? @@ -115,7 +116,7 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Show do on_confirm="delete_stale_actors" class="mt-4" > - <:dialog_title>Delete Stale Actors + <:dialog_title>Confirm deletion of stale Actors <:dialog_content> Are you sure you want to delete all Actors that were synced synced from this provider and do not have any other identities? @@ -188,7 +189,7 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Identity Provider + <:dialog_title>Confirm deletion of Identity Provider <:dialog_content> Are you sure you want to delete this provider? This will remove all Identities, Groups and Policies associated with this provider. diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex index 9694a2771..dc3cc2fba 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex @@ -45,7 +45,7 @@ defmodule Web.Settings.IdentityProviders.System.Show do icon="hero-lock-closed" on_confirm="disable" > - <:dialog_title>Disable the Provider + <:dialog_title>Confirm disabling the Provider <:dialog_content> Are you sure you want to disable this Provider? This will immediately @@ -63,10 +63,11 @@ defmodule Web.Settings.IdentityProviders.System.Show do :if={not is_nil(@provider.disabled_at)} id="enable" style="warning" + confirm_style="primary" icon="hero-lock-open" on_confirm="enable" > - <:dialog_title>Enable the Provider + <:dialog_title>Confirm enabling the Provider <:dialog_content> Are you sure you want to enable this provider? diff --git a/elixir/apps/web/lib/web/live/sites/show.ex b/elixir/apps/web/lib/web/live/sites/show.ex index 9dd809b35..b6e0e3b27 100644 --- a/elixir/apps/web/lib/web/live/sites/show.ex +++ b/elixir/apps/web/lib/web/live/sites/show.ex @@ -144,7 +144,7 @@ defmodule Web.Sites.Show do icon="hero-trash-solid" on_confirm="revoke_all_tokens" > - <:dialog_title>Revoke all tokens + <:dialog_title>Confirm revocation of all tokens <:dialog_content> Are you sure you want to revoke all tokens for this Site? This will immediately disconnect all associated Gateways. @@ -294,7 +294,7 @@ defmodule Web.Sites.Show do icon="hero-trash-solid" on_confirm="delete" > - <:dialog_title>Delete Site + <:dialog_title>Confirm deletion of Site <:dialog_content> Are you sure you want to delete this Site? This will immediately disconnect all associated Gateways.