Merge branch 'main' into apb/auth

Author: APB9785

.github/workflows/ci.yml

@@ -82,6 +82,8 @@ jobs:
 
       - run: mix tailwind.install --no-assets
 
+      - run: mix esbuild.install
+
       - name: Run tests
         env:
           DATABASE_URL: postgresql://postgres:postgres@localhost:${{job.services.postgres.ports[5432]}}/beacon_live_admin_test

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 ### Enhancements
+  - Adds page to define custom JS Hooks
   - Updated UI styling with StationUI
   - Unsaved changes will now be saved when publishing, instead of discarded
   - Adds Unpublish button to Page editor
@@ -11,6 +12,7 @@
 ### Fixes
 
   - Fixed a bug where MediaLibrary could check for file contents on the wrong node in multi-node deployments
+  - Fixed a bug where using the code editor could reset other form fields on the page
 
 ## 0.3.1 (2024-12-12)
 

assets/package-lock.json

@@ -17,6 +17,7 @@
     "phoenix_live_view": "file:../deps/phoenix_live_view"
   },
   "devDependencies": {
+    "tailwindcss": "^3.4",
     "@tailwindcss/container-queries": "^0.1",
     "esbuild": "^0.20",
     "esbuild-plugin-import-glob": "^0.1",

assets/package.json

@@ -8,6 +8,7 @@ defmodule Beacon.LiveAdmin.Application do
     children = [
       Beacon.LiveAdmin.Registry,
       {Phoenix.PubSub, name: Beacon.LiveAdmin.PubSub},
+      %{id: :pg, start: {:pg, :start_link, [Beacon.LiveAdmin.Cluster.scope()]}},
       Beacon.LiveAdmin.Cluster,
       Turboprop.Cache
     ]

lib/beacon/live_admin/application.ex

@@ -290,4 +290,32 @@ defmodule Beacon.LiveAdmin.Client.Content do
   def delete_info_handler(site, actor, info_handler) do
     call(site, Beacon.Content, :delete_info_handler, [info_handler, [actor: actor]])
   end
+
+  def change_js_hook(site, js_hook, attrs \\ %{}) do
+    call(site, Beacon.Content, :change_js_hook, [js_hook, attrs])
+  end
+
+  def list_js_hooks(site) do
+    call(site, Beacon.Content, :list_js_hooks, [site])
+  end
+
+  def create_js_hook(site, attrs) do
+    call(site, Beacon.Content, :create_js_hook, [attrs])
+  end
+
+  def create_js_hook!(site, attrs) do
+    call(site, Beacon.Content, :create_js_hook!, [attrs])
+  end
+
+  def default_hook_code(site, hook_name) do
+    call(site, Beacon.Content, :default_hook_code, [hook_name])
+  end
+
+  def update_js_hook(site, js_hook, attrs) do
+    call(site, Beacon.Content, :update_js_hook, [js_hook, attrs])
+  end
+
+  def delete_js_hook(site, js_hook) do
+    call(site, Beacon.Content, :delete_js_hook, [js_hook])
+  end
 end

lib/beacon/live_admin/client/content.ex

@@ -35,8 +35,8 @@ defmodule Beacon.LiveAdmin.Client.MediaLibrary do
     call(site, Beacon.MediaLibrary, :is_image?, [asset])
   end
 
-  def new_upload_metadata(site, path, node, opts) do
-    call(site, Beacon.MediaLibrary.UploadMetadata, :new, [site, path, node, opts])
+  def new_upload_metadata(site, path, opts) do
+    call(site, Beacon.MediaLibrary.UploadMetadata, :new, [site, path, opts])
   end
 
   def upload(site, upload_metadata) do

lib/beacon/live_admin/client/media_library.ex

@@ -10,6 +10,9 @@ defmodule Beacon.LiveAdmin.Cluster do
 
   @scope :beacon_cluster
 
+  @doc false
+  def scope, do: @scope
+
   @doc false
   def start_link(opts) do
     GenServer.start_link(__MODULE__, opts, name: __MODULE__)
@@ -18,7 +21,6 @@ defmodule Beacon.LiveAdmin.Cluster do
   @doc false
   @impl true
   def init(opts) do
-    {:ok, _} = :pg.start_link(@scope)
     :pg.monitor_scope(@scope)
     :ok = :net_kernel.monitor_nodes(true, node_type: :all)
     {:ok, opts}

lib/beacon/live_admin/cluster.ex

@@ -40,7 +40,11 @@ defmodule Beacon.LiveAdmin.EventHandlerEditorLive.Index do
     %{selected: selected, beacon_page: %{site: site}, form: form} = socket.assigns
 
     params = Map.merge(form.params, %{"code" => code})
-    changeset = Content.change_event_handler(site, selected, params)
+
+    changeset =
+      site
+      |> Content.change_event_handler(selected, params)
+      |> Map.put(:action, :validate)
 
     socket =
       socket
@@ -50,6 +54,17 @@ defmodule Beacon.LiveAdmin.EventHandlerEditorLive.Index do
     {:noreply, socket}
   end
 
+  def handle_event("validate", params, socket) do
+    %{beacon_page: %{site: site}, form: form} = socket.assigns
+
+    changeset =
+      site
+      |> Content.change_event_handler(form.source.data, params["event_handler"])
+      |> Map.put(:action, :validate)
+
+    {:noreply, assign_form(socket, changeset)}
+  end
+
   def handle_event("create_new", _, socket) do
     {:noreply, assign(socket, show_create_modal: true)}
   end
@@ -231,7 +246,7 @@ defmodule Beacon.LiveAdmin.EventHandlerEditorLive.Index do
           </div>
 
           <div :if={@form} class="w-full col-span-2">
-            <.form :let={f} for={@form} id="event-handler-form" class="flex items-end gap-4" phx-submit="save_changes">
+            <.form :let={f} for={@form} id="event-handler-form" class="flex items-end gap-4" phx-change="validate" phx-submit="save_changes">
               <.input label="Name" field={f[:name]} type="text" />
               <input type="hidden" name="event_handler[code]" id="event_handler-form_code" value={Phoenix.HTML.Form.input_value(f, :code)} />
 

lib/beacon/live_admin/live/event_handler_editor_live/index.ex

@@ -57,6 +57,9 @@ defmodule Beacon.LiveAdmin.HomeLive do
                   <.link href={Router.beacon_live_admin_path(@socket, site, "/error_pages")} class={nav_class()}>
                     Error Pages
                   </.link>
+                  <.link href={Router.beacon_live_admin_path(@socket, site, "/hooks")} class={nav_class()}>
+                    JS Hooks
+                  </.link>
                 </div>
               </div>
             <% end %>