Merge branch 'main' into feat/421_accessibility

lib/mv_web/live/custom_field_live/index_component.ex

@@ -59,6 +59,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
               JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
             end
           }
+          row_tooltip={gettext("Click to edit datafield")}
         >
           <:col :let={{_id, custom_field}} label={gettext("Name")}>{custom_field.name}</:col>
 
@@ -95,22 +96,6 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
               {gettext("No")}
             </.badge>
           </:col>
-
-          <:action :let={{_id, custom_field}}>
-            <.link phx-click={
-              JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
-            }>
-              {gettext("Edit")}
-            </.link>
-          </:action>
-
-          <:action :let={{_id, custom_field}}>
-            <.link phx-click={
-              JS.push("prepare_delete", value: %{id: custom_field.id}, target: @myself)
-            }>
-              {gettext("Delete")}
-            </.link>
-          </:action>
         </.table>
       </div>
 
@@ -164,17 +149,17 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
           </div>
 
           <div class="modal-action">
-            <button phx-click="cancel_delete" phx-target={@myself} class="btn">
+            <.button variant="neutral" phx-click="cancel_delete" phx-target={@myself}>
               {gettext("Cancel")}
-            </button>
-            <button
+            </.button>
+            <.button
+              variant="danger"
               phx-click="confirm_delete"
               phx-target={@myself}
-              class="btn btn-error"
               disabled={@slug_confirmation != @custom_field_to_delete.slug}
             >
-              {gettext("Delete Custom Field and All Values")}
-            </button>
+              {gettext("Delete Datafields and All Values")}
+            </.button>
           </div>
         </div>
       </dialog>
@@ -222,16 +207,38 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
     # Get actor from assigns or fall back to socket assigns
     actor = Map.get(assigns, :actor, socket.assigns[:actor])
 
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign_new(:show_form, fn -> false end)
-     |> assign_new(:form_id, fn -> "custom-field-form-new" end)
-     |> assign_new(:editing_custom_field, fn -> nil end)
-     |> assign_new(:show_delete_modal, fn -> false end)
-     |> assign_new(:custom_field_to_delete, fn -> nil end)
-     |> assign_new(:slug_confirmation, fn -> "" end)
-     |> stream(:custom_fields, stream_custom_fields(actor, self()), reset: true)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign_new(:show_form, fn -> false end)
+      |> assign_new(:form_id, fn -> "custom-field-form-new" end)
+      |> assign_new(:editing_custom_field, fn -> nil end)
+      |> assign_new(:show_delete_modal, fn -> false end)
+      |> assign_new(:custom_field_to_delete, fn -> nil end)
+      |> assign_new(:slug_confirmation, fn -> "" end)
+      |> stream(:custom_fields, stream_custom_fields(actor, self()), reset: true)
+
+    # Open delete modal when requested from form (e.g. Danger zone in FormComponent)
+    socket =
+      case Map.get(assigns, :open_delete_for_id) do
+        nil ->
+          socket
+
+        id ->
+          custom_field =
+            Ash.get!(Mv.Membership.CustomField, id,
+              load: [:assigned_members_count],
+              actor: actor
+            )
+
+          socket
+          |> assign(:show_delete_modal, true)
+          |> assign(:custom_field_to_delete, custom_field)
+          |> assign(:slug_confirmation, "")
+          |> assign(:open_delete_for_id, nil)
+      end
+
+    {:ok, socket}
   end
 
   @impl true