changes to accommodate a delete user modal

lib/bones73k/accounts/user.ex

@@ -17,7 +17,7 @@ defmodule Bones73k.Accounts.User do
 
   @derive {Inspect, except: [:password]}
   @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
+  # @foreign_key_type :binary_id
   schema "users" do
     field :email, :string
     field :password, :string, virtual: true

lib/bones73k/properties/property.ex

@@ -8,7 +8,7 @@ defmodule Bones73k.Properties.Property do
     field :description, :string
     field :name, :string
     field :price, :decimal
-    belongs_to :user, Bones73k.Accounts.User
+    field :user_id, :binary_id
 
     timestamps()
   end

lib/bones73k_web/live/modal_component.ex

@@ -11,7 +11,7 @@ defmodule Bones73kWeb.ModalComponent do
       phx-target="#<%= @id %>"
       phx-page-loading>
 
-      <div class="modal-dialog">
+      <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
 
           <div class="modal-header">
@@ -19,9 +19,7 @@ defmodule Bones73kWeb.ModalComponent do
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
 
-          <div class="modal-body">
           <%= live_component @socket, @component, @opts %>
-          </div>
 
         </div>
       </div>

lib/bones73k_web/live/property_live/form_component.ex

@@ -21,10 +21,16 @@ defmodule Bones73kWeb.PropertyLive.FormComponent do
     {:noreply, assign(socket, :changeset, changeset)}
   end
 
+  @impl true
   def handle_event("save", %{"property" => property_params}, socket) do
     save_property(socket, socket.assigns.action, property_params)
   end
 
+  @impl true
+  def handle_event("cancel", _, socket) do
+    {:noreply, push_event(socket, "modal-please-hide", %{})}
+  end
+
   defp save_property(socket, :edit, property_params) do
     case Properties.update_property(socket.assigns.property, property_params) do
       {:ok, _property} ->

lib/bones73k_web/live/property_live/form_component.html.leex

@@ -5,6 +5,7 @@
     phx_submit: "save"
   ], fn f ->  %>
 
+  <div class="modal-body">
 
     <div class="mb-3" phx-feedback-for="<%= input_id(f, :name)%>">
       <%= label f, :name, class: "form-label" %>
@@ -40,6 +41,17 @@
       </div>
     </div>
 
-  <%= submit "Save", phx_disable_with: "Saving...", class: "btn btn-primary" %>
+  </div>
+  <div class="modal-footer">
+
+    <%= link "Cancel", to: "#", class: "btn btn-secondary me-2", phx_click: "cancel", phx_target: @myself %>
+    <%= submit "Save",
+        class: "btn btn-primary ",
+        disabled: !@changeset.valid?,
+        aria_disabled: !@changeset.valid? && "true" || false,
+        phx_disable_with: "Saving..."
+      %>
+
+  </div>
 
 <% end %>

lib/bones73k_web/live/user_management/delete_component.ex

@@ -0,0 +1,44 @@
+defmodule Bones73kWeb.UserManagement.DeleteComponent do
+  use Bones73kWeb, :live_component
+
+  alias Bones73k.Accounts
+
+  @impl true
+  def update(assigns, socket) do
+    socket
+    |> assign(assigns)
+    |> live_okreply()
+  end
+
+  @impl true
+  def handle_event("cancel", _, socket) do
+    {:noreply, push_event(socket, "modal-please-hide", %{})}
+  end
+
+  @impl true
+  def handle_event("confirm", %{"id" => id, "email" => email}, socket) do
+    id
+    |> Accounts.get_user()
+    |> Accounts.delete_user()
+    |> case do
+      {:ok, _} ->
+        flash = {:info, "User deleted successfully: \"#{email}\""}
+        send(self(), {:put_flash_message, flash})
+
+        socket
+        |> push_event("modal-please-hide", %{})
+        |> live_noreply()
+
+      {:error, _} ->
+        flash =
+          {:error,
+           "Some error trying to delete user \"#{email}\". Possibly already deleted? Reloading list..."}
+
+        send(self(), {:put_flash_message, flash})
+
+        socket
+        |> push_event("modal-please-hide", %{})
+        |> live_noreply()
+    end
+  end
+end

lib/bones73k_web/live/user_management/delete_component.html.leex

@@ -0,0 +1,16 @@
+<div class="modal-body">
+
+  Are you sure you want to delete "<%= @delete_user.email %>"?
+
+</div>
+<div class="modal-footer">
+
+  <%= link "Cancel", to: "#", class: "btn btn-secondary me-2", phx_click: "cancel", phx_target: @myself %>
+  <%= link "Confirm Delete", to: "#",
+      class: "btn btn-danger",
+      phx_click: "confirm",
+      phx_target: @myself,
+      phx_value_id: @delete_user.id,
+      phx_value_email: @delete_user.email %>
+
+</div>

lib/bones73k_web/live/user_management/form_component.ex

@@ -10,7 +10,6 @@ defmodule Bones73kWeb.UserManagement.FormComponent do
     socket
     |> assign(assigns)
     |> init_changeset(assigns)
-    |> assign(:role_id, 1)
     |> live_okreply()
   end
 
@@ -40,7 +39,7 @@ defmodule Bones73kWeb.UserManagement.FormComponent do
             &Routes.user_confirmation_url(socket, :confirm, &1)
           )
 
-        flash = {:success, "User created successfully: #{user.email}"}
+        flash = {:info, "User created successfully: #{user.email}"}
         send(self(), {:put_flash_message, flash})
 
         socket
@@ -81,6 +80,11 @@ defmodule Bones73kWeb.UserManagement.FormComponent do
     save_user(socket, user_params)
   end
 
+  @impl true
+  def handle_event("cancel", _, socket) do
+    {:noreply, push_event(socket, "modal-please-hide", %{})}
+  end
+
   def role_description(role) when is_atom(role) do
     Keyword.get(User.roles(), role)
   end

lib/bones73k_web/live/user_management/form_component.html.leex

@@ -4,6 +4,8 @@
     phx_submit: "save"
   ], fn f -> %>
 
+  <div class="modal-body">
+
     <div class="mb-3" phx-feedback-for="<%= input_id(f, :email)%>">
       <%= label f, :email, class: "form-label" %>
       <div class="input-group has-validation">
@@ -23,7 +25,6 @@
       </div>
     </div>
 
-
     <%= if Roles.can?(@current_user, %User{}, :edit_role) do %>
       <%= label f, :role, class: "form-label" %>
       <div class="input-group mb-3">
@@ -39,8 +40,7 @@
       <%= hidden_input f, :role, value: input_value(f, :role) %>
     <% end %>
 
-
+    <div phx-feedback-for="<%= input_id(f, :password) %>">
-  <div class="mb-3" phx-feedback-for="<%= input_id(f, :password) %>">
       <%= label f, :password, class: "form-label" %>
       <div class="input-group has-validation">
         <span class="input-group-text">
@@ -56,7 +56,10 @@
       </div>
     </div>
 
+  </div>
+  <div class="modal-footer">
 
+    <%= link "Cancel", to: "#", class: "btn btn-secondary", phx_click: "cancel", phx_target: @myself %>
     <%= submit "Save",
         class: "btn btn-primary ",
         disabled: !@changeset.valid?,
@@ -64,4 +67,6 @@
         phx_disable_with: "Saving..."
       %>
 
+  </div>
+
 <% end %>

lib/bones73k_web/live/user_management/index.ex

@@ -14,6 +14,7 @@ defmodule Bones73kWeb.UserManagementLive.Index do
   def mount(_params, session, socket) do
     socket
     |> assign_defaults(session)
+    |> assign(:page, nil)
     |> live_okreply()
   end
 
@@ -27,7 +28,9 @@ defmodule Bones73kWeb.UserManagementLive.Index do
       socket
       |> assign(:query, query_map(params))
       |> assign_modal_return_to()
-      |> page_query()
+      |> assign(:delete_user, nil)
+      |> assign(:page, nil)
+      |> request_page_query()
       |> apply_action(socket.assigns.live_action, params)
       |> live_noreply()
     else
@@ -38,6 +41,11 @@ defmodule Bones73kWeb.UserManagementLive.Index do
     end
   end
 
+  defp request_page_query(%{assigns: %{query: query}} = socket) do
+    send(self(), {:do_page_query, query})
+    socket
+  end
+
   defp apply_action(socket, :index, _params) do
     socket
     |> assign(:page_title, "Listing Users")
@@ -78,56 +86,30 @@ defmodule Bones73kWeb.UserManagementLive.Index do
     }
   end
 
-  defp page_query(%{assigns: %{query: query}} = socket) do
+  defp page_query(query) do
-    result_page =
     from(u in User)
     |> or_where([u], ilike(u.email, ^"%#{query.filter}%"))
-      # |> or_where([u], ilike(u.singer_name, ^"%#{query.filter}%"))
     |> order_by([u], [
       {^String.to_existing_atom(query.sort_order), ^String.to_existing_atom(query.sort_by)}
     ])
     |> Repo.paginate(page: query.page_number, page_size: query.page_size)
-
-    socket
-    |> assign(:page, result_page)
-    |> assign(:table_loading, false)
   end
 
   @impl true
-  def handle_event("delete", %{"id" => id, "email" => email}, socket) do
+  def handle_event("delete-modal", %{"id" => id}, socket) do
-    id
+    {:noreply, assign(socket, :delete_user, Accounts.get_user(id))}
-    |> Accounts.get_user()
-    |> Accounts.delete_user()
-    |> case do
-      {:ok, _} ->
-        socket
-        |> put_flash(:success, "User deleted successfully: \"#{email}\"")
-        |> assign(:table_loading, true)
-        |> page_query()
-        |> live_noreply()
-
-      {:error, _} ->
-        socket
-        |> put_flash(
-          :error,
-          "Something went wrong attempting to delete user \"#{email}\". Possibly already deleted? Reloading list..."
-        )
-        |> assign(:table_loading, true)
-        |> page_query()
-        |> live_noreply()
-    end
   end
 
   @impl true
   def handle_event("filter-change", params, socket) do
     send(self(), {:query_update, Map.put(params, "page_number", "1")})
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
   def handle_event("filter-clear", _params, socket) do
     send(self(), {:query_update, %{"filter" => "", "page_number" => "1"}})
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
@@ -143,32 +125,32 @@ defmodule Bones73kWeb.UserManagementLive.Index do
        )) ||
       send(self(), {:query_update, Map.put(params, "sort_order", "asc")})
 
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
   def handle_event("sort-by-change", %{"sort" => params}, socket) do
     send(self(), {:query_update, params})
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
   def handle_event("sort-order-change", _params, socket) do
     new_sort_order = (socket.assigns.query.sort_order == "asc" && "desc") || "asc"
     send(self(), {:query_update, %{"sort_order" => new_sort_order}})
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
   def handle_event("page-change", params, socket) do
     send(self(), {:query_update, params})
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
   def handle_event("page-size-change", params, socket) do
     send(self(), {:query_update, Map.put(params, "page_number", "1")})
-    {:noreply, assign(socket, :table_loading, true)}
+    {:noreply, socket}
   end
 
   @impl true
@@ -180,6 +162,11 @@ defmodule Bones73kWeb.UserManagementLive.Index do
      )}
   end
 
+  @impl true
+  def handle_info({:do_page_query, query}, socket) do
+    {:noreply, assign(socket, :page, page_query(query))}
+  end
+
   @impl true
   def handle_info({:close_modal, _}, %{assigns: %{modal_return_to: to}} = socket) do
     socket |> copy_flash() |> push_patch(to: to) |> live_noreply()

lib/bones73k_web/live/user_management/index.html.leex

@@ -7,6 +7,14 @@
       current_user: @current_user %>
 <% end %>
 
+<%= if @delete_user do %>
+  <%= live_modal @socket, Bones73kWeb.UserManagement.DeleteComponent,
+      id: @delete_user.id,
+      title: "Delete User",
+      delete_user: @delete_user,
+      current_user: @current_user %>
+<% end %>
+
 
 <h2 class="mb-3">
   <%= icon_div @socket, "bi-people", [class: "icon baseline"] %>
@@ -14,16 +22,16 @@
 </h2>
 
 <%# filtering and new item creation %>
-<div class="d-flex flex-column flex-sm-row justify-content-between d-flex align-items-start">
+<div class="d-flex flex-column flex-sm-row justify-content-between d-flex align-items-start mb-3">
 
   <%= live_patch to: Routes.user_management_index_path(@socket, :new, Enum.into(@query, [])),
-      class: "btn btn-primary mb-2" do %>
+      class: "btn btn-primary mb-3 mb-sm-0" do %>
     <%= icon_div @socket, "bi-person-plus", [class: "icon baseline me-1"] %>
     New User
   <% end %>
 
   <%= form_for :filter, "#", [phx_change: "filter-change"], fn flt -> %>
-  <div class="input-group mb-2">
+  <div class="input-group">
 
     <span class="input-group-text">
       <%= icon_div @socket, "bi-filter", [class: "icon"] %>
@@ -47,10 +55,11 @@
 </div>
 
 <%# main data table %>
+<div class="table-responsive">
   <table class="table">
 
     <thead>
-    <tr class="<%= @table_loading && "loading" || "" %>">
+      <tr>
 
         <th scope="col" phx-click="sort-change" phx-value-sort_by="email" class="cursor-pointer">
           Email
@@ -84,6 +93,15 @@
     </thead>
 
     <tbody id="users">
+      <%= if !@page do %>
+        <tr>
+          <td class="text-center" colspan="5">
+            <div class="spinner-border text-primary my-5" role="status">
+              <span class="visually-hidden">Loading...</span>
+            </div>
+          </td>
+        </tr>
+      <% else %>
         <%= for user <- @page.entries do %>
           <tr id="user-<%= user.id %>">
             <td class="align-middle"><%= user.email %></td>
@@ -98,38 +116,40 @@
                 <%= icon_div @socket, "bi-x", [class: "icon baseline fs-4 text-warning"], [role: "img", aria_hidden: false] %>
               <% end %>
             </td>
-        <td class="align-middle text-end">
+            <td class="align-middle text-end text-nowrap">
 
-          <%= live_patch to: Routes.user_management_index_path(@socket, :edit, user.id, Enum.into(@query, [])), class: "btn btn-outline-primary btn-sm" do %>
+              <%= live_patch to: Routes.user_management_index_path(@socket, :edit, user.id, Enum.into(@query, [])), class: "btn btn-outline-primary btn-sm text-nowrap" do %>
                 <%= icon_div @socket, "bi-pencil", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
                 Edit
               <% end %>
 
               <%= if Roles.can?(@current_user, user, :delete) do %>
-            <%= link to: "#",
+
-                phx_click: "delete",
+                <button class="btn btn-outline-danger btn-sm text-nowrap" phx-click="delete-modal" phx-value-id="<%= user.id %>">
-                phx_value_id: user.id,
-                phx_value_email: user.email,
-                data: [confirm: "Are you sure you want to delete this user? \"#{user.email}\""],
-                class: "btn btn-outline-danger btn-sm" do %>
                   <%= icon_div @socket, "bi-trash", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
                   Delete
-            <% end %>
+                </button>
+
               <% end %>
 
             </td>
 
           </tr>
         <% end %>
+      <% end %>
     </tbody>
 
   </table>
+</div>
 
 <%# pagination interface %>
-<div class="d-flex justify-content-between d-flex align-items-start">
+<%= if @page do %>
+<div class="d-flex flex-column flex-sm-row justify-content-between d-flex align-items-start my-3">
+
+<%# <div class="d-flex justify-content-between d-flex align-items-start"> %>
 
   <%# items per page selector %>
-  <div class="d-flex align-items-center">
+  <div class="d-flex align-items-center mb-3 mb-sm-0">
     <%= form_for :page_size, "#", [phx_change: "page-size-change"], fn pgsz -> %>
       <%= select pgsz, :page_size,
           [10, 15, 20, 30, 50, 100] |> Enum.map(fn n -> {"#{n} per page", n} end),
@@ -193,3 +213,4 @@
   </nav>
 
 </div>
+<% end %>

priv/repo/migrations/20200914162043_create_properties.exs

@@ -7,7 +7,7 @@ defmodule Bones73k.Repo.Migrations.CreateProperties do
       add(:name, :string)
       add(:price, :decimal)
       add(:description, :text)
-      add(:user_id, references(:users, type: :binary_id, on_delete: :nothing))
+      add(:user_id, references(:users, type: :binary_id, on_delete: :delete_all), null: false)
 
       timestamps()
     end

test/bones73k/accounts_test.exs

@@ -37,7 +37,7 @@ defmodule Bones73k.AccountsTest do
   describe "get_user!/1" do
     test "raises if id is invalid" do
       assert_raise Ecto.NoResultsError, fn ->
-        Accounts.get_user!(-1)
+        Ecto.UUID.generate() |> Accounts.get_user!()
       end
     end