fix: make improvements

Author: spaenleh

lib/admin/languages.ex

@@ -20,6 +20,10 @@ defmodule Admin.Languages do
     @languages |> Enum.map(&Keyword.new(&1))
   end
 
+  def all_values do
+    @languages |> Enum.map(& &1.value)
+  end
+
   @doc """
   Returns a list of languages excluding the ones with the given codes.
 

lib/admin/mailing_worker.ex

@@ -23,7 +23,13 @@ defmodule Admin.MailingWorker do
     scope = Scope.for_user(user)
 
     with {:ok, notification} <- Notifications.get_notification(scope, notification_id),
-         {:ok, audience} <- Notifications.get_target_audience(scope, notification.audience) do
+         included_langs = notification.localized_emails |> Enum.map(& &1.language),
+         {:ok, audience} <-
+           Notifications.get_target_audience(
+             scope,
+             notification.audience,
+             if(notification.use_strict_languages, do: [only_langs: included_langs], else: [])
+           ) do
       # save number of recipients to the notification
       Notifications.update_recipients(notification, %{total_recipients: length(audience)})
       # start sending emails

lib/admin/notifications.ex

@@ -103,6 +103,11 @@ defmodule Admin.Notifications do
     Repo.all(from n in Notification, order_by: [desc: :updated_at]) |> Repo.preload([:logs])
   end
 
+  def list_notifications_by_status(%Scope{} = _scope) do
+    Repo.all(from n in Notification, order_by: [desc: :sent_at])
+    |> Repo.preload([:logs, :localized_emails])
+  end
+
   def list_recently_sent_notifications(%Scope{} = _scope) do
     Repo.all(
       from n in Notification, where: not is_nil(n.sent_at), order_by: [desc: :sent_at], limit: 10
@@ -301,31 +306,42 @@ defmodule Admin.Notifications do
     end
   end
 
-  def get_target_audience(%Scope{} = _scope, "active") do
+  def get_target_audience(scope, target_audience, opts \\ [])
+
+  def get_target_audience(%Scope{} = _scope, "active", opts) do
     audience =
-      Accounts.get_active_members() |> Enum.map(&%{name: &1.name, email: &1.email, lang: &1.lang})
+      Accounts.get_active_members()
+      |> Enum.map(&%{name: &1.name, email: &1.email, lang: &1.lang})
+      |> filter_audience_with_options(opts)
 
     {:ok, audience}
   end
 
-  def get_target_audience(%Scope{} = _scope, "french") do
+  def get_target_audience(%Scope{} = _scope, "french", opts) do
     audience =
       Accounts.get_members_by_language("fr")
       |> Enum.map(&%{name: &1.name, email: &1.email, lang: &1.lang})
+      |> filter_audience_with_options(opts)
 
     {:ok, audience}
   end
 
-  def get_target_audience(%Scope{} = _scope, "graasp_team") do
+  def get_target_audience(%Scope{} = _scope, "graasp_team", opts) do
     audience =
       Accounts.list_users()
       |> Enum.map(&%{name: &1.name, email: &1.email, lang: &1.language})
+      |> filter_audience_with_options(opts)
 
     {:ok, audience}
   end
 
-  def get_target_audience(%Scope{} = _scope, target_audience) do
+  def get_target_audience(%Scope{} = _scope, target_audience, _opts) do
     Logger.error("Invalid target audience: #{target_audience}")
     {:error, :invalid_target_audience}
   end
+
+  defp filter_audience_with_options(audience, opts) do
+    only_langs = Keyword.get(opts, :only_langs, Admin.Languages.all_values()) |> MapSet.new()
+    audience |> Enum.filter(fn user -> MapSet.member?(only_langs, user.lang) end)
+  end
 end

lib/admin_web/components/mailing_components.ex

@@ -0,0 +1,32 @@
+defmodule AdminWeb.MailingComponents do
+  @moduledoc """
+  Components for the mailing module.
+  """
+
+  use Phoenix.Component
+
+  attr :id, :string, required: true
+  attr :mailing, :map, required: true
+
+  def sent_mailing(assigns) do
+    ~H"""
+    <div id={@id} class="card w-full bg-base-100 card-sm shadow-sm">
+      <div class="card-body w-full flex flex-row items-center">
+        <div class="flex flex-col">
+          <h2 class="card-title">{@mailing.name}</h2>
+          <span>
+            <%= for lang <- @mailing.localized_emails |> Enum.map(& &1.language) do %>
+              <div class="chip">
+                {lang}
+              </div>
+            <% end %>
+          </span>
+          <p>Target Audience: {@mailing.audience}</p>
+        </div>
+
+        <span class="text-base h-fit">{length(@mailing.logs)} / {@mailing.total_recipients}</span>
+      </div>
+    </div>
+    """
+  end
+end

lib/admin_web/live/notification_live/form.ex

@@ -75,7 +75,7 @@ defmodule AdminWeb.NotificationLive.Form do
 
         <footer>
           <.button variant="primary">Save Mail</.button>
-          <.button navigate={~p"/notifications"}>Cancel</.button>
+          <.button navigate={~p"/notifications/#{@notification}"}>Cancel</.button>
         </footer>
       </.form>
     </Layouts.admin>
@@ -110,9 +110,14 @@ defmodule AdminWeb.NotificationLive.Form do
 
   defp apply_action(socket, :edit, %{"notification_id" => id}) do
     notification = Notifications.get_notification!(socket.assigns.current_scope, id)
+    included_langs = notification.localized_emails |> Enum.map(& &1.language)
 
     {:ok, recipients} =
-      Notifications.get_target_audience(socket.assigns.current_scope, notification.audience)
+      Notifications.get_target_audience(
+        socket.assigns.current_scope,
+        notification.audience,
+        if(notification.use_strict_languages, do: [only_langs: included_langs], else: [])
+      )
 
     socket
     |> assign(:page_title, "Edit Mail")

lib/admin_web/live/notification_live/index.ex

@@ -30,11 +30,38 @@ defmodule AdminWeb.NotificationLive.Index do
         </div>
       <% end %>
 
-      <%!-- Idea: represent the mails as cards ? --%>
+      <h2 class="text-lg font-bold">Drafts</h2>
       <.table
-        id="notifications"
-        rows={@streams.notifications}
+        id="wip_notifications"
+        rows={@streams.wip_notifications}
         row_click={fn {_id, notification} -> JS.navigate(~p"/notifications/#{notification}") end}
+      >
+        <:col :let={{_id, notification}} label="Name">{notification.name}</:col>
+        <:col :let={{_id, notification}} label="Audience">{notification.audience}</:col>
+        <:action :let={{_id, notification}}>
+          <div class="sr-only">
+            <.link navigate={~p"/notifications/#{notification}"}>Show</.link>
+          </div>
+        </:action>
+        <:action :let={{id, notification}}>
+          <.link
+            class="text-error"
+            phx-click={JS.push("delete", value: %{id: notification.id}) |> hide("##{id}")}
+            data-confirm="Are you sure?"
+          >
+            Delete
+          </.link>
+        </:action>
+      </.table>
+
+      <h2 class="text-lg font-bold">Sent</h2>
+
+      <.table
+        id="notifications"
+        rows={@streams.sent_notifications}
+        row_click={
+          fn {_id, notification} -> JS.navigate(~p"/notifications/#{notification}/archive") end
+        }
       >
         <:col :let={{_id, notification}} label="Name">{notification.name}</:col>
         <:col :let={{_id, notification}} label="Audience">{notification.audience}</:col>
@@ -71,6 +98,11 @@ defmodule AdminWeb.NotificationLive.Index do
       Notifications.subscribe_sending_progress(socket.assigns.current_scope)
     end
 
+    notifications = Notifications.list_notifications_by_status(socket.assigns.current_scope)
+
+    {wip_notifications, sent_notifications} =
+      notifications |> Enum.split_with(&(&1.sent_at == nil))
+
     {:ok,
      socket
      |> assign(:page_title, "Mailing")
@@ -79,7 +111,14 @@ defmodule AdminWeb.NotificationLive.Index do
        :sent_notifications,
        Notifications.list_recently_sent_notifications(socket.assigns.current_scope)
      )
-     |> stream(:notifications, Notifications.list_notifications(socket.assigns.current_scope))}
+     |> stream(
+       :wip_notifications,
+       wip_notifications
+     )
+     |> stream(
+       :sent_notifications,
+       sent_notifications
+     )}
   end
 
   @impl true

lib/admin_web/live/notification_live/message_live/form.ex

@@ -70,8 +70,10 @@ defmodule AdminWeb.NotificationMessageLive.Form do
     {:ok, socket}
   end
 
-  def apply_action(socket, :new, _params) do
+  def apply_action(socket, :new, params) do
     localized_email = %LocalizedEmail{}
+    params |> IO.inspect()
+    Map.get(params, "language", "") |> IO.inspect()
 
     changeset =
       Notifications.change_localized_email(
@@ -83,7 +85,7 @@ defmodule AdminWeb.NotificationMessageLive.Form do
           "message" => "",
           "button_text" => "",
           "button_url" => "",
-          "language" => ""
+          "language" => Map.get(params, "language", "")
         }
       )
 

lib/admin_web/live/notification_live/show.ex

@@ -21,19 +21,19 @@ defmodule AdminWeb.NotificationLive.Show do
 
       <.list>
         <:item title="Name">{@notification.name}</:item>
-        <:item title="Target Audience">{@notification.audience}</:item>
+        <:item title="Target Audience">{@notification.audience} {length(@recipients)}</:item>
         <:item title="Default language">
           <div class="flex flex-col gap-2">
             {@notification.default_language}
-
+            <%!--
             <label class="label text-sm">
               <input
                 type="checkbox"
                 phx-click="toggle_strict_languages"
                 checked={if @notification.use_strict_languages, do: "checked", else: nil}
                 class="checkbox checkbox-primary"
               /> Use only specified languages
-            </label>
+            </label> --%>
           </div>
         </:item>
       </.list>
@@ -100,6 +100,11 @@ defmodule AdminWeb.NotificationLive.Show do
         <div role="alert" class="alert alert-error alert-soft">
           <.icon name="hero-exclamation-circle" class="size-6" />
           <span>Missing the email template for the default language.</span>
+          <.button navigate={
+            ~p"/notifications/#{@notification}/messages/new?language=#{@notification.default_language}"
+          }>
+            Add locale
+          </.button>
         </div>
       <% end %>
     </Layouts.admin>
@@ -112,24 +117,44 @@ defmodule AdminWeb.NotificationLive.Show do
       Notifications.subscribe_notifications(socket.assigns.current_scope, id)
     end
 
+    notification = Notifications.get_notification!(socket.assigns.current_scope, id)
+    included_langs = notification.localized_emails |> Enum.map(& &1.language)
+
+    {:ok, recipients} =
+      Notifications.get_target_audience(
+        socket.assigns.current_scope,
+        notification.audience,
+        if(notification.use_strict_languages, do: [only_langs: included_langs], else: [])
+      )
+
     {:ok,
      socket
      |> assign(:page_title, "Show Mail")
      |> assign(
        :notification,
-       Notifications.get_notification!(socket.assigns.current_scope, id)
-     )}
+       notification
+     )
+     |> assign(:recipients, recipients)}
   end
 
   @impl true
   def handle_event("toggle_strict_languages", _, socket) do
-    {:ok, _notification} =
+    {:ok, notification} =
       Notifications.toggle_strict_languages(
         socket.assigns.current_scope,
         socket.assigns.notification
       )
 
-    {:noreply, socket}
+    included_langs = notification.localized_emails |> Enum.map(& &1.language)
+
+    {:ok, recipients} =
+      Notifications.get_target_audience(
+        socket.assigns.current_scope,
+        notification.audience,
+        if(notification.use_strict_languages, do: [only_langs: included_langs], else: [])
+      )
+
+    {:noreply, socket |> assign(:recipients, recipients)}
   end
 
   def handle_event("delete", %{"id" => id} = _params, socket) do

lib/admin_web/router.ex

@@ -115,6 +115,7 @@ defmodule AdminWeb.Router do
 
         scope "/:notification_id" do
           live "/", NotificationLive.Show, :show
+          live "/archive", NotificationLive.Show, :archive
           live "/edit", NotificationLive.Form, :edit
 
           live "/messages/new", NotificationMessageLive.Form, :new