diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b00cfc6f..0b66bfc9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
## \#3 unreleased
-* -
+* Added: Confirmation dialog when skipping content pages or consent pages in assignment configuration.
## \#2 2024-10-04
diff --git a/core/frameworks/pixel/components/confirmation_modal.ex b/core/frameworks/pixel/components/confirmation_modal.ex
new file mode 100644
index 000000000..597089c6a
--- /dev/null
+++ b/core/frameworks/pixel/components/confirmation_modal.ex
@@ -0,0 +1,66 @@
+defmodule Frameworks.Pixel.ConfirmationModal do
+ use CoreWeb, :live_component
+
+ @impl true
+ def update(%{assigns: assigns}, socket) do
+ {
+ :ok,
+ socket
+ |> assign_new(:title, fn ->
+ Map.get(assigns, :title, dgettext("eyra-ui", "confirmation_modal.title"))
+ end)
+ |> assign_new(:body, fn ->
+ Map.get(assigns, :body, dgettext("eyra-ui", "confirmation_modal.body"))
+ end)
+ |> update_buttons()
+ }
+ end
+
+ defp update_buttons(%{assigns: %{myself: myself}} = socket) do
+ confirm = %{
+ action: %{type: :send, target: myself, event: "confirm"},
+ face: %{type: :primary, label: dgettext("eyra-ui", "confirm.button")}
+ }
+
+ cancel = %{
+ action: %{type: :send, target: myself, event: "cancel"},
+ face: %{type: :secondary, label: dgettext("eyra-ui", "cancel.button")}
+ }
+
+ assign(socket, buttons: [confirm, cancel])
+ end
+
+ def handle_event("confirm", _, socket) do
+ {:noreply, socket |> send_event(:parent, "confirmed")}
+ end
+
+ def handle_event("cancel", _, socket) do
+ {:noreply, socket |> send_event(:parent, "cancelled")}
+ end
+
+ @impl true
+ @spec render(any()) :: Phoenix.LiveView.Rendered.t()
+ def render(assigns) do
+ ~H"""
+
+
+ <%= @title %>
+
+
+ <.spacing value="M" />
+
+
+ <%= @body %>
+
+
+ <.spacing value="M" />
+
+
+ <%= for button <- @buttons do %>
+
+ <% end %>
+
+
diff --git a/core/systems/assignment/gdpr_form.ex b/core/systems/assignment/gdpr_form.ex
index ff3a4c66f..21efc149c 100644
--- a/core/systems/assignment/gdpr_form.ex
+++ b/core/systems/assignment/gdpr_form.ex
@@ -55,6 +55,26 @@ defmodule Systems.Assignment.GdprForm do
}
end
+ @impl true
+ def compose(:confirmation_modal, %{entity: %{consent_agreement: consent_agreement}}) do
+ assigns = %{consent_agreement: consent_agreement}
+ signatures = Consent.Public.list_signatures(consent_agreement)
+
+ assigns =
+ if signatures != [] do
+ Map.put(assigns, :body, dgettext("eyra-assignment", "gdpr_form.confirmation_modal.body"))
+ else
+ assigns
+ end
+
+ %{
+ module: Pixel.ConfirmationModal,
+ params: %{
+ assigns: assigns
+ }
+ }
+ end
+
@impl true
def handle_event(
"update",
@@ -71,15 +91,49 @@ defmodule Systems.Assignment.GdprForm do
end
@impl true
- def handle_event("update", %{status: :off}, %{assigns: %{entity: assignment}} = socket) do
- {:ok, _} = Assignment.Public.update_consent_agreement(assignment, nil)
+ def handle_event(
+ "update",
+ %{status: :off},
+ %{assigns: %{entity: assignment}} = socket
+ ) do
+ revision = Consent.Public.latest_revision(assignment.consent_agreement)
+ localized_default_text = dgettext("eyra-consent", "default.consent.text")
{
:noreply,
socket
+ |> handle_off_state(revision, revision.source == localized_default_text)
}
end
+ @impl true
+ def handle_event("cancelled", %{source: %{name: :confirmation_modal}}, socket) do
+ {:noreply,
+ socket
+ |> hide_modal(:confirmation_modal)}
+ end
+
+ @impl true
+ def handle_event(
+ "confirmed",
+ %{source: %{name: :confirmation_modal}},
+ %{assigns: %{entity: assignment}} = socket
+ ) do
+ {:ok, _} = Assignment.Public.delete_consent_agreement(assignment)
+ {:noreply, socket |> hide_modal(:confirmation_modal)}
+ end
+
+ defp handle_off_state(socket, %{source: source}, false) when not is_nil(source) do
+ socket
+ |> compose_child(:confirmation_modal)
+ |> show_modal(:confirmation_modal, :dialog)
+ end
+
+ defp handle_off_state(socket, _, _) do
+ {:ok, _} = Assignment.Public.delete_consent_agreement(socket.assigns.entity)
+ socket
+ end
+
@impl true
def render(assigns) do
~H"""
diff --git a/core/systems/consent/_public.ex b/core/systems/consent/_public.ex
index 0d76d9cc5..cb3ead5fd 100644
--- a/core/systems/consent/_public.ex
+++ b/core/systems/consent/_public.ex
@@ -1,6 +1,7 @@
defmodule Systems.Consent.Public do
import CoreWeb.Gettext
import Ecto.Query
+ import Systems.Consent.Queries
alias Ecto.Multi
alias Core.Repo
@@ -186,6 +187,11 @@ defmodule Systems.Consent.Public do
|> Signal.Public.multi_dispatch({:consent_revision, :updated})
|> Repo.transaction()
end
+
+ def list_signatures(%Consent.AgreementModel{} = consent_agreement) do
+ signature_query(consent_agreement)
+ |> Repo.all()
+ end
end
defimpl Core.Persister, for: Systems.Consent.RevisionModel do
diff --git a/core/systems/consent/_queries.ex b/core/systems/consent/_queries.ex
new file mode 100644
index 000000000..67bd3e890
--- /dev/null
+++ b/core/systems/consent/_queries.ex
@@ -0,0 +1,23 @@
+defmodule Systems.Consent.Queries do
+ require Ecto.Query
+ require Frameworks.Utility.Query
+
+ import Ecto.Query, warn: false
+ import Frameworks.Utility.Query, only: [build: 3]
+
+ alias Systems.Consent
+
+ def signature_query() do
+ from(Consent.SignatureModel, as: :signature)
+ end
+
+ def signature_query(%Consent.AgreementModel{id: consent_agreement_id}) do
+ build(signature_query(), :signature,
+ revision: [
+ agreement: [
+ id == ^consent_agreement_id
+ ]
+ ]
+ )
+ end
+end