From e03340bd96e8101b17c8dd45dbb3fe5444d0ed9a Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Fri, 10 May 2024 07:35:35 -0700
Subject: [PATCH] fix(portal): don't confirm group selections if there aren't
 changes (#4946)

- Fixes #4937 (not worth adding complexity to the live table for this,
so just added as a note in the bottom)
- Don't show confirmation dialog if no changes have been made

<img width="912" alt="Screenshot 2024-05-09 at 11 03 00 PM"
src="https://github.com/firezone/firezone/assets/167144/47f1a76c-5f2a-4815-b0ff-7f1e68c785bf">
---
 elixir/apps/web/lib/web/live/actors/groups.ex      | 12 ++++++++++--
 elixir/apps/web/lib/web/live/groups/edit_actors.ex |  7 ++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/elixir/apps/web/lib/web/live/actors/groups.ex b/elixir/apps/web/lib/web/live/actors/groups.ex
index 6e25929af..a1306275d 100644
--- a/elixir/apps/web/lib/web/live/actors/groups.ex
+++ b/elixir/apps/web/lib/web/live/actors/groups.ex
@@ -128,7 +128,10 @@ defmodule Web.Actors.EditGroups do
               </div>
             </:col>
           </.live_table>
-          <div class="flex justify-end">
+          <div class="flex justify-between items-center">
+            <p class="px-4 text-sm text-gray-500">
+              Note: Users will always belong to the <strong>Everyone</strong> group.
+            </p>
             <.button class="m-4" data-confirm={confirm_message(@added, @removed)} phx-click="submit">
               Save
             </.button>
@@ -222,7 +225,12 @@ defmodule Web.Actors.EditGroups do
     remove = if removed_names != [], do: "remove #{Enum.join(removed_names, ", ")}"
     change = [add, remove] |> Enum.reject(&is_nil/1) |> Enum.join(" and ")
 
-    "Are you sure you want to #{change}?"
+    if change == "" do
+      # Don't show confirmation message if no changes were made
+      nil
+    else
+      "Are you sure you want to #{change}?"
+    end
   end
 
   defp remove_non_editable_memberships(memberships, editable_groups) do
diff --git a/elixir/apps/web/lib/web/live/groups/edit_actors.ex b/elixir/apps/web/lib/web/live/groups/edit_actors.ex
index 3bbeec7e0..309568bc4 100644
--- a/elixir/apps/web/lib/web/live/groups/edit_actors.ex
+++ b/elixir/apps/web/lib/web/live/groups/edit_actors.ex
@@ -232,6 +232,11 @@ defmodule Web.Groups.EditActors do
     remove = if removed_names != [], do: "remove #{Enum.join(removed_names, ", ")}"
     change = [add, remove] |> Enum.reject(&is_nil/1) |> Enum.join(" and ")
 
-    "Are you sure you want to #{change}?"
+    if change == "" do
+      # Don't show confirmation message if no changes were made
+      nil
+    else
+      "Are you sure you want to #{change}?"
+    end
   end
 end