Read fields from assigns

Author: Flo0807

lib/backpex/live_components/form_component.ex

@@ -77,9 +77,7 @@ defmodule Backpex.FormComponent do
   end
 
   def handle_event("validate", %{"change" => change, "_target" => target}, %{assigns: %{action_type: :item}} = socket) do
-    %{assigns: %{item: item, live_resource: live_resource, live_action: live_action} = assigns} = socket
-    fields = live_resource.fields(live_action, assigns)
-
+    %{assigns: %{item: item, fields: fields} = assigns} = socket
     changeset_function = &assigns.action_to_confirm.module.changeset/3
 
     target = Enum.at(target, 1)
@@ -107,17 +105,11 @@ defmodule Backpex.FormComponent do
   end
 
   def handle_event("validate", %{"change" => change, "_target" => target}, socket) do
-    %{
-      live_resource: live_resource,
-      live_action: live_action,
-      item: item
-    } = socket.assigns
+    %{live_resource: live_resource, fields: fields, item: item} = socket.assigns
 
     target = Enum.at(target, 1)
     assocs = Map.get(socket.assigns, :assocs, [])
 
-    fields = live_resource.fields(live_action, socket.assigns)
-
     change =
       change
       |> drop_readonly_changes(fields, socket.assigns)
@@ -151,11 +143,9 @@ defmodule Backpex.FormComponent do
 
   def handle_event("cancel-existing-entry", %{"ref" => file_key, "id" => upload_key}, socket) do
     upload_key = String.to_existing_atom(upload_key)
-    %{live_resource: live_resource, live_action: live_action} = socket.assigns
-    fields = live_resource.fields(live_action, socket.assigns)
 
     field =
-      fields
+      socket.assigns.fields
       |> Enum.find(fn {_name, field_options} ->
         Map.has_key?(field_options, :upload_key) and Map.get(field_options, :upload_key) == upload_key
       end)
@@ -181,8 +171,7 @@ defmodule Backpex.FormComponent do
   end
 
   def handle_event("save", %{"change" => change, "save-type" => save_type}, socket) do
-    %{assigns: %{live_resource: live_resource, live_action: live_action} = assigns} = socket
-    fields = live_resource.fields(live_action, assigns)
+    %{assigns: %{live_action: live_action, fields: fields} = assigns} = socket
 
     change =
       change
@@ -205,10 +194,7 @@ defmodule Backpex.FormComponent do
   end
 
   def handle_event(msg, params, socket) do
-    %{live_resource: live_resource, live_action: live_action} = socket.assigns
-    fields = live_resource.fields(live_action, socket.assigns)
-
-    Enum.reduce(fields, socket, fn el, acc ->
+    Enum.reduce(socket.assigns.fields, socket, fn el, acc ->
       el.module.handle_form_event(el, msg, params, acc)
     end)
     |> noreply()
@@ -309,15 +295,14 @@ defmodule Backpex.FormComponent do
       assigns:
         %{
           live_resource: live_resource,
-          live_action: live_action,
+          fields: fields,
           resource_action: resource_action,
           item: item,
           return_to: return_to
         } = assigns
     } = socket
 
     assocs = Map.get(assigns, :assocs, [])
-    fields = live_resource.fields(live_action, assigns)
     params = drop_readonly_changes(params, fields, assigns)
 
     result =
@@ -361,14 +346,13 @@ defmodule Backpex.FormComponent do
       assigns:
         %{
           live_resource: live_resource,
-          live_action: live_action,
+          fields: fields,
           selected_items: selected_items,
           action_to_confirm: action_to_confirm,
           return_to: return_to
         } = assigns
     } = socket
 
-    fields = live_resource.fields(live_action, assigns)
     params = drop_readonly_changes(params, fields, assigns)
 
     result =

lib/backpex/live_resource.ex

@@ -728,11 +728,11 @@ defmodule Backpex.LiveResource do
       live_action: live_action,
       filters: filters,
       query_options: query_options,
-      init_order: init_order
+      init_order: init_order,
+      fields: fields
     } = assigns
 
     schema = live_resource.adapter_config(:schema)
-    fields = live_resource.fields(live_action, assigns)
 
     field = Enum.find(fields, fn {name, _field_options} -> name == query_options.order_by end)
 

lib/backpex/live_resource/form.ex

@@ -98,10 +98,9 @@ defmodule Backpex.LiveResource.Form do
   end
 
   defp assign_changeset(socket, live_action) do
-    %{live_resource: live_resource, item: item} = socket.assigns
-    changeset_fun = changeset_fun(live_resource, live_action)
-    fields = live_resource.fields(live_action, socket.assigns)
+    %{live_resource: live_resource, item: item, fields: fields} = socket.assigns
 
+    changeset_fun = changeset_fun(live_resource, live_action)
     LiveResource.assign_changeset(socket, changeset_fun, item, fields, live_action)
   end
 

lib/backpex/live_resource/index.ex

@@ -335,9 +335,9 @@ defmodule Backpex.LiveResource.Index do
   end
 
   defp assign_active_fields(socket, session) do
-    fields = socket.assigns.live_resource.fields(:index, socket.assigns)
+    %{fields: fields, live_resource: live_resource} = socket.assigns
 
-    saved_fields = get_in(session, ["backpex", "column_toggle", "#{socket.assigns.live_resource}"]) || %{}
+    saved_fields = get_in(session, ["backpex", "column_toggle", "#{live_resource}"]) || %{}
 
     active_fields =
       Enum.map(fields, fn {name, %{label: label}} ->
@@ -348,8 +348,7 @@ defmodule Backpex.LiveResource.Index do
          }}
       end)
 
-    socket
-    |> assign(:active_fields, active_fields)
+    assign(socket, :active_fields, active_fields)
   end
 
   defp field_active?(name, saved_fields) do
@@ -429,7 +428,7 @@ defmodule Backpex.LiveResource.Index do
   end
 
   defp apply_index(socket) do
-    %{live_resource: live_resource, params: params} = socket.assigns
+    %{live_resource: live_resource, params: params, fields: fields} = socket.assigns
 
     if not live_resource.can?(socket.assigns, :index, nil), do: raise(Backpex.ForbiddenError)
 
@@ -442,8 +441,6 @@ defmodule Backpex.LiveResource.Index do
 
     schema = live_resource.adapter_config(:schema)
 
-    fields = live_resource.fields(:index, socket.assigns)
-
     count_criteria = [
       search: LiveResource.search_options(params, fields, schema),
       filters: LiveResource.filter_options(valid_filter_params, filters)
@@ -547,18 +544,12 @@ defmodule Backpex.LiveResource.Index do
   end
 
   defp refresh_items(socket) do
-    %{
-      live_resource: live_resource,
-      params: params,
-      query_options: query_options
-    } = socket.assigns
+    %{live_resource: live_resource, params: params, query_options: query_options, fields: fields} = socket.assigns
 
     schema = live_resource.adapter_config(:schema)
     filters = LiveResource.active_filters(socket.assigns)
     valid_filter_params = LiveResource.get_valid_filters_from_params(params, filters, LiveResource.empty_filter_key())
 
-    fields = live_resource.fields(:index, socket.assigns)
-
     count_criteria = [
       search: LiveResource.search_options(params, fields, schema),
       filters: LiveResource.filter_options(valid_filter_params, filters)
@@ -581,13 +572,13 @@ defmodule Backpex.LiveResource.Index do
     %{
       live_resource: live_resource,
       query_options: query_options,
-      metric_visibility: metric_visibility
+      metric_visibility: metric_visibility,
+      fields: fields
     } = socket.assigns
 
     repo = live_resource.adapter_config(:repo)
     schema = live_resource.adapter_config(:schema)
     filters = LiveResource.active_filters(socket.assigns)
-    fields = live_resource.fields(:index, socket.assigns)
 
     metrics =
       socket.assigns.live_resource.metrics()