From 5ebd38c0686f39c2d4947e97052079dbfd59899b Mon Sep 17 00:00:00 2001 From: Leandro Pereira Date: Fri, 17 Jan 2025 09:55:59 -0500 Subject: [PATCH] fix enable editor --- .../live_admin/live/page_editor_live/edit.ex | 12 ------------ .../live/page_editor_live/form_component.ex | 16 ++++++++++++++-- .../live_admin/live/page_editor_live/new.ex | 13 ------------- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/lib/beacon/live_admin/live/page_editor_live/edit.ex b/lib/beacon/live_admin/live/page_editor_live/edit.ex index 425d4436..d999113f 100644 --- a/lib/beacon/live_admin/live/page_editor_live/edit.ex +++ b/lib/beacon/live_admin/live/page_editor_live/edit.ex @@ -55,18 +55,6 @@ defmodule Beacon.LiveAdmin.PageEditorLive.Edit do {:noreply, socket} end - def handle_event("enable_editor", %{"editor" => editor}, socket) do - path = - Beacon.LiveAdmin.Router.beacon_live_admin_path( - socket, - socket.assigns.beacon_page.site, - "/pages/#{socket.assigns.page.id}", - %{editor: editor} - ) - - {:noreply, push_patch(socket, to: path)} - end - def handle_event( "render_component_in_page", %{"component_id" => component_id, "page_id" => page_id}, diff --git a/lib/beacon/live_admin/live/page_editor_live/form_component.ex b/lib/beacon/live_admin/live/page_editor_live/form_component.ex index b2dd3807..3b82f590 100644 --- a/lib/beacon/live_admin/live/page_editor_live/form_component.ex +++ b/lib/beacon/live_admin/live/page_editor_live/form_component.ex @@ -178,11 +178,17 @@ defmodule Beacon.LiveAdmin.PageEditorLive.FormComponent do |> LiveMonacoEditor.set_value(template, to: "template") |> assign_form(changeset) + path = + case socket.assigns.live_action do + :new -> "/pages/new" + :edit -> "/pages/#{socket.assigns.page.id}" + end + path = Beacon.LiveAdmin.Router.beacon_live_admin_path( socket, socket.assigns.site, - "/pages/#{socket.assigns.page.id}", + path, %{editor: "code"} ) @@ -190,11 +196,17 @@ defmodule Beacon.LiveAdmin.PageEditorLive.FormComponent do end def handle_event("enable_editor", %{"editor" => "visual"}, socket) do + path = + case socket.assigns.live_action do + :new -> "/pages/new" + :edit -> "/pages/#{socket.assigns.page.id}" + end + path = Beacon.LiveAdmin.Router.beacon_live_admin_path( socket, socket.assigns.site, - "/pages/#{socket.assigns.page.id}", + path, %{editor: "visual"} ) diff --git a/lib/beacon/live_admin/live/page_editor_live/new.ex b/lib/beacon/live_admin/live/page_editor_live/new.ex index c3c968ff..88274b28 100644 --- a/lib/beacon/live_admin/live/page_editor_live/new.ex +++ b/lib/beacon/live_admin/live/page_editor_live/new.ex @@ -65,19 +65,6 @@ defmodule Beacon.LiveAdmin.PageEditorLive.New do {:noreply, socket} end - # FIXME: enable_editor sync template - def handle_event("enable_editor", %{"editor" => editor}, socket) do - path = - Beacon.LiveAdmin.Router.beacon_live_admin_path( - socket, - socket.assigns.beacon_page.site, - "/pages/new", - %{editor: editor} - ) - - {:noreply, push_patch(socket, to: path)} - end - @impl true def handle_event( "render_component_in_page",