From 53de306ff42df494fed32603b25c9e037e9dfb0e Mon Sep 17 00:00:00 2001 From: Alexandre de Souza Date: Wed, 8 Nov 2023 15:19:42 -0300 Subject: [PATCH] Add error message to hub form modals (#2329) --- .../live/hub/file_system_form_component.ex | 2 +- .../live/hub/secret_form_component.ex | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/livebook_web/live/hub/file_system_form_component.ex b/lib/livebook_web/live/hub/file_system_form_component.ex index a4cbdb028..fa525efb7 100644 --- a/lib/livebook_web/live/hub/file_system_form_component.ex +++ b/lib/livebook_web/live/hub/file_system_form_component.ex @@ -102,7 +102,7 @@ defmodule LivebookWeb.Hub.FileSystemFormComponent do |> push_redirect(to: socket.assigns.return_to)} else {:error, %Ecto.Changeset{} = changeset} -> {:noreply, assign(socket, changeset: changeset)} - {:transport_error, message} -> {:noreply, put_flash(socket, :error, message)} + {:transport_error, message} -> {:noreply, assign(socket, error_message: message)} {:error, message} -> {:noreply, assign(socket, error_message: message)} end end diff --git a/lib/livebook_web/live/hub/secret_form_component.ex b/lib/livebook_web/live/hub/secret_form_component.ex index 279f1aa6a..7759b1d18 100644 --- a/lib/livebook_web/live/hub/secret_form_component.ex +++ b/lib/livebook_web/live/hub/secret_form_component.ex @@ -15,7 +15,13 @@ defmodule LivebookWeb.Hub.SecretFormComponent do socket = assign(socket, assigns) - {:ok, assign(socket, title: title(socket), button: button(socket), changeset: changeset)} + {:ok, + assign(socket, + title: title(socket), + button: button(socket), + changeset: changeset, + error_message: nil + )} end @impl true @@ -25,6 +31,9 @@ defmodule LivebookWeb.Hub.SecretFormComponent do

<%= @title %>

+
+ <%= @error_message %> +
<.form :let={f} @@ -91,10 +100,7 @@ defmodule LivebookWeb.Hub.SecretFormComponent do {:noreply, assign(socket, changeset: Map.replace!(changeset, :action, :validate))} {:transport_error, error} -> - {:noreply, - socket - |> put_flash(:error, error) - |> push_patch(to: "/hub/#{socket.assigns.hub.id}/secrets/new")} + {:noreply, assign(socket, error_message: error)} end end