From e2094b915f5b0e9d51c21ebe9b7771500d058b35 Mon Sep 17 00:00:00 2001 From: KKlochko Date: Sun, 20 Apr 2025 18:45:16 +0300 Subject: [PATCH] Update to refactor the unused and deprecated code. --- .../components/my_components/just_search_resources.ex | 2 -- lib/decentralised_book_index_web/live/author_live/edit.ex | 2 +- .../live/author_live/form_component.ex | 4 ++-- .../live/book_live/form_component.ex | 8 ++++---- .../live/dbi_server_live/edit.ex | 2 +- .../live/dbi_server_live/form_component.ex | 4 ++-- .../live/dbi_server_live/index.ex | 1 - .../live/publisher_live/edit.ex | 2 +- .../live/publisher_live/form_component.ex | 4 ++-- .../live/user_live/form_component.ex | 6 +++--- 10 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex b/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex index 32c79fb..55d46c5 100644 --- a/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex +++ b/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex @@ -2,8 +2,6 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.JustSearchResources use Phoenix.Component use DecentralisedBookIndexWeb, :verified_routes - alias DecentralisedBookIndex.Accounts.Role - attr :search_query, :string, default: "" attr :select_options, :list, required: true attr :selected_option, :string, required: true diff --git a/lib/decentralised_book_index_web/live/author_live/edit.ex b/lib/decentralised_book_index_web/live/author_live/edit.ex index 0c1f834..8e16cd5 100644 --- a/lib/decentralised_book_index_web/live/author_live/edit.ex +++ b/lib/decentralised_book_index_web/live/author_live/edit.ex @@ -39,7 +39,7 @@ defmodule DecentralisedBookIndexWeb.AuthorLive.Edit do |> assign(:page_title, "Edit Author") |> assign( :author, - Ash.get!(DecentralisedBookIndex.Metadata.Author, id, actor: socket.assigns.current_user) + Ash.get!(Metadata.Author, id, actor: socket.assigns.current_user) ) end diff --git a/lib/decentralised_book_index_web/live/author_live/form_component.ex b/lib/decentralised_book_index_web/live/author_live/form_component.ex index 1f43dcc..19f2687 100644 --- a/lib/decentralised_book_index_web/live/author_live/form_component.ex +++ b/lib/decentralised_book_index_web/live/author_live/form_component.ex @@ -94,7 +94,7 @@ defmodule DecentralisedBookIndexWeb.AuthorLive.FormComponent do socket = socket - |> push_redirect(to: patch_url(socket.assigns.action, author_id)) + |> push_navigate(to: patch_url(socket.assigns.action, author_id)) {:noreply, socket} end @@ -109,7 +109,7 @@ defmodule DecentralisedBookIndexWeb.AuthorLive.FormComponent do actor: socket.assigns.current_user ) else - AshPhoenix.Form.for_create(DecentralisedBookIndex.Metadata.Author, :create, + AshPhoenix.Form.for_create(Metadata.Author, :create, as: "author", actor: socket.assigns.current_user ) diff --git a/lib/decentralised_book_index_web/live/book_live/form_component.ex b/lib/decentralised_book_index_web/live/book_live/form_component.ex index 594082f..e1cf36e 100644 --- a/lib/decentralised_book_index_web/live/book_live/form_component.ex +++ b/lib/decentralised_book_index_web/live/book_live/form_component.ex @@ -175,7 +175,7 @@ defmodule DecentralisedBookIndexWeb.BookLive.FormComponent do end @impl true - def handle_event("add-bid", params, socket) do + def handle_event("add-bid", _params, socket) do socket = update(socket, :form, fn form -> AshPhoenix.Form.add_form(form, :bids) @@ -265,7 +265,7 @@ defmodule DecentralisedBookIndexWeb.BookLive.FormComponent do end @impl true - def handle_event("add-author-role", params, socket) do + def handle_event("add-author-role", _params, socket) do socket = update(socket, :form, fn form -> AshPhoenix.Form.add_form(form, :author_roles) @@ -333,7 +333,7 @@ defmodule DecentralisedBookIndexWeb.BookLive.FormComponent do socket = socket - |> push_redirect(to: patch_url(socket.assigns.action, book_id)) + |> push_navigate(to: patch_url(socket.assigns.action, book_id)) {:noreply, socket} end @@ -409,7 +409,7 @@ defmodule DecentralisedBookIndexWeb.BookLive.FormComponent do {:noreply, socket} end - def handle_event("open-select-author", %{"path" => path, "value" => value}, socket) do + def handle_event("open-select-author", %{"path" => path}, socket) do socket = socket |> assign(:select_author_open?, true) diff --git a/lib/decentralised_book_index_web/live/dbi_server_live/edit.ex b/lib/decentralised_book_index_web/live/dbi_server_live/edit.ex index ee7bf50..de2ccd8 100644 --- a/lib/decentralised_book_index_web/live/dbi_server_live/edit.ex +++ b/lib/decentralised_book_index_web/live/dbi_server_live/edit.ex @@ -39,7 +39,7 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.Edit do |> assign(:page_title, "Edit Server") |> assign( :dbi_server, - Ash.get!(DecentralisedBookIndex.Metadata.DBIServer, id, actor: socket.assigns.current_user) + Ash.get!(Metadata.DBIServer, id, actor: socket.assigns.current_user) ) end diff --git a/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex b/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex index da5c80c..925486b 100644 --- a/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex +++ b/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex @@ -57,7 +57,7 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.FormComponent do socket = socket |> put_flash(:info, "Server #{socket.assigns.form.source.type}d successfully") - |> push_redirect(to: patch_url(socket.assigns.action, dbi_server.id)) + |> push_navigate(to: patch_url(socket.assigns.action, dbi_server.id)) {:noreply, socket} @@ -72,7 +72,7 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.FormComponent do socket = socket - |> push_redirect(to: patch_url(socket.assigns.action, dbi_server_id)) + |> push_navigate(to: patch_url(socket.assigns.action, dbi_server_id)) {:noreply, socket} end diff --git a/lib/decentralised_book_index_web/live/dbi_server_live/index.ex b/lib/decentralised_book_index_web/live/dbi_server_live/index.ex index 14132b6..0ccbfae 100644 --- a/lib/decentralised_book_index_web/live/dbi_server_live/index.ex +++ b/lib/decentralised_book_index_web/live/dbi_server_live/index.ex @@ -101,7 +101,6 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.Index do |> apply_action(socket.assigns.live_action, params) {:noreply, socket} - # {:noreply, apply_action(socket, socket.assigns.live_action, params)} end defp apply_action(socket, :edit, %{"id" => id}) do diff --git a/lib/decentralised_book_index_web/live/publisher_live/edit.ex b/lib/decentralised_book_index_web/live/publisher_live/edit.ex index bfa3da8..72ce49e 100644 --- a/lib/decentralised_book_index_web/live/publisher_live/edit.ex +++ b/lib/decentralised_book_index_web/live/publisher_live/edit.ex @@ -39,7 +39,7 @@ defmodule DecentralisedBookIndexWeb.PublisherLive.Edit do |> assign(:page_title, "Edit Publisher") |> assign( :publisher, - Ash.get!(DecentralisedBookIndex.Metadata.Publisher, id, actor: socket.assigns.current_user) + Ash.get!(Metadata.Publisher, id, actor: socket.assigns.current_user) ) end diff --git a/lib/decentralised_book_index_web/live/publisher_live/form_component.ex b/lib/decentralised_book_index_web/live/publisher_live/form_component.ex index d04cdbb..2594bf4 100644 --- a/lib/decentralised_book_index_web/live/publisher_live/form_component.ex +++ b/lib/decentralised_book_index_web/live/publisher_live/form_component.ex @@ -58,7 +58,7 @@ defmodule DecentralisedBookIndexWeb.PublisherLive.FormComponent do socket = socket |> put_flash(:info, "Publisher #{socket.assigns.form.source.type}d successfully") - |> push_redirect(to: patch_url(socket.assigns.action, publisher.id)) + |> push_navigate(to: patch_url(socket.assigns.action, publisher.id)) {:noreply, socket} @@ -73,7 +73,7 @@ defmodule DecentralisedBookIndexWeb.PublisherLive.FormComponent do socket = socket - |> push_redirect(to: patch_url(socket.assigns.action, publisher_id)) + |> push_navigate(to: patch_url(socket.assigns.action, publisher_id)) {:noreply, socket} end diff --git a/lib/decentralised_book_index_web/live/user_live/form_component.ex b/lib/decentralised_book_index_web/live/user_live/form_component.ex index d71da9c..263dfda 100644 --- a/lib/decentralised_book_index_web/live/user_live/form_component.ex +++ b/lib/decentralised_book_index_web/live/user_live/form_component.ex @@ -57,7 +57,7 @@ defmodule DecentralisedBookIndexWeb.UserLive.FormComponent do socket = socket |> put_flash(:info, "User #{socket.assigns.form.source.type}d successfully") - |> push_redirect(to: patch_url(socket.assigns.action, user.id)) + |> push_navigate(to: patch_url(socket.assigns.action, user.id)) {:noreply, socket} @@ -72,7 +72,7 @@ defmodule DecentralisedBookIndexWeb.UserLive.FormComponent do socket = socket - |> push_redirect(to: patch_url(socket.assigns.action, user_id)) + |> push_navigate(to: patch_url(socket.assigns.action, user_id)) {:noreply, socket} end @@ -92,7 +92,7 @@ defmodule DecentralisedBookIndexWeb.UserLive.FormComponent do socket = socket |> put_flash(:info, "User not exists successfully") - |> push_redirect(to: patch_url(socket.assigns.action, nil)) + |> push_navigate(to: patch_url(socket.assigns.action, nil)) {:noreply, socket} end