From d01ae6af96dedd37dd0135b17d733d9a88ea7357 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 28 Apr 2025 17:56:58 +0200 Subject: [PATCH 1/5] member and properties --- config/config.exs | 3 +- lib/membership/member.ex | 35 +++++++ lib/membership/membership.ex | 27 ++++++ lib/membership/property.ex | 28 ++++++ lib/membership/property_type.ex | 43 ++++++++ .../20250514151922_initial_migration.exs | 72 ++++++++++++++ priv/repo/seeds.exs | 28 ++++++ .../repo/members/20250514151922.json | 29 ++++++ .../repo/properties/20250514151922.json | 97 +++++++++++++++++++ .../repo/property_types/20250514151922.json | 94 ++++++++++++++++++ 10 files changed, 455 insertions(+), 1 deletion(-) create mode 100644 lib/membership/member.ex create mode 100644 lib/membership/membership.ex create mode 100644 lib/membership/property.ex create mode 100644 lib/membership/property_type.ex create mode 100644 priv/repo/migrations/20250514151922_initial_migration.exs create mode 100644 priv/resource_snapshots/repo/members/20250514151922.json create mode 100644 priv/resource_snapshots/repo/properties/20250514151922.json create mode 100644 priv/resource_snapshots/repo/property_types/20250514151922.json diff --git a/config/config.exs b/config/config.exs index cf13cb1..a43af46 100644 --- a/config/config.exs +++ b/config/config.exs @@ -48,7 +48,8 @@ config :spark, config :mv, ecto_repos: [Mv.Repo], - generators: [timestamp_type: :utc_datetime] + generators: [timestamp_type: :utc_datetime], + ash_domains: [Mv.Membership] # Configures the endpoint config :mv, MvWeb.Endpoint, diff --git a/lib/membership/member.ex b/lib/membership/member.ex new file mode 100644 index 0000000..0538f45 --- /dev/null +++ b/lib/membership/member.ex @@ -0,0 +1,35 @@ +defmodule Mv.Membership.Member do + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "members" + repo Mv.Repo + end + + actions do + defaults [:read, :destroy] + + create :create_member do + primary? true + argument :properties, {:array, :map} + change manage_relationship(:properties, type: :create) + end + + update :update_member do + primary? true + require_atomic? false + argument :properties, {:array, :map} + change manage_relationship(:properties, on_match: :update, on_no_match: :create) + end + end + + attributes do + uuid_v7_primary_key :id + end + + relationships do + has_many :properties, Mv.Membership.Property + end +end diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex new file mode 100644 index 0000000..b766a13 --- /dev/null +++ b/lib/membership/membership.ex @@ -0,0 +1,27 @@ +defmodule Mv.Membership do + use Ash.Domain, + extensions: [AshPhoenix] + + resources do + resource Mv.Membership.Member do + define :create_member, action: :create_member + define :list_members, action: :read + define :update_member, action: :update_member + define :destroy_member, action: :destroy + end + + resource Mv.Membership.Property do + define :create_property, action: :create + define :list_property, action: :read + define :update_property, action: :update + define :destroy_property, action: :destroy + end + + resource Mv.Membership.PropertyType do + define :create_property_type, action: :create + define :list_property_types, action: :read + define :update_property_type, action: :update + define :destroy_property_type, action: :destroy + end + end +end diff --git a/lib/membership/property.ex b/lib/membership/property.ex new file mode 100644 index 0000000..433fc63 --- /dev/null +++ b/lib/membership/property.ex @@ -0,0 +1,28 @@ +defmodule Mv.Membership.Property do + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "properties" + repo Mv.Repo + end + + actions do + defaults [:create, :read, :update, :destroy] + default_accept [:value, :member_id, :property_type_id] + end + + attributes do + uuid_primary_key :id + + attribute :value, :string, + description: "Speichert den Wert, Typ-Interpretation per property_type.typ" + end + + relationships do + belongs_to :member, Mv.Membership.Member + + belongs_to :property_type, Mv.Membership.PropertyType + end +end diff --git a/lib/membership/property_type.ex b/lib/membership/property_type.ex new file mode 100644 index 0000000..560f679 --- /dev/null +++ b/lib/membership/property_type.ex @@ -0,0 +1,43 @@ +defmodule Mv.Membership.PropertyType do + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "property_types" + repo Mv.Repo + end + + actions do + defaults [:create, :read, :update, :destroy] + default_accept [:name, :type, :description, :immutable, :required] + end + + attributes do + uuid_primary_key :id + + attribute :name, :string, allow_nil?: false, public?: true + + attribute :type, :string, + allow_nil?: false, + description: "Definies the datatype `Property.value` is interpreted as" + + attribute :description, :string, allow_nil?: true, public?: true + + attribute :immutable, :boolean, + default: false, + allow_nil?: false + + attribute :required, :boolean, + default: false, + allow_nil?: false + end + + relationships do + has_many :properties, Mv.Membership.Property + end + + identities do + identity :unique_name, [:name] + end +end diff --git a/priv/repo/migrations/20250514151922_initial_migration.exs b/priv/repo/migrations/20250514151922_initial_migration.exs new file mode 100644 index 0000000..64915c2 --- /dev/null +++ b/priv/repo/migrations/20250514151922_initial_migration.exs @@ -0,0 +1,72 @@ +defmodule Mv.Repo.Migrations.InitialMigration do + @moduledoc """ + Updates resources based on their most recent snapshots. + + This file was autogenerated with `mix ash_postgres.generate_migrations` + """ + + use Ecto.Migration + + def up do + create table(:property_types, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :name, :text, null: false + add :type, :text, null: false + add :description, :text + add :immutable, :boolean, null: false, default: false + add :required, :boolean, null: false, default: false + end + + create unique_index(:property_types, [:name], name: "property_types_unique_name_index") + + create table(:properties, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :value, :text + add :member_id, :uuid + add :property_type_id, :uuid + end + + create table(:members, primary_key: false) do + add :id, :uuid, null: false, default: fragment("uuid_generate_v7()"), primary_key: true + end + + alter table(:properties) do + modify :member_id, + references(:members, + column: :id, + name: "properties_member_id_fkey", + type: :uuid, + prefix: "public" + ) + + modify :property_type_id, + references(:property_types, + column: :id, + name: "properties_property_type_id_fkey", + type: :uuid, + prefix: "public" + ) + end + end + + def down do + drop constraint(:properties, "properties_member_id_fkey") + + drop constraint(:properties, "properties_property_type_id_fkey") + + alter table(:properties) do + modify :property_type_id, :uuid + modify :member_id, :uuid + end + + drop table(:members) + + drop table(:properties) + + drop_if_exists unique_index(:property_types, [:name], + name: "property_types_unique_name_index" + ) + + drop table(:property_types) + end +end diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 456772e..8fca144 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -9,3 +9,31 @@ # # We recommend using the bang functions (`insert!`, `update!` # and so on) as they will fail if something goes wrong. + +alias Mv.Membership + +for attrs <- [ + %{ + name: "Vorname", + type: "string", + description: "Vorname des Mitglieds", + immutable: true, + required: true + }, + %{ + name: "Email", + type: "string", + description: "Email-Adresse des Mitglieds", + immutable: true, + required: true + } + ] do + # upsert?: true sorgt dafür, dass bei bestehendem Namen kein Fehler, + # sondern ein Update (hier effektiv No-Op) ausgeführt wird + {:ok, _} = + Membership.create_property_type( + attrs, + upsert?: true, + upsert_identity: :unique_name + ) +end diff --git a/priv/resource_snapshots/repo/members/20250514151922.json b/priv/resource_snapshots/repo/members/20250514151922.json new file mode 100644 index 0000000..df811d8 --- /dev/null +++ b/priv/resource_snapshots/repo/members/20250514151922.json @@ -0,0 +1,29 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"uuid_generate_v7()\")", + "generated?": false, + "primary_key?": true, + "references": null, + "size": null, + "source": "id", + "type": "uuid" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "A0402269CB456075B81CA4CB3A2135A2C88D8B7FD51CD7A23084AA5264FEE344", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "members" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/properties/20250514151922.json b/priv/resource_snapshots/repo/properties/20250514151922.json new file mode 100644 index 0000000..0707bcf --- /dev/null +++ b/priv/resource_snapshots/repo/properties/20250514151922.json @@ -0,0 +1,97 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"gen_random_uuid()\")", + "generated?": false, + "primary_key?": true, + "references": null, + "size": null, + "source": "id", + "type": "uuid" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "value", + "type": "text" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": { + "deferrable": false, + "destination_attribute": "id", + "destination_attribute_default": null, + "destination_attribute_generated": null, + "index?": false, + "match_type": null, + "match_with": null, + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "name": "properties_member_id_fkey", + "on_delete": null, + "on_update": null, + "primary_key?": true, + "schema": "public", + "table": "members" + }, + "size": null, + "source": "member_id", + "type": "uuid" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": { + "deferrable": false, + "destination_attribute": "id", + "destination_attribute_default": null, + "destination_attribute_generated": null, + "index?": false, + "match_type": null, + "match_with": null, + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "name": "properties_property_type_id_fkey", + "on_delete": null, + "on_update": null, + "primary_key?": true, + "schema": "public", + "table": "property_types" + }, + "size": null, + "source": "property_type_id", + "type": "uuid" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "F2A42A3427E0428637F465E4F357A3BE21B33231F94CF77B4843084128F6BDA5", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "properties" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/property_types/20250514151922.json b/priv/resource_snapshots/repo/property_types/20250514151922.json new file mode 100644 index 0000000..5da5fa8 --- /dev/null +++ b/priv/resource_snapshots/repo/property_types/20250514151922.json @@ -0,0 +1,94 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"gen_random_uuid()\")", + "generated?": false, + "primary_key?": true, + "references": null, + "size": null, + "source": "id", + "type": "uuid" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "name", + "type": "text" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "type", + "type": "text" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "description", + "type": "text" + }, + { + "allow_nil?": false, + "default": "false", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "immutable", + "type": "boolean" + }, + { + "allow_nil?": false, + "default": "false", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "required", + "type": "boolean" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "47210108DE1E7B2A20A67205E875B3440526941E61AB95B166976E8CD8AA0955", + "identities": [ + { + "all_tenants?": false, + "base_filter": null, + "index_name": "property_types_unique_name_index", + "keys": [ + { + "type": "atom", + "value": "name" + } + ], + "name": "unique_name", + "nils_distinct?": true, + "where": null + } + ], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "property_types" +} \ No newline at end of file From 719992925799edc8cb6c2d2af60b88a3b5bf4d05 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 7 May 2025 19:20:19 +0200 Subject: [PATCH 2/5] add liveview --- lib/mv_web/member_live/form_component.ex | 127 ++++++++++++++++++ lib/mv_web/member_live/index.ex | 99 ++++++++++++++ lib/mv_web/member_live/show.ex | 57 ++++++++ lib/mv_web/property_live/form_component.ex | 77 +++++++++++ lib/mv_web/property_live/index.ex | 99 ++++++++++++++ lib/mv_web/property_live/show.ex | 57 ++++++++ .../property_type_live/form_component.ex | 81 +++++++++++ lib/mv_web/property_type_live/index.ex | 103 ++++++++++++++ lib/mv_web/property_type_live/show.ex | 61 +++++++++ lib/mv_web/router.ex | 17 +++ 10 files changed, 778 insertions(+) create mode 100644 lib/mv_web/member_live/form_component.ex create mode 100644 lib/mv_web/member_live/index.ex create mode 100644 lib/mv_web/member_live/show.ex create mode 100644 lib/mv_web/property_live/form_component.ex create mode 100644 lib/mv_web/property_live/index.ex create mode 100644 lib/mv_web/property_live/show.ex create mode 100644 lib/mv_web/property_type_live/form_component.ex create mode 100644 lib/mv_web/property_type_live/index.ex create mode 100644 lib/mv_web/property_type_live/show.ex diff --git a/lib/mv_web/member_live/form_component.ex b/lib/mv_web/member_live/form_component.ex new file mode 100644 index 0000000..b91d3c0 --- /dev/null +++ b/lib/mv_web/member_live/form_component.ex @@ -0,0 +1,127 @@ +defmodule MvWeb.MemberLive.FormComponent do + use MvWeb, :live_component + + @impl true + def mount(socket) do + {:ok, property_types} = Mv.Membership.list_property_types() + + initial_properties = + Enum.map(property_types, fn pt -> + %{ + "property_type_id" => pt.id, + "value" => nil + } + end) + + {:ok, assign(socket, property_types: property_types, initial_properties: initial_properties)} + end + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage member records and their properties. + + + <.simple_form + for={@form} + id="member-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.inputs_for :let={f_property} field={@form[:properties]}> + <% type = Enum.find(@property_types, &(&1.id == f_property[:property_type_id].value)) %> + <.input field={f_property[:value]} label={type && type.name} /> + + + + <:actions> + <.button phx-disable-with="Saving...">Save Member + + +
+ """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"member" => member_params}, socket) do + {:noreply, assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, member_params))} + end + + def handle_event("save", %{"member" => member_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: member_params) do + {:ok, member} -> + notify_parent({:saved, member}) + + socket = + socket + |> put_flash(:info, "Member #{socket.assigns.form.source.type}d successfully") + |> push_patch(to: socket.assigns.patch) + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp assign_form(%{assigns: %{member: member}} = socket) do + form = + if member do + {:ok, member} = Ash.load(member, properties: [:property_type]) + + existing_properties = + member.properties + |> Enum.map(& &1.property_type_id) + + is_missing_property = fn i -> + not Enum.member?(existing_properties, Map.get(i, "property_type_id")) + end + + form = + AshPhoenix.Form.for_update( + member, + :update_member, + api: Mv.Membership, + as: "member", + forms: [auto?: true] + ) + + missing_properties = Enum.filter(socket.assigns[:initial_properties], is_missing_property) + + Enum.reduce( + missing_properties, + form, + &AshPhoenix.Form.add_form(&2, [:properties], params: &1) + ) + else + AshPhoenix.Form.for_create( + Mv.Membership.Member, + :create_member, + api: Mv.Membership, + as: "member", + params: %{"properties" => socket.assigns[:initial_properties]}, + forms: [auto?: true] + ) + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/member_live/index.ex b/lib/mv_web/member_live/index.ex new file mode 100644 index 0000000..4e37429 --- /dev/null +++ b/lib/mv_web/member_live/index.ex @@ -0,0 +1,99 @@ +defmodule MvWeb.MemberLive.Index do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Listing Members + <:actions> + <.link patch={~p"/members/new"}> + <.button>New Member + + + + + <.table + id="members" + rows={@streams.members} + row_click={fn {_id, member} -> JS.navigate(~p"/members/#{member}") end} + > + <:col :let={{_id, member}} label="Id">{member.id} + + <:action :let={{_id, member}}> +
+ <.link navigate={~p"/members/#{member}"}>Show +
+ + <.link patch={~p"/members/#{member}/edit"}>Edit + + + <:action :let={{id, member}}> + <.link + phx-click={JS.push("delete", value: %{id: member.id}) |> hide("##{id}")} + data-confirm="Are you sure?" + > + Delete + + + + + <.modal + :if={@live_action in [:new, :edit]} + id="member-modal" + show + on_cancel={JS.patch(~p"/members")} + > + <.live_component + module={MvWeb.MemberLive.FormComponent} + id={(@member && @member.id) || :new} + title={@page_title} + action={@live_action} + member={@member} + patch={~p"/members"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, stream(socket, :members, Ash.read!(Mv.Membership.Member))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Member") + |> assign(:member, Ash.get!(Mv.Membership.Member, id)) + end + + defp apply_action(socket, :new, _params) do + socket + |> assign(:page_title, "New Member") + |> assign(:member, nil) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Members") + |> assign(:member, nil) + end + + @impl true + def handle_info({MvWeb.MemberLive.FormComponent, {:saved, member}}, socket) do + {:noreply, stream_insert(socket, :members, member)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + member = Ash.get!(Mv.Membership.Member, id) + Ash.destroy!(member) + + {:noreply, stream_delete(socket, :members, member)} + end +end diff --git a/lib/mv_web/member_live/show.ex b/lib/mv_web/member_live/show.ex new file mode 100644 index 0000000..47e0f92 --- /dev/null +++ b/lib/mv_web/member_live/show.ex @@ -0,0 +1,57 @@ +defmodule MvWeb.MemberLive.Show do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Member {@member.id} + <:subtitle>This is a member record from your database. + + <:actions> + <.link patch={~p"/members/#{@member}/show/edit"} phx-click={JS.push_focus()}> + <.button>Edit member + + + + + <.list> + <:item title="Id">{@member.id} + + + <.back navigate={~p"/members"}>Back to members + + <.modal + :if={@live_action == :edit} + id="member-modal" + show + on_cancel={JS.patch(~p"/members/#{@member}")} + > + <.live_component + module={MvWeb.MemberLive.FormComponent} + id={@member.id} + title={@page_title} + action={@live_action} + member={@member} + patch={~p"/members/#{@member}"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:member, Ash.get!(Mv.Membership.Member, id))} + end + + defp page_title(:show), do: "Show Member" + defp page_title(:edit), do: "Edit Member" +end diff --git a/lib/mv_web/property_live/form_component.ex b/lib/mv_web/property_live/form_component.ex new file mode 100644 index 0000000..73461be --- /dev/null +++ b/lib/mv_web/property_live/form_component.ex @@ -0,0 +1,77 @@ +defmodule MvWeb.PropertyLive.FormComponent do + use MvWeb, :live_component + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage property records in your database. + + + <.simple_form + for={@form} + id="property-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.input field={@form[:value]} type="text" label="Value" /><.input + field={@form[:member_id]} + type="text" + label="Member" + /><.input field={@form[:property_type_id]} type="text" label="Property type" /> + + <:actions> + <.button phx-disable-with="Saving...">Save Property + + +
+ """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"property" => property_params}, socket) do + {:noreply, + assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, property_params))} + end + + def handle_event("save", %{"property" => property_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: property_params) do + {:ok, property} -> + notify_parent({:saved, property}) + + socket = + socket + |> put_flash(:info, "Property #{socket.assigns.form.source.type}d successfully") + |> push_patch(to: socket.assigns.patch) + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp assign_form(%{assigns: %{property: property}} = socket) do + form = + if property do + AshPhoenix.Form.for_update(property, :update, as: "property") + else + AshPhoenix.Form.for_create(Mv.Membership.Property, :create, as: "property") + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/property_live/index.ex b/lib/mv_web/property_live/index.ex new file mode 100644 index 0000000..4e43aee --- /dev/null +++ b/lib/mv_web/property_live/index.ex @@ -0,0 +1,99 @@ +defmodule MvWeb.PropertyLive.Index do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Listing Properties + <:actions> + <.link patch={~p"/properties/new"}> + <.button>New Property + + + + + <.table + id="properties" + rows={@streams.properties} + row_click={fn {_id, property} -> JS.navigate(~p"/properties/#{property}") end} + > + <:col :let={{_id, property}} label="Id">{property.id} + + <:action :let={{_id, property}}> +
+ <.link navigate={~p"/properties/#{property}"}>Show +
+ + <.link patch={~p"/properties/#{property}/edit"}>Edit + + + <:action :let={{id, property}}> + <.link + phx-click={JS.push("delete", value: %{id: property.id}) |> hide("##{id}")} + data-confirm="Are you sure?" + > + Delete + + + + + <.modal + :if={@live_action in [:new, :edit]} + id="property-modal" + show + on_cancel={JS.patch(~p"/properties")} + > + <.live_component + module={MvWeb.PropertyLive.FormComponent} + id={(@property && @property.id) || :new} + title={@page_title} + action={@live_action} + property={@property} + patch={~p"/properties"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, stream(socket, :properties, Ash.read!(Mv.Membership.Property))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Property") + |> assign(:property, Ash.get!(Mv.Membership.Property, id)) + end + + defp apply_action(socket, :new, _params) do + socket + |> assign(:page_title, "New Property") + |> assign(:property, nil) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Properties") + |> assign(:property, nil) + end + + @impl true + def handle_info({MvWeb.PropertyLive.FormComponent, {:saved, property}}, socket) do + {:noreply, stream_insert(socket, :properties, property)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + property = Ash.get!(Mv.Membership.Property, id) + Ash.destroy!(property) + + {:noreply, stream_delete(socket, :properties, property)} + end +end diff --git a/lib/mv_web/property_live/show.ex b/lib/mv_web/property_live/show.ex new file mode 100644 index 0000000..e1a5a65 --- /dev/null +++ b/lib/mv_web/property_live/show.ex @@ -0,0 +1,57 @@ +defmodule MvWeb.PropertyLive.Show do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Property {@property.id} + <:subtitle>This is a property record from your database. + + <:actions> + <.link patch={~p"/properties/#{@property}/show/edit"} phx-click={JS.push_focus()}> + <.button>Edit property + + + + + <.list> + <:item title="Id">{@property.id} + + + <.back navigate={~p"/properties"}>Back to properties + + <.modal + :if={@live_action == :edit} + id="property-modal" + show + on_cancel={JS.patch(~p"/properties/#{@property}")} + > + <.live_component + module={MvWeb.PropertyLive.FormComponent} + id={@property.id} + title={@page_title} + action={@live_action} + property={@property} + patch={~p"/properties/#{@property}"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:property, Ash.get!(Mv.Membership.Property, id))} + end + + defp page_title(:show), do: "Show Property" + defp page_title(:edit), do: "Edit Property" +end diff --git a/lib/mv_web/property_type_live/form_component.ex b/lib/mv_web/property_type_live/form_component.ex new file mode 100644 index 0000000..1504f2a --- /dev/null +++ b/lib/mv_web/property_type_live/form_component.ex @@ -0,0 +1,81 @@ +defmodule MvWeb.PropertyTypeLive.FormComponent do + use MvWeb, :live_component + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage property_type records in your database. + + + <.simple_form + for={@form} + id="property_type-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.input field={@form[:name]} type="text" label="Name" /><.input + field={@form[:type]} + type="text" + label="Type" + /><.input field={@form[:description]} type="text" label="Description" /><.input + field={@form[:immutable]} + type="checkbox" + label="Immutable" + /><.input field={@form[:required]} type="checkbox" label="Required" /> + + <:actions> + <.button phx-disable-with="Saving...">Save Property type + + +
+ """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"property_type" => property_type_params}, socket) do + {:noreply, + assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, property_type_params))} + end + + def handle_event("save", %{"property_type" => property_type_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: property_type_params) do + {:ok, property_type} -> + notify_parent({:saved, property_type}) + + socket = + socket + |> put_flash(:info, "Property type #{socket.assigns.form.source.type}d successfully") + |> push_patch(to: socket.assigns.patch) + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp assign_form(%{assigns: %{property_type: property_type}} = socket) do + form = + if property_type do + AshPhoenix.Form.for_update(property_type, :update, as: "property_type") + else + AshPhoenix.Form.for_create(Mv.Membership.PropertyType, :create, as: "property_type") + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/property_type_live/index.ex b/lib/mv_web/property_type_live/index.ex new file mode 100644 index 0000000..f100fae --- /dev/null +++ b/lib/mv_web/property_type_live/index.ex @@ -0,0 +1,103 @@ +defmodule MvWeb.PropertyTypeLive.Index do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Listing Property types + <:actions> + <.link patch={~p"/property_types/new"}> + <.button>New Property type + + + + + <.table + id="property_types" + rows={@streams.property_types} + row_click={fn {_id, property_type} -> JS.navigate(~p"/property_types/#{property_type}") end} + > + <:col :let={{_id, property_type}} label="Id">{property_type.id} + + <:col :let={{_id, property_type}} label="Name">{property_type.name} + + <:col :let={{_id, property_type}} label="Description">{property_type.description} + + <:action :let={{_id, property_type}}> +
+ <.link navigate={~p"/property_types/#{property_type}"}>Show +
+ + <.link patch={~p"/property_types/#{property_type}/edit"}>Edit + + + <:action :let={{id, property_type}}> + <.link + phx-click={JS.push("delete", value: %{id: property_type.id}) |> hide("##{id}")} + data-confirm="Are you sure?" + > + Delete + + + + + <.modal + :if={@live_action in [:new, :edit]} + id="property_type-modal" + show + on_cancel={JS.patch(~p"/property_types")} + > + <.live_component + module={MvWeb.PropertyTypeLive.FormComponent} + id={(@property_type && @property_type.id) || :new} + title={@page_title} + action={@live_action} + property_type={@property_type} + patch={~p"/property_types"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, stream(socket, :property_types, Ash.read!(Mv.Membership.PropertyType))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Property type") + |> assign(:property_type, Ash.get!(Mv.Membership.PropertyType, id)) + end + + defp apply_action(socket, :new, _params) do + socket + |> assign(:page_title, "New Property type") + |> assign(:property_type, nil) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Property types") + |> assign(:property_type, nil) + end + + @impl true + def handle_info({MvWeb.PropertyTypeLive.FormComponent, {:saved, property_type}}, socket) do + {:noreply, stream_insert(socket, :property_types, property_type)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + property_type = Ash.get!(Mv.Membership.PropertyType, id) + Ash.destroy!(property_type) + + {:noreply, stream_delete(socket, :property_types, property_type)} + end +end diff --git a/lib/mv_web/property_type_live/show.ex b/lib/mv_web/property_type_live/show.ex new file mode 100644 index 0000000..b39021c --- /dev/null +++ b/lib/mv_web/property_type_live/show.ex @@ -0,0 +1,61 @@ +defmodule MvWeb.PropertyTypeLive.Show do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Property type {@property_type.id} + <:subtitle>This is a property_type record from your database. + + <:actions> + <.link patch={~p"/property_types/#{@property_type}/show/edit"} phx-click={JS.push_focus()}> + <.button>Edit property_type + + + + + <.list> + <:item title="Id">{@property_type.id} + + <:item title="Name">{@property_type.name} + + <:item title="Description">{@property_type.description} + + + <.back navigate={~p"/property_types"}>Back to property_types + + <.modal + :if={@live_action == :edit} + id="property_type-modal" + show + on_cancel={JS.patch(~p"/property_types/#{@property_type}")} + > + <.live_component + module={MvWeb.PropertyTypeLive.FormComponent} + id={@property_type.id} + title={@page_title} + action={@live_action} + property_type={@property_type} + patch={~p"/property_types/#{@property_type}"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:property_type, Ash.get!(Mv.Membership.PropertyType, id))} + end + + defp page_title(:show), do: "Show Property type" + defp page_title(:edit), do: "Edit Property type" +end diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex index c8525e9..3e9bdca 100644 --- a/lib/mv_web/router.ex +++ b/lib/mv_web/router.ex @@ -18,6 +18,23 @@ defmodule MvWeb.Router do pipe_through :browser get "/", PageController, :home + live "/members", MemberLive.Index, :index + live "/members/new", MemberLive.Index, :new + live "/members/:id/edit", MemberLive.Index, :edit + live "/members/:id", MemberLive.Show, :show + live "/members/:id/show/edit", MemberLive.Show, :edit + + live "/property_types", PropertyTypeLive.Index, :index + live "/property_types/new", PropertyTypeLive.Index, :new + live "/property_types/:id/edit", PropertyTypeLive.Index, :edit + live "/property_types/:id", PropertyTypeLive.Show, :show + live "/property_types/:id/show/edit", PropertyTypeLive.Show, :edit + + live "/properties", PropertyLive.Index, :index + live "/properties/new", PropertyLive.Index, :new + live "/properties/:id/edit", PropertyLive.Index, :edit + live "/properties/:id", PropertyLive.Show, :show + live "/properties/:id/show/edit", PropertyLive.Show, :edit end # Other scopes may use custom stacks. From a194a3494fce781e272800153723178ba6698e23 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 14 May 2025 17:59:47 +0200 Subject: [PATCH 3/5] chore(drone): don't trigger renovate on each push --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index df88740..7636495 100644 --- a/.drone.yml +++ b/.drone.yml @@ -71,7 +71,6 @@ name: renovate trigger: event: - cron - - push - custom environment: From 74cb874f73849a313de38598476a82fe29714705 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 28 Apr 2025 17:56:58 +0200 Subject: [PATCH 4/5] member and properties --- config/config.exs | 3 +- lib/membership/member.ex | 35 +++++++ lib/membership/membership.ex | 27 ++++++ lib/membership/property.ex | 28 ++++++ lib/membership/property_type.ex | 43 ++++++++ .../20250514151922_initial_migration.exs | 72 ++++++++++++++ priv/repo/seeds.exs | 28 ++++++ .../repo/members/20250514151922.json | 29 ++++++ .../repo/properties/20250514151922.json | 97 +++++++++++++++++++ .../repo/property_types/20250514151922.json | 94 ++++++++++++++++++ 10 files changed, 455 insertions(+), 1 deletion(-) create mode 100644 lib/membership/member.ex create mode 100644 lib/membership/membership.ex create mode 100644 lib/membership/property.ex create mode 100644 lib/membership/property_type.ex create mode 100644 priv/repo/migrations/20250514151922_initial_migration.exs create mode 100644 priv/resource_snapshots/repo/members/20250514151922.json create mode 100644 priv/resource_snapshots/repo/properties/20250514151922.json create mode 100644 priv/resource_snapshots/repo/property_types/20250514151922.json diff --git a/config/config.exs b/config/config.exs index cf13cb1..a43af46 100644 --- a/config/config.exs +++ b/config/config.exs @@ -48,7 +48,8 @@ config :spark, config :mv, ecto_repos: [Mv.Repo], - generators: [timestamp_type: :utc_datetime] + generators: [timestamp_type: :utc_datetime], + ash_domains: [Mv.Membership] # Configures the endpoint config :mv, MvWeb.Endpoint, diff --git a/lib/membership/member.ex b/lib/membership/member.ex new file mode 100644 index 0000000..0538f45 --- /dev/null +++ b/lib/membership/member.ex @@ -0,0 +1,35 @@ +defmodule Mv.Membership.Member do + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "members" + repo Mv.Repo + end + + actions do + defaults [:read, :destroy] + + create :create_member do + primary? true + argument :properties, {:array, :map} + change manage_relationship(:properties, type: :create) + end + + update :update_member do + primary? true + require_atomic? false + argument :properties, {:array, :map} + change manage_relationship(:properties, on_match: :update, on_no_match: :create) + end + end + + attributes do + uuid_v7_primary_key :id + end + + relationships do + has_many :properties, Mv.Membership.Property + end +end diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex new file mode 100644 index 0000000..b766a13 --- /dev/null +++ b/lib/membership/membership.ex @@ -0,0 +1,27 @@ +defmodule Mv.Membership do + use Ash.Domain, + extensions: [AshPhoenix] + + resources do + resource Mv.Membership.Member do + define :create_member, action: :create_member + define :list_members, action: :read + define :update_member, action: :update_member + define :destroy_member, action: :destroy + end + + resource Mv.Membership.Property do + define :create_property, action: :create + define :list_property, action: :read + define :update_property, action: :update + define :destroy_property, action: :destroy + end + + resource Mv.Membership.PropertyType do + define :create_property_type, action: :create + define :list_property_types, action: :read + define :update_property_type, action: :update + define :destroy_property_type, action: :destroy + end + end +end diff --git a/lib/membership/property.ex b/lib/membership/property.ex new file mode 100644 index 0000000..433fc63 --- /dev/null +++ b/lib/membership/property.ex @@ -0,0 +1,28 @@ +defmodule Mv.Membership.Property do + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "properties" + repo Mv.Repo + end + + actions do + defaults [:create, :read, :update, :destroy] + default_accept [:value, :member_id, :property_type_id] + end + + attributes do + uuid_primary_key :id + + attribute :value, :string, + description: "Speichert den Wert, Typ-Interpretation per property_type.typ" + end + + relationships do + belongs_to :member, Mv.Membership.Member + + belongs_to :property_type, Mv.Membership.PropertyType + end +end diff --git a/lib/membership/property_type.ex b/lib/membership/property_type.ex new file mode 100644 index 0000000..560f679 --- /dev/null +++ b/lib/membership/property_type.ex @@ -0,0 +1,43 @@ +defmodule Mv.Membership.PropertyType do + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "property_types" + repo Mv.Repo + end + + actions do + defaults [:create, :read, :update, :destroy] + default_accept [:name, :type, :description, :immutable, :required] + end + + attributes do + uuid_primary_key :id + + attribute :name, :string, allow_nil?: false, public?: true + + attribute :type, :string, + allow_nil?: false, + description: "Definies the datatype `Property.value` is interpreted as" + + attribute :description, :string, allow_nil?: true, public?: true + + attribute :immutable, :boolean, + default: false, + allow_nil?: false + + attribute :required, :boolean, + default: false, + allow_nil?: false + end + + relationships do + has_many :properties, Mv.Membership.Property + end + + identities do + identity :unique_name, [:name] + end +end diff --git a/priv/repo/migrations/20250514151922_initial_migration.exs b/priv/repo/migrations/20250514151922_initial_migration.exs new file mode 100644 index 0000000..64915c2 --- /dev/null +++ b/priv/repo/migrations/20250514151922_initial_migration.exs @@ -0,0 +1,72 @@ +defmodule Mv.Repo.Migrations.InitialMigration do + @moduledoc """ + Updates resources based on their most recent snapshots. + + This file was autogenerated with `mix ash_postgres.generate_migrations` + """ + + use Ecto.Migration + + def up do + create table(:property_types, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :name, :text, null: false + add :type, :text, null: false + add :description, :text + add :immutable, :boolean, null: false, default: false + add :required, :boolean, null: false, default: false + end + + create unique_index(:property_types, [:name], name: "property_types_unique_name_index") + + create table(:properties, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :value, :text + add :member_id, :uuid + add :property_type_id, :uuid + end + + create table(:members, primary_key: false) do + add :id, :uuid, null: false, default: fragment("uuid_generate_v7()"), primary_key: true + end + + alter table(:properties) do + modify :member_id, + references(:members, + column: :id, + name: "properties_member_id_fkey", + type: :uuid, + prefix: "public" + ) + + modify :property_type_id, + references(:property_types, + column: :id, + name: "properties_property_type_id_fkey", + type: :uuid, + prefix: "public" + ) + end + end + + def down do + drop constraint(:properties, "properties_member_id_fkey") + + drop constraint(:properties, "properties_property_type_id_fkey") + + alter table(:properties) do + modify :property_type_id, :uuid + modify :member_id, :uuid + end + + drop table(:members) + + drop table(:properties) + + drop_if_exists unique_index(:property_types, [:name], + name: "property_types_unique_name_index" + ) + + drop table(:property_types) + end +end diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 456772e..8fca144 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -9,3 +9,31 @@ # # We recommend using the bang functions (`insert!`, `update!` # and so on) as they will fail if something goes wrong. + +alias Mv.Membership + +for attrs <- [ + %{ + name: "Vorname", + type: "string", + description: "Vorname des Mitglieds", + immutable: true, + required: true + }, + %{ + name: "Email", + type: "string", + description: "Email-Adresse des Mitglieds", + immutable: true, + required: true + } + ] do + # upsert?: true sorgt dafür, dass bei bestehendem Namen kein Fehler, + # sondern ein Update (hier effektiv No-Op) ausgeführt wird + {:ok, _} = + Membership.create_property_type( + attrs, + upsert?: true, + upsert_identity: :unique_name + ) +end diff --git a/priv/resource_snapshots/repo/members/20250514151922.json b/priv/resource_snapshots/repo/members/20250514151922.json new file mode 100644 index 0000000..df811d8 --- /dev/null +++ b/priv/resource_snapshots/repo/members/20250514151922.json @@ -0,0 +1,29 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"uuid_generate_v7()\")", + "generated?": false, + "primary_key?": true, + "references": null, + "size": null, + "source": "id", + "type": "uuid" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "A0402269CB456075B81CA4CB3A2135A2C88D8B7FD51CD7A23084AA5264FEE344", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "members" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/properties/20250514151922.json b/priv/resource_snapshots/repo/properties/20250514151922.json new file mode 100644 index 0000000..0707bcf --- /dev/null +++ b/priv/resource_snapshots/repo/properties/20250514151922.json @@ -0,0 +1,97 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"gen_random_uuid()\")", + "generated?": false, + "primary_key?": true, + "references": null, + "size": null, + "source": "id", + "type": "uuid" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "value", + "type": "text" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": { + "deferrable": false, + "destination_attribute": "id", + "destination_attribute_default": null, + "destination_attribute_generated": null, + "index?": false, + "match_type": null, + "match_with": null, + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "name": "properties_member_id_fkey", + "on_delete": null, + "on_update": null, + "primary_key?": true, + "schema": "public", + "table": "members" + }, + "size": null, + "source": "member_id", + "type": "uuid" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": { + "deferrable": false, + "destination_attribute": "id", + "destination_attribute_default": null, + "destination_attribute_generated": null, + "index?": false, + "match_type": null, + "match_with": null, + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "name": "properties_property_type_id_fkey", + "on_delete": null, + "on_update": null, + "primary_key?": true, + "schema": "public", + "table": "property_types" + }, + "size": null, + "source": "property_type_id", + "type": "uuid" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "F2A42A3427E0428637F465E4F357A3BE21B33231F94CF77B4843084128F6BDA5", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "properties" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/property_types/20250514151922.json b/priv/resource_snapshots/repo/property_types/20250514151922.json new file mode 100644 index 0000000..5da5fa8 --- /dev/null +++ b/priv/resource_snapshots/repo/property_types/20250514151922.json @@ -0,0 +1,94 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"gen_random_uuid()\")", + "generated?": false, + "primary_key?": true, + "references": null, + "size": null, + "source": "id", + "type": "uuid" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "name", + "type": "text" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "type", + "type": "text" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "description", + "type": "text" + }, + { + "allow_nil?": false, + "default": "false", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "immutable", + "type": "boolean" + }, + { + "allow_nil?": false, + "default": "false", + "generated?": false, + "primary_key?": false, + "references": null, + "size": null, + "source": "required", + "type": "boolean" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "47210108DE1E7B2A20A67205E875B3440526941E61AB95B166976E8CD8AA0955", + "identities": [ + { + "all_tenants?": false, + "base_filter": null, + "index_name": "property_types_unique_name_index", + "keys": [ + { + "type": "atom", + "value": "name" + } + ], + "name": "unique_name", + "nils_distinct?": true, + "where": null + } + ], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "property_types" +} \ No newline at end of file From 5906d84d0f5d2474ec4b92c08c015674abbc48b4 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 7 May 2025 19:20:19 +0200 Subject: [PATCH 5/5] add liveview --- lib/mv_web/member_live/form_component.ex | 127 ++++++++++++++++++ lib/mv_web/member_live/index.ex | 99 ++++++++++++++ lib/mv_web/member_live/show.ex | 57 ++++++++ lib/mv_web/property_live/form_component.ex | 77 +++++++++++ lib/mv_web/property_live/index.ex | 99 ++++++++++++++ lib/mv_web/property_live/show.ex | 57 ++++++++ .../property_type_live/form_component.ex | 81 +++++++++++ lib/mv_web/property_type_live/index.ex | 103 ++++++++++++++ lib/mv_web/property_type_live/show.ex | 61 +++++++++ lib/mv_web/router.ex | 17 +++ 10 files changed, 778 insertions(+) create mode 100644 lib/mv_web/member_live/form_component.ex create mode 100644 lib/mv_web/member_live/index.ex create mode 100644 lib/mv_web/member_live/show.ex create mode 100644 lib/mv_web/property_live/form_component.ex create mode 100644 lib/mv_web/property_live/index.ex create mode 100644 lib/mv_web/property_live/show.ex create mode 100644 lib/mv_web/property_type_live/form_component.ex create mode 100644 lib/mv_web/property_type_live/index.ex create mode 100644 lib/mv_web/property_type_live/show.ex diff --git a/lib/mv_web/member_live/form_component.ex b/lib/mv_web/member_live/form_component.ex new file mode 100644 index 0000000..b91d3c0 --- /dev/null +++ b/lib/mv_web/member_live/form_component.ex @@ -0,0 +1,127 @@ +defmodule MvWeb.MemberLive.FormComponent do + use MvWeb, :live_component + + @impl true + def mount(socket) do + {:ok, property_types} = Mv.Membership.list_property_types() + + initial_properties = + Enum.map(property_types, fn pt -> + %{ + "property_type_id" => pt.id, + "value" => nil + } + end) + + {:ok, assign(socket, property_types: property_types, initial_properties: initial_properties)} + end + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage member records and their properties. + + + <.simple_form + for={@form} + id="member-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.inputs_for :let={f_property} field={@form[:properties]}> + <% type = Enum.find(@property_types, &(&1.id == f_property[:property_type_id].value)) %> + <.input field={f_property[:value]} label={type && type.name} /> + + + + <:actions> + <.button phx-disable-with="Saving...">Save Member + + +
+ """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"member" => member_params}, socket) do + {:noreply, assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, member_params))} + end + + def handle_event("save", %{"member" => member_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: member_params) do + {:ok, member} -> + notify_parent({:saved, member}) + + socket = + socket + |> put_flash(:info, "Member #{socket.assigns.form.source.type}d successfully") + |> push_patch(to: socket.assigns.patch) + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp assign_form(%{assigns: %{member: member}} = socket) do + form = + if member do + {:ok, member} = Ash.load(member, properties: [:property_type]) + + existing_properties = + member.properties + |> Enum.map(& &1.property_type_id) + + is_missing_property = fn i -> + not Enum.member?(existing_properties, Map.get(i, "property_type_id")) + end + + form = + AshPhoenix.Form.for_update( + member, + :update_member, + api: Mv.Membership, + as: "member", + forms: [auto?: true] + ) + + missing_properties = Enum.filter(socket.assigns[:initial_properties], is_missing_property) + + Enum.reduce( + missing_properties, + form, + &AshPhoenix.Form.add_form(&2, [:properties], params: &1) + ) + else + AshPhoenix.Form.for_create( + Mv.Membership.Member, + :create_member, + api: Mv.Membership, + as: "member", + params: %{"properties" => socket.assigns[:initial_properties]}, + forms: [auto?: true] + ) + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/member_live/index.ex b/lib/mv_web/member_live/index.ex new file mode 100644 index 0000000..4e37429 --- /dev/null +++ b/lib/mv_web/member_live/index.ex @@ -0,0 +1,99 @@ +defmodule MvWeb.MemberLive.Index do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Listing Members + <:actions> + <.link patch={~p"/members/new"}> + <.button>New Member + + + + + <.table + id="members" + rows={@streams.members} + row_click={fn {_id, member} -> JS.navigate(~p"/members/#{member}") end} + > + <:col :let={{_id, member}} label="Id">{member.id} + + <:action :let={{_id, member}}> +
+ <.link navigate={~p"/members/#{member}"}>Show +
+ + <.link patch={~p"/members/#{member}/edit"}>Edit + + + <:action :let={{id, member}}> + <.link + phx-click={JS.push("delete", value: %{id: member.id}) |> hide("##{id}")} + data-confirm="Are you sure?" + > + Delete + + + + + <.modal + :if={@live_action in [:new, :edit]} + id="member-modal" + show + on_cancel={JS.patch(~p"/members")} + > + <.live_component + module={MvWeb.MemberLive.FormComponent} + id={(@member && @member.id) || :new} + title={@page_title} + action={@live_action} + member={@member} + patch={~p"/members"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, stream(socket, :members, Ash.read!(Mv.Membership.Member))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Member") + |> assign(:member, Ash.get!(Mv.Membership.Member, id)) + end + + defp apply_action(socket, :new, _params) do + socket + |> assign(:page_title, "New Member") + |> assign(:member, nil) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Members") + |> assign(:member, nil) + end + + @impl true + def handle_info({MvWeb.MemberLive.FormComponent, {:saved, member}}, socket) do + {:noreply, stream_insert(socket, :members, member)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + member = Ash.get!(Mv.Membership.Member, id) + Ash.destroy!(member) + + {:noreply, stream_delete(socket, :members, member)} + end +end diff --git a/lib/mv_web/member_live/show.ex b/lib/mv_web/member_live/show.ex new file mode 100644 index 0000000..47e0f92 --- /dev/null +++ b/lib/mv_web/member_live/show.ex @@ -0,0 +1,57 @@ +defmodule MvWeb.MemberLive.Show do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Member {@member.id} + <:subtitle>This is a member record from your database. + + <:actions> + <.link patch={~p"/members/#{@member}/show/edit"} phx-click={JS.push_focus()}> + <.button>Edit member + + + + + <.list> + <:item title="Id">{@member.id} + + + <.back navigate={~p"/members"}>Back to members + + <.modal + :if={@live_action == :edit} + id="member-modal" + show + on_cancel={JS.patch(~p"/members/#{@member}")} + > + <.live_component + module={MvWeb.MemberLive.FormComponent} + id={@member.id} + title={@page_title} + action={@live_action} + member={@member} + patch={~p"/members/#{@member}"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:member, Ash.get!(Mv.Membership.Member, id))} + end + + defp page_title(:show), do: "Show Member" + defp page_title(:edit), do: "Edit Member" +end diff --git a/lib/mv_web/property_live/form_component.ex b/lib/mv_web/property_live/form_component.ex new file mode 100644 index 0000000..73461be --- /dev/null +++ b/lib/mv_web/property_live/form_component.ex @@ -0,0 +1,77 @@ +defmodule MvWeb.PropertyLive.FormComponent do + use MvWeb, :live_component + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage property records in your database. + + + <.simple_form + for={@form} + id="property-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.input field={@form[:value]} type="text" label="Value" /><.input + field={@form[:member_id]} + type="text" + label="Member" + /><.input field={@form[:property_type_id]} type="text" label="Property type" /> + + <:actions> + <.button phx-disable-with="Saving...">Save Property + + +
+ """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"property" => property_params}, socket) do + {:noreply, + assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, property_params))} + end + + def handle_event("save", %{"property" => property_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: property_params) do + {:ok, property} -> + notify_parent({:saved, property}) + + socket = + socket + |> put_flash(:info, "Property #{socket.assigns.form.source.type}d successfully") + |> push_patch(to: socket.assigns.patch) + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp assign_form(%{assigns: %{property: property}} = socket) do + form = + if property do + AshPhoenix.Form.for_update(property, :update, as: "property") + else + AshPhoenix.Form.for_create(Mv.Membership.Property, :create, as: "property") + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/property_live/index.ex b/lib/mv_web/property_live/index.ex new file mode 100644 index 0000000..4e43aee --- /dev/null +++ b/lib/mv_web/property_live/index.ex @@ -0,0 +1,99 @@ +defmodule MvWeb.PropertyLive.Index do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Listing Properties + <:actions> + <.link patch={~p"/properties/new"}> + <.button>New Property + + + + + <.table + id="properties" + rows={@streams.properties} + row_click={fn {_id, property} -> JS.navigate(~p"/properties/#{property}") end} + > + <:col :let={{_id, property}} label="Id">{property.id} + + <:action :let={{_id, property}}> +
+ <.link navigate={~p"/properties/#{property}"}>Show +
+ + <.link patch={~p"/properties/#{property}/edit"}>Edit + + + <:action :let={{id, property}}> + <.link + phx-click={JS.push("delete", value: %{id: property.id}) |> hide("##{id}")} + data-confirm="Are you sure?" + > + Delete + + + + + <.modal + :if={@live_action in [:new, :edit]} + id="property-modal" + show + on_cancel={JS.patch(~p"/properties")} + > + <.live_component + module={MvWeb.PropertyLive.FormComponent} + id={(@property && @property.id) || :new} + title={@page_title} + action={@live_action} + property={@property} + patch={~p"/properties"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, stream(socket, :properties, Ash.read!(Mv.Membership.Property))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Property") + |> assign(:property, Ash.get!(Mv.Membership.Property, id)) + end + + defp apply_action(socket, :new, _params) do + socket + |> assign(:page_title, "New Property") + |> assign(:property, nil) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Properties") + |> assign(:property, nil) + end + + @impl true + def handle_info({MvWeb.PropertyLive.FormComponent, {:saved, property}}, socket) do + {:noreply, stream_insert(socket, :properties, property)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + property = Ash.get!(Mv.Membership.Property, id) + Ash.destroy!(property) + + {:noreply, stream_delete(socket, :properties, property)} + end +end diff --git a/lib/mv_web/property_live/show.ex b/lib/mv_web/property_live/show.ex new file mode 100644 index 0000000..e1a5a65 --- /dev/null +++ b/lib/mv_web/property_live/show.ex @@ -0,0 +1,57 @@ +defmodule MvWeb.PropertyLive.Show do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Property {@property.id} + <:subtitle>This is a property record from your database. + + <:actions> + <.link patch={~p"/properties/#{@property}/show/edit"} phx-click={JS.push_focus()}> + <.button>Edit property + + + + + <.list> + <:item title="Id">{@property.id} + + + <.back navigate={~p"/properties"}>Back to properties + + <.modal + :if={@live_action == :edit} + id="property-modal" + show + on_cancel={JS.patch(~p"/properties/#{@property}")} + > + <.live_component + module={MvWeb.PropertyLive.FormComponent} + id={@property.id} + title={@page_title} + action={@live_action} + property={@property} + patch={~p"/properties/#{@property}"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:property, Ash.get!(Mv.Membership.Property, id))} + end + + defp page_title(:show), do: "Show Property" + defp page_title(:edit), do: "Edit Property" +end diff --git a/lib/mv_web/property_type_live/form_component.ex b/lib/mv_web/property_type_live/form_component.ex new file mode 100644 index 0000000..1504f2a --- /dev/null +++ b/lib/mv_web/property_type_live/form_component.ex @@ -0,0 +1,81 @@ +defmodule MvWeb.PropertyTypeLive.FormComponent do + use MvWeb, :live_component + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage property_type records in your database. + + + <.simple_form + for={@form} + id="property_type-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.input field={@form[:name]} type="text" label="Name" /><.input + field={@form[:type]} + type="text" + label="Type" + /><.input field={@form[:description]} type="text" label="Description" /><.input + field={@form[:immutable]} + type="checkbox" + label="Immutable" + /><.input field={@form[:required]} type="checkbox" label="Required" /> + + <:actions> + <.button phx-disable-with="Saving...">Save Property type + + +
+ """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"property_type" => property_type_params}, socket) do + {:noreply, + assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, property_type_params))} + end + + def handle_event("save", %{"property_type" => property_type_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: property_type_params) do + {:ok, property_type} -> + notify_parent({:saved, property_type}) + + socket = + socket + |> put_flash(:info, "Property type #{socket.assigns.form.source.type}d successfully") + |> push_patch(to: socket.assigns.patch) + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp assign_form(%{assigns: %{property_type: property_type}} = socket) do + form = + if property_type do + AshPhoenix.Form.for_update(property_type, :update, as: "property_type") + else + AshPhoenix.Form.for_create(Mv.Membership.PropertyType, :create, as: "property_type") + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/property_type_live/index.ex b/lib/mv_web/property_type_live/index.ex new file mode 100644 index 0000000..f100fae --- /dev/null +++ b/lib/mv_web/property_type_live/index.ex @@ -0,0 +1,103 @@ +defmodule MvWeb.PropertyTypeLive.Index do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Listing Property types + <:actions> + <.link patch={~p"/property_types/new"}> + <.button>New Property type + + + + + <.table + id="property_types" + rows={@streams.property_types} + row_click={fn {_id, property_type} -> JS.navigate(~p"/property_types/#{property_type}") end} + > + <:col :let={{_id, property_type}} label="Id">{property_type.id} + + <:col :let={{_id, property_type}} label="Name">{property_type.name} + + <:col :let={{_id, property_type}} label="Description">{property_type.description} + + <:action :let={{_id, property_type}}> +
+ <.link navigate={~p"/property_types/#{property_type}"}>Show +
+ + <.link patch={~p"/property_types/#{property_type}/edit"}>Edit + + + <:action :let={{id, property_type}}> + <.link + phx-click={JS.push("delete", value: %{id: property_type.id}) |> hide("##{id}")} + data-confirm="Are you sure?" + > + Delete + + + + + <.modal + :if={@live_action in [:new, :edit]} + id="property_type-modal" + show + on_cancel={JS.patch(~p"/property_types")} + > + <.live_component + module={MvWeb.PropertyTypeLive.FormComponent} + id={(@property_type && @property_type.id) || :new} + title={@page_title} + action={@live_action} + property_type={@property_type} + patch={~p"/property_types"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, stream(socket, :property_types, Ash.read!(Mv.Membership.PropertyType))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Property type") + |> assign(:property_type, Ash.get!(Mv.Membership.PropertyType, id)) + end + + defp apply_action(socket, :new, _params) do + socket + |> assign(:page_title, "New Property type") + |> assign(:property_type, nil) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Property types") + |> assign(:property_type, nil) + end + + @impl true + def handle_info({MvWeb.PropertyTypeLive.FormComponent, {:saved, property_type}}, socket) do + {:noreply, stream_insert(socket, :property_types, property_type)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + property_type = Ash.get!(Mv.Membership.PropertyType, id) + Ash.destroy!(property_type) + + {:noreply, stream_delete(socket, :property_types, property_type)} + end +end diff --git a/lib/mv_web/property_type_live/show.ex b/lib/mv_web/property_type_live/show.ex new file mode 100644 index 0000000..b39021c --- /dev/null +++ b/lib/mv_web/property_type_live/show.ex @@ -0,0 +1,61 @@ +defmodule MvWeb.PropertyTypeLive.Show do + use MvWeb, :live_view + + @impl true + def render(assigns) do + ~H""" + <.header> + Property type {@property_type.id} + <:subtitle>This is a property_type record from your database. + + <:actions> + <.link patch={~p"/property_types/#{@property_type}/show/edit"} phx-click={JS.push_focus()}> + <.button>Edit property_type + + + + + <.list> + <:item title="Id">{@property_type.id} + + <:item title="Name">{@property_type.name} + + <:item title="Description">{@property_type.description} + + + <.back navigate={~p"/property_types"}>Back to property_types + + <.modal + :if={@live_action == :edit} + id="property_type-modal" + show + on_cancel={JS.patch(~p"/property_types/#{@property_type}")} + > + <.live_component + module={MvWeb.PropertyTypeLive.FormComponent} + id={@property_type.id} + title={@page_title} + action={@live_action} + property_type={@property_type} + patch={~p"/property_types/#{@property_type}"} + /> + + """ + end + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:property_type, Ash.get!(Mv.Membership.PropertyType, id))} + end + + defp page_title(:show), do: "Show Property type" + defp page_title(:edit), do: "Edit Property type" +end diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex index c8525e9..3e9bdca 100644 --- a/lib/mv_web/router.ex +++ b/lib/mv_web/router.ex @@ -18,6 +18,23 @@ defmodule MvWeb.Router do pipe_through :browser get "/", PageController, :home + live "/members", MemberLive.Index, :index + live "/members/new", MemberLive.Index, :new + live "/members/:id/edit", MemberLive.Index, :edit + live "/members/:id", MemberLive.Show, :show + live "/members/:id/show/edit", MemberLive.Show, :edit + + live "/property_types", PropertyTypeLive.Index, :index + live "/property_types/new", PropertyTypeLive.Index, :new + live "/property_types/:id/edit", PropertyTypeLive.Index, :edit + live "/property_types/:id", PropertyTypeLive.Show, :show + live "/property_types/:id/show/edit", PropertyTypeLive.Show, :edit + + live "/properties", PropertyLive.Index, :index + live "/properties/new", PropertyLive.Index, :new + live "/properties/:id/edit", PropertyLive.Index, :edit + live "/properties/:id", PropertyLive.Show, :show + live "/properties/:id/show/edit", PropertyLive.Show, :edit end # Other scopes may use custom stacks.