Skip to content

Commit

Permalink
Save progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@cibernox
cibernox committed Nov 10, 2024
1 parent 5827446 commit 1518727
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 57 deletions.
33 changes: 27 additions & 6 deletions lib/beacon/live_admin/components/properties_sidebar_component.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ defmodule Beacon.LiveAdmin.PropertiesSidebarComponent do
alias Beacon.LiveAdmin.PropertiesSidebarSectionComponent
require Logger

defmodule Attribute do
use Ecto.Schema
import Ecto.Changeset

# Define an embedded schema (no database backing)
embedded_schema do
field :name, :string
field :value, :string
end

# Function to create and validate changeset
def changeset(attrs) do
%__MODULE__{}
|> cast(attrs, [:name, :value])
|> validate_required([:name, :value])
end
end


def mount(socket) do
socket = assign(socket, :new_attributes, [])
{:ok, socket}
Expand Down Expand Up @@ -44,8 +63,10 @@ defmodule Beacon.LiveAdmin.PropertiesSidebarComponent do
optional(any()) => any()
}) :: {:noreply, map()}
def handle_event("add_attribute", _params, socket) do
new_attribute = %{name: "", value: ""}
new_attribute = Attribute.changeset(%{"name" => "", "value" => ""})
new_attributes = socket.assigns.new_attributes ++ [new_attribute]
Logger.debug("############################## Adding new attribute")
Logger.debug("############################## New attributes: #{inspect(new_attributes)}")
{:noreply, assign(socket, :new_attributes, new_attributes)}
end

Expand All @@ -71,13 +92,13 @@ defmodule Beacon.LiveAdmin.PropertiesSidebarComponent do
<%= if @attributes_editable do %>
<%!-- Editable attributes --%>
<%= for {{name, value}, index} <- Enum.with_index(@selected_ast_element["attrs"]) do %>
<.live_component module={PropertiesSidebarSectionComponent} id="class-section" parent={@myself} name={name} value={value} edit_name={false} index={index} />
<% end %>
<%!-- <%= for {{name, value}, index} <- Enum.with_index(@selected_ast_element["attrs"]) do %>
<.live_component module={PropertiesSidebarSectionComponent} id="class-section" attribute_changeset={changeset} parent={@myself} edit_name={false} index={index} />
<% end %> --%>
<%!-- New attributes --%>
<%= for {%{name: name, value: value}, index} <- Enum.with_index(@new_attributes) do %>
<.live_component module={PropertiesSidebarSectionComponent} id={"new-attribute-section-#{index}"} parent={@myself} name={name} value={value} edit_name={true} index={index} />
<%= for {changeset, index} <- Enum.with_index(@new_attributes) do %>
<.live_component module={PropertiesSidebarSectionComponent} id={"new-attribute-section-#{index}"} parent={@myself} attribute_changeset={changeset} edit_name={true} index={index} />
<% end %>
<% end %>
<div class="p-4">
Expand Down
61 changes: 10 additions & 51 deletions lib/beacon/live_admin/components/properties_sidebar_section_component.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,75 +4,34 @@ defmodule Beacon.LiveAdmin.PropertiesSidebarSectionComponent do
use Beacon.LiveAdmin.Web, :live_component

Check warning on line 4 in lib/beacon/live_admin/components/properties_sidebar_section_component.ex

View workflow job for this annotation

GitHub Actions / test: OTP 25.1 | Elixir 1.14.0 | Phoenix 1.7.0 | LV 0.20.2 | PG 13.0-alpine 

this clause for __live__/0 cannot match because a previous clause at line 3 always matches
require Logger

# def handle_event("update_attribute_name", %{"index" => index, "name" => name}, socket) do
# Logger.debug("Updating attribute name: #{index} - #{name}")
# index = String.to_integer(index)
# new_attributes = Enum.map(socket.assigns.new_attributes, fn
# {attr, i} when i == index -> %{attr | name: name}
# attr -> attr
# end)
# {:noreply, assign(socket, :new_attributes, new_attributes)}
# end

# def handle_event("update_attribute_value", %{"index" => index, "value" => value}, socket) do
# Logger.debug("Updating attribute value: #{index} - #{value}")
# index = String.to_integer(index)
# new_attributes = Enum.map(socket.assigns.new_attributes, fn
# {attr, i} when i == index -> %{attr | value: value}
# attr -> attr
# end)
# {:noreply, assign(socket, :new_attributes, new_attributes)}
# end

def handle_event("update_attribute", %{ "name" => name, "value" => value}, socket) do
Logger.debug("Updating attribute: #{name} - #{value}")
Logger.debug("Assigns: #{inspect(socket.assigns)}")
index = socket.assigns.index
# new_attributes = Enum.map(socket.assigns.new_attributes, fn
# {attr, i} when i == index -> %{attr | name: name, value: value}
# attr -> attr
# end)
# {:noreply, assign(socket, :new_attributes, new_attributes)}
{:noreply, socket}
def update(assigns, socket) do
Logger.debug("########## PropertiesSidebarSectionComponent update assigns: #{inspect(assigns)}")
{:ok,
assign(socket, assigns) |> assign(:form, to_form(assigns.attribute_changeset))
}
end

def render(assigns) do
~H"""
<section class="p-4 border-b border-b-gray-100 border-solid">
<form phx-change="update_attribute" phx-blur="check_and_save" phx-target={@myself}>
<.form for={@form} phx-submit="check_and_save">
<header class="flex items-center text-sm mb-2 font-medium">
<div class="w-full flex items-center justify-between gap-x-1 p-1 font-semibold group">
<span class="flex-grow">
<span class="hover:text-blue-700 active:text-blue-900">
<%= if @edit_name do %>
<input
type="text"
class="w-full py-1 px-2 bg-gray-100 border-gray-100 rounded-md leading-6 text-sm"
value={@name}
name="name"
phx-input="update_attribute_name"
phx-value-index={@index}
phx-target={@parent}
/>
<.input field={@form[:name]} type="text" class="w-full py-1 px-2 bg-gray-100 border-gray-100 rounded-md leading-6 text-sm"/>
<% else %>
<%= @name %>
<%= @attribute_changeset[:name] %>
<% end %>
</span>
</span>
<.delete_button index={@index} parent={@parent}/>
<.toggle_button/>
</div>
</header>
<input
type="text"
class="w-full py-1 px-2 bg-gray-100 border-gray-100 rounded-md leading-6 text-sm"
value={@value}
name="value"
phx-input="update_attribute_value"
phx-value-index={@index}
phx-target={@parent}
/>
</form>
<.input field={@form[:value]} type="text" class="w-full py-1 px-2 bg-gray-100 border-gray-100 rounded-md leading-6 text-sm" />
</.form>
</section>
"""
end
Expand Down

0 comments on commit 1518727

Please sign in to comment.