From 77632bedec78d8cc61ac4d13cf1aa90977d7d56e Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 28 Apr 2025 14:24:30 +0200 Subject: [PATCH 1/5] Add basic CI setup (#30) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Rafael Epplée Reviewed-on: https://git.local-it.org/local-it/mitgliederverwaltung/pulls/30 Co-authored-by: Moritz Co-committed-by: Moritz --- .drone.yml | 63 ++++++++++++++++++-- .editorconfig | 5 ++ .sobelow-conf | 13 ++++ Justfile | 17 +++++- config/test.exs | 2 +- lib/mv_web/components/layouts/root.html.heex | 2 +- mix.exs | 5 +- mix.lock | 4 ++ 8 files changed, 102 insertions(+), 9 deletions(-) create mode 100644 .editorconfig create mode 100644 .sobelow-conf diff --git a/.drone.yml b/.drone.yml index c868aff..2017f32 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,10 +2,63 @@ kind: pipeline type: docker name: default +services: + - name: postgres + image: docker.io/library/postgres:17.2 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + +trigger: + event: + - push + steps: - - name: greeting - image: alpine + - name: check + image: docker.io/library/elixir:1.18.3-otp-27 commands: - - echo Hello - - echo beautiful - - echo World + # Install hex package manager + - mix local.hex --force + # Fetch dependencies + - mix deps.get + # Check for compilation errors & warnings + - mix compile --warnings-as-errors + # Check formatting + - mix format --check-formatted + # Security checks + - mix sobelow --config + # Check dependencies for known vulnerabilities + - mix deps.audit + # Check for dependencies that are not maintained anymore + - mix hex.audit + # Provide hints for improving code quality + - mix credo + + - name: wait_for_postgres + image: docker.io/library/postgres:17.2 + commands: + # Wait for postgres to become available + - | + for i in {1..20}; do + if pg_isready -h postgres -U postgres; then + exit 0 + else + true + fi + sleep 2 + done + echo "Postgres did not become available, aborting." + exit 1 + + - name: test + image: docker.io/library/elixir:1.18.3-otp-27 + environment: + MIX_ENV: test + TEST_POSTGRES_HOST: postgres + commands: + # Install hex package manager + - mix local.hex --force + # Fetch dependencies + - mix deps.get + # Run tests + - mix test diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..867ea98 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*.yml] +indent_size = 2 +indent_style = space \ No newline at end of file diff --git a/.sobelow-conf b/.sobelow-conf new file mode 100644 index 0000000..9ea11af --- /dev/null +++ b/.sobelow-conf @@ -0,0 +1,13 @@ +[ + verbose: false, + private: false, + skip: false, + router: nil, + exit: false, + format: "txt", + out: nil, + threshold: :low, + ignore: ["Config.CSP"], + ignore_files: [], + version: false, +] diff --git a/Justfile b/Justfile index 3e5fe17..e2ee7ee 100644 --- a/Justfile +++ b/Justfile @@ -8,4 +8,19 @@ migrate-database: mix ash.setup reset-database: - mix ash.reset \ No newline at end of file + mix ash.reset + +ci-dev: lint audit test + +lint: + mix format --check-formatted + mix compile --warnings-as-errors + mix credo + +audit: + mix sobelow --config + mix deps.audit + mix hex.audit + +test: + mix test \ No newline at end of file diff --git a/config/test.exs b/config/test.exs index 6827af6..00a6a7f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -8,7 +8,7 @@ import Config config :mv, Mv.Repo, username: "postgres", password: "postgres", - hostname: "localhost", + hostname: System.get_env("TEST_POSTGRES_HOST", "localhost"), database: "mv_test#{System.get_env("MIX_TEST_PARTITION")}", pool: Ecto.Adapters.SQL.Sandbox, pool_size: System.schedulers_online() * 2 diff --git a/lib/mv_web/components/layouts/root.html.heex b/lib/mv_web/components/layouts/root.html.heex index 2c2230d..9857506 100644 --- a/lib/mv_web/components/layouts/root.html.heex +++ b/lib/mv_web/components/layouts/root.html.heex @@ -1,7 +1,7 @@ - <%= Application.get_env(:live_debugger, :live_debugger_tags) %> + {Application.get_env(:live_debugger, :live_debugger_tags)} diff --git a/mix.exs b/mix.exs index 2809c9e..687a111 100644 --- a/mix.exs +++ b/mix.exs @@ -65,7 +65,10 @@ defmodule Mv.MixProject do {:gettext, "~> 0.26"}, {:jason, "~> 1.2"}, {:dns_cluster, "~> 0.1.1"}, - {:bandit, "~> 1.5"} + {:bandit, "~> 1.5"}, + {:mix_audit, "~> 2.1", only: [:dev, :test], runtime: false}, + {:sobelow, "~> 0.13", only: [:dev, :test], runtime: false}, + {:credo, "~> 1.7", only: [:dev, :test], runtime: false} ] end diff --git a/mix.lock b/mix.lock index c9778eb..b7190ef 100644 --- a/mix.lock +++ b/mix.lock @@ -5,7 +5,9 @@ "ash_postgres": {:hex, :ash_postgres, "2.5.16", "9fc82621aea3c4777f9a322be8cdce10488f0eed50e7d75465285c131c30ec6b", [:mix], [{:ash, ">= 3.4.69 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.2.68 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, ">= 3.12.1 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.12", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.5.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "d9f328683ea861707f19e89c16c2c4f3527431c50071b2aea4bac6a822f4f448"}, "ash_sql": {:hex, :ash_sql, "0.2.71", "40cabdd0c7af2eaa0096b2b0eae886085fed1e3b326e20434274120e11dec2c5", [:mix], [{:ash, "~> 3.5", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "6e22da3d020aecaca9858f430828c12988c3418d252fa39be3f43fde9fd4224d"}, "bandit": {:hex, :bandit, "1.6.8", "be6fcbe01a74e6cba42ae35f4085acaeae9b2d8d360c0908d0b9addbc2811e47", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "4fc08c8d4733735d175a007ecb25895e84d09292b0180a2e9f16948182c88b6e"}, + "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"}, "castore": {:hex, :castore, "1.0.12", "053f0e32700cbec356280c0e835df425a3be4bc1e0627b714330ad9d0f05497f", [:mix], [], "hexpm", "3dca286b2186055ba0c9449b4e95b97bf1b57b47c1f2644555879e659960c224"}, + "credo": {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"}, "db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"}, "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"}, "dns_cluster": {:hex, :dns_cluster, "0.1.3", "0bc20a2c88ed6cc494f2964075c359f8c2d00e1bf25518a6a6c7fd277c9b0c66", [:mix], [], "hexpm", "46cb7c4a1b3e52c7ad4cbe33ca5079fbde4840dedeafca2baf77996c2da1bc33"}, @@ -29,6 +31,7 @@ "live_debugger": {:hex, :live_debugger, "0.1.5", "e7324a186071ac19885945e4ca7f3257ee07ed8c4ac5862305cab1fd595073aa", [:mix], [{:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 0.20 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "dc9416960bfe12873bc37707d4669797850f4e8ca4fe192f3195330e1c623634"}, "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"}, "mint": {:hex, :mint, "1.7.1", "113fdb2b2f3b59e47c7955971854641c61f378549d73e829e1768de90fc1abf1", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "fceba0a4d0f24301ddee3024ae116df1c3f4bb7a563a731f45fdfeb9d39a231b"}, + "mix_audit": {:hex, :mix_audit, "2.1.4", "0a23d5b07350cdd69001c13882a4f5fb9f90fbd4cbf2ebc190a2ee0d187ea3e9", [:make, :mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "fd807653cc8c1cada2911129c7eb9e985e3cc76ebf26f4dd628bb25bbcaa7099"}, "nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"}, "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"}, "owl": {:hex, :owl, "0.12.2", "65906b525e5c3ef51bab6cba7687152be017aebe1da077bb719a5ee9f7e60762", [:mix], [{:ucwidth, "~> 0.2", [hex: :ucwidth, repo: "hexpm", optional: true]}], "hexpm", "6398efa9e1fea70a04d24231e10dcd66c1ac1aa2da418d20ef5357ec61de2880"}, @@ -47,6 +50,7 @@ "reactor": {:hex, :reactor, "0.15.2", "8c1b3fe0527b7a92b0b22c3f33f2e66858dd069bf1dd51d1031f63cd8cbd1fd5", [:mix], [{:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:iterex, "~> 0.1", [hex: :iterex, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:libgraph, "~> 0.16", [hex: :libgraph, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}, {:ymlr, "~> 5.0", [hex: :ymlr, repo: "hexpm", optional: false]}], "hexpm", "091435a1fa0cab9bc2ed3934b203a0fd190f62e8b6aca63741f9242b8c7631ac"}, "req": {:hex, :req, "0.5.10", "a3a063eab8b7510785a467f03d30a8d95f66f5c3d9495be3474b61459c54376c", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "8a604815743f8a2d3b5de0659fa3137fa4b1cffd636ecb69b30b2b9b2c2559be"}, "rewrite": {:hex, :rewrite, "1.1.2", "f5a5d10f5fed1491a6ff48e078d4585882695962ccc9e6c779bae025d1f92eda", [:mix], [{:glob_ex, "~> 0.1", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "7f8b94b1e3528d0a47b3e8b7bfeca559d2948a65fa7418a9ad7d7712703d39d4"}, + "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"}, "sourceror": {:hex, :sourceror, "1.9.0", "3bf5fe2d017aaabe3866d8a6da097dd7c331e0d2d54e59e21c2b066d47f1e08e", [:mix], [], "hexpm", "d20a9dd5efe162f0d75a307146faa2e17b823ea4f134f662358d70f0332fed82"}, "spark": {:hex, :spark, "2.2.52", "50094275c9bbafa8e5e9eed0ab61983ee209a500e7044914ccf88e9921ae5082", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "f8de8c298bbbf7abd2a80d0ecabcefef65941f397cdbe94ce6165a121b09084f"}, "spitfire": {:hex, :spitfire, "0.2.0", "0de1f519a23f65bde40d316adad53c07a9563f25cc68915d639d8a509a0aad8a", [:mix], [], "hexpm", "743daaee2d81a0d8095431729f478ce49b47ea8943c7d770de86704975cb7775"}, From 45fc52d6fbd321c64024cd3f1563ef90dfc91024 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 28 Apr 2025 17:56:58 +0200 Subject: [PATCH 2/5] WIP 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 ++++++++ .../20250507171618_initial_migration.exs | 63 ++++++++++++ priv/repo/seeds.exs | 28 ++++++ .../repo/attribute/20250507171618.json | 97 +++++++++++++++++++ .../repo/members/20250507171618.json | 29 ++++++ .../repo/property_types/20250507171618.json | 94 ++++++++++++++++++ 10 files changed, 446 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/20250507171618_initial_migration.exs create mode 100644 priv/resource_snapshots/repo/attribute/20250507171618.json create mode 100644 priv/resource_snapshots/repo/members/20250507171618.json create mode 100644 priv/resource_snapshots/repo/property_types/20250507171618.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..14ab4f1 --- /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 "attribute" + 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/20250507171618_initial_migration.exs b/priv/repo/migrations/20250507171618_initial_migration.exs new file mode 100644 index 0000000..c3698d7 --- /dev/null +++ b/priv/repo/migrations/20250507171618_initial_migration.exs @@ -0,0 +1,63 @@ +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(:members, primary_key: false) do + add :id, :uuid, null: false, default: fragment("uuid_generate_v7()"), primary_key: true + end + + create table(:attribute, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :value, :text + + add :member_id, + references(:members, + column: :id, + name: "attribute_member_id_fkey", + type: :uuid, + prefix: "public" + ) + + add :property_type_id, + references(:property_types, + column: :id, + name: "attribute_property_type_id_fkey", + type: :uuid, + prefix: "public" + ) + end + end + + def down do + drop constraint(:attribute, "attribute_member_id_fkey") + + drop constraint(:attribute, "attribute_property_type_id_fkey") + + drop table(:attribute) + + drop table(:members) + + 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/attribute/20250507171618.json b/priv/resource_snapshots/repo/attribute/20250507171618.json new file mode 100644 index 0000000..1f772ae --- /dev/null +++ b/priv/resource_snapshots/repo/attribute/20250507171618.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": "attribute_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": "attribute_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": "13CA0C29CA3D1F92B87271DF1B222CF8ADBB0D56A99575952A1432596F7B4A10", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "attribute" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/members/20250507171618.json b/priv/resource_snapshots/repo/members/20250507171618.json new file mode 100644 index 0000000..df811d8 --- /dev/null +++ b/priv/resource_snapshots/repo/members/20250507171618.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/property_types/20250507171618.json b/priv/resource_snapshots/repo/property_types/20250507171618.json new file mode 100644 index 0000000..5da5fa8 --- /dev/null +++ b/priv/resource_snapshots/repo/property_types/20250507171618.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 b91df051dc120ad54423a2a325a34b958c64c8db Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 7 May 2025 19:20:19 +0200 Subject: [PATCH 3/5] WIP: add liveview --- lib/mv_web/member_live/form_component.ex | 125 ++++++++++++++++++ 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, 776 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..b6830d6 --- /dev/null +++ b/lib/mv_web/member_live/form_component.ex @@ -0,0 +1,125 @@ +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]) + + is_missing_property = fn i -> + not Enum.any?(member.properties, fn p -> + Map.get(i, "property_type_id") == p.property_type_id + end) + 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 9a37f76ab60f7437e1924a6fd79a336831598499 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 28 Apr 2025 17:56:58 +0200 Subject: [PATCH 4/5] WIP 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 ++++++++ .../20250507171618_initial_migration.exs | 63 ++++++++++++ priv/repo/seeds.exs | 28 ++++++ .../repo/attribute/20250507171618.json | 97 +++++++++++++++++++ .../repo/members/20250507171618.json | 29 ++++++ .../repo/property_types/20250507171618.json | 94 ++++++++++++++++++ 10 files changed, 446 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/20250507171618_initial_migration.exs create mode 100644 priv/resource_snapshots/repo/attribute/20250507171618.json create mode 100644 priv/resource_snapshots/repo/members/20250507171618.json create mode 100644 priv/resource_snapshots/repo/property_types/20250507171618.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..14ab4f1 --- /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 "attribute" + 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/20250507171618_initial_migration.exs b/priv/repo/migrations/20250507171618_initial_migration.exs new file mode 100644 index 0000000..c3698d7 --- /dev/null +++ b/priv/repo/migrations/20250507171618_initial_migration.exs @@ -0,0 +1,63 @@ +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(:members, primary_key: false) do + add :id, :uuid, null: false, default: fragment("uuid_generate_v7()"), primary_key: true + end + + create table(:attribute, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :value, :text + + add :member_id, + references(:members, + column: :id, + name: "attribute_member_id_fkey", + type: :uuid, + prefix: "public" + ) + + add :property_type_id, + references(:property_types, + column: :id, + name: "attribute_property_type_id_fkey", + type: :uuid, + prefix: "public" + ) + end + end + + def down do + drop constraint(:attribute, "attribute_member_id_fkey") + + drop constraint(:attribute, "attribute_property_type_id_fkey") + + drop table(:attribute) + + drop table(:members) + + 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/attribute/20250507171618.json b/priv/resource_snapshots/repo/attribute/20250507171618.json new file mode 100644 index 0000000..1f772ae --- /dev/null +++ b/priv/resource_snapshots/repo/attribute/20250507171618.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": "attribute_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": "attribute_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": "13CA0C29CA3D1F92B87271DF1B222CF8ADBB0D56A99575952A1432596F7B4A10", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "attribute" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/members/20250507171618.json b/priv/resource_snapshots/repo/members/20250507171618.json new file mode 100644 index 0000000..df811d8 --- /dev/null +++ b/priv/resource_snapshots/repo/members/20250507171618.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/property_types/20250507171618.json b/priv/resource_snapshots/repo/property_types/20250507171618.json new file mode 100644 index 0000000..5da5fa8 --- /dev/null +++ b/priv/resource_snapshots/repo/property_types/20250507171618.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 a468f3edbef0b0af0ce30d871b34f8237a082ad9 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 7 May 2025 19:20:19 +0200 Subject: [PATCH 5/5] WIP: add liveview --- lib/mv_web/member_live/form_component.ex | 125 ++++++++++++++++++ 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, 776 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..b6830d6 --- /dev/null +++ b/lib/mv_web/member_live/form_component.ex @@ -0,0 +1,125 @@ +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]) + + is_missing_property = fn i -> + not Enum.any?(member.properties, fn p -> + Map.get(i, "property_type_id") == p.property_type_id + end) + 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.