Update order of function arguments

Author: Flo0807

lib/backpex/adapter.ex

@@ -27,19 +27,19 @@ defmodule Backpex.Adapter do
 
   Should return `nil` if no result was found.
   """
-  @callback get(primary_value :: term(), assigns :: map(), live_resource :: module(), fields :: list()) ::
+  @callback get(primary_value :: term(), fields :: list(), assigns :: map(), live_resource :: module()) ::
               {:ok, struct() | nil} | {:error, term()}
 
   @doc """
   Returns a list of items by given criteria.
   """
-  @callback list(criteria :: keyword(), assigns :: map(), live_resource :: module(), fields :: list()) :: {:ok, list()}
+  @callback list(criteria :: keyword(), fields :: list(), assigns :: map(), live_resource :: module()) :: {:ok, list()}
 
   @doc """
   Gets the total count of the current live_resource.
   Possibly being constrained the item query and the search- and filter options.
   """
-  @callback count(criteria :: keyword(), assigns :: map(), live_resource :: module(), fields :: list()) ::
+  @callback count(criteria :: keyword(), fields :: list(), assigns :: map(), live_resource :: module()) ::
               {:ok, non_neg_integer()}
 
   @doc """

lib/backpex/adapters/ash.ex

@@ -29,7 +29,7 @@ if Code.ensure_loaded?(Ash) do
     Returns `nil` if no result was found.
     """
     @impl Backpex.Adapter
-    def get(primary_value, _assigns, live_resource, _fields) do
+    def get(primary_value, _fields, _assigns, live_resource) do
       resource = live_resource.adapter_config(:resource)
       primary_key = live_resource.config(:primary_key)
 
@@ -42,7 +42,7 @@ if Code.ensure_loaded?(Ash) do
     Returns a list of items by given criteria.
     """
     @impl Backpex.Adapter
-    def list(_criteria, _assigns, live_resource, _fields) do
+    def list(_criteria, _fields, _assigns, live_resource) do
       live_resource.adapter_config(:resource)
       |> Ash.read()
     end
@@ -51,7 +51,7 @@ if Code.ensure_loaded?(Ash) do
     Returns the number of items matching the given criteria.
     """
     @impl Backpex.Adapter
-    def count(_criteria, _assigns, live_resource, _fields) do
+    def count(_criteria, _fields, _assigns, live_resource) do
       live_resource.adapter_config(:resource)
       |> Ash.count()
     end

lib/backpex/adapters/ecto.ex

@@ -75,7 +75,7 @@ defmodule Backpex.Adapters.Ecto do
   Gets a database record with the given primary key value.
   """
   @impl Backpex.Adapter
-  def get(primary_value, assigns, live_resource, fields) do
+  def get(primary_value, fields, assigns, live_resource) do
     repo = live_resource.adapter_config(:repo)
 
     record_query(primary_value, assigns, fields, live_resource)
@@ -87,10 +87,10 @@ defmodule Backpex.Adapters.Ecto do
   Returns a list of items by given criteria.
   """
   @impl Backpex.Adapter
-  def list(criteria, assigns, live_resource, fields) do
+  def list(criteria, fields, assigns, live_resource) do
     repo = live_resource.adapter_config(:repo)
 
-    list_query(criteria, assigns, live_resource, fields)
+    list_query(criteria, fields, assigns, live_resource)
     |> repo.all()
     |> then(fn items -> {:ok, items} end)
   end
@@ -99,10 +99,10 @@ defmodule Backpex.Adapters.Ecto do
   Returns the number of items matching the given criteria.
   """
   @impl Backpex.Adapter
-  def count(criteria, assigns, live_resource, fields) do
+  def count(criteria, fields, assigns, live_resource) do
     repo = live_resource.adapter_config(:repo)
 
-    list_query(criteria, assigns, live_resource, fields)
+    list_query(criteria, fields, assigns, live_resource)
     |> exclude(:preload)
     |> exclude(:select)
     |> subquery()
@@ -115,7 +115,7 @@ defmodule Backpex.Adapters.Ecto do
 
   TODO: Should be private.
   """
-  def list_query(criteria, assigns, live_resource, fields) do
+  def list_query(criteria, fields, assigns, live_resource) do
     schema = live_resource.adapter_config(:schema)
     item_query = live_resource.adapter_config(:item_query)
     full_text_search = live_resource.config(:full_text_search)

lib/backpex/live_components/form_component.ex

@@ -215,7 +215,7 @@ defmodule Backpex.FormComponent do
       end
     ]
 
-    case Resource.insert(item, params, socket.assigns, live_resource, fields, opts) do
+    case Resource.insert(item, params, fields, socket.assigns, live_resource, opts) do
       {:ok, item} ->
         return_to = return_to_path(save_type, live_resource, socket, socket.assigns, live_action, item)
 

lib/backpex/live_resource/form.ex

@@ -80,7 +80,7 @@ defmodule Backpex.LiveResource.Form do
     backpex_id = Map.fetch!(params, "backpex_id")
     primary_value = URI.decode(backpex_id)
 
-    item = Resource.get!(primary_value, socket.assigns, live_resource, fields)
+    item = Resource.get!(primary_value, fields, socket.assigns, live_resource)
 
     assign(socket, :item, item)
   end

lib/backpex/live_resource/index.ex

@@ -364,7 +364,7 @@ defmodule Backpex.LiveResource.Index do
 
     primary_value = LiveResource.primary_value(item, live_resource)
     primary_value_str = to_string(primary_value)
-    {:ok, updated_item} = Resource.get(primary_value, socket.assigns, live_resource, fields)
+    {:ok, updated_item} = Resource.get(primary_value, fields, socket.assigns, live_resource)
 
     updated_items =
       Enum.map(items, fn current_item ->
@@ -446,7 +446,7 @@ defmodule Backpex.LiveResource.Index do
       filters: LiveResource.filter_options(valid_filter_params, filters)
     ]
 
-    {:ok, item_count} = Resource.count(count_criteria, socket.assigns, live_resource, fields)
+    {:ok, item_count} = Resource.count(count_criteria, fields, socket.assigns, live_resource)
 
     per_page =
       params
@@ -555,7 +555,7 @@ defmodule Backpex.LiveResource.Index do
       filters: LiveResource.filter_options(valid_filter_params, filters)
     ]
 
-    {:ok, item_count} = Resource.count(count_criteria, socket.assigns, live_resource, fields)
+    {:ok, item_count} = Resource.count(count_criteria, fields, socket.assigns, live_resource)
     %{page: page, per_page: per_page} = query_options
     total_pages = LiveResource.calculate_total_pages(item_count, per_page)
     new_query_options = Map.put(query_options, :page, LiveResource.validate_page(page, total_pages))
@@ -588,7 +588,7 @@ defmodule Backpex.LiveResource.Index do
           filters: LiveResource.filter_options(query_options, filters)
         ]
 
-        query = EctoAdapter.list_query(criteria, socket.assigns, live_resource, fields)
+        query = EctoAdapter.list_query(criteria, fields, socket.assigns, live_resource)
 
         case Backpex.Metric.metrics_visible?(metric_visibility, live_resource) do
           true ->
@@ -616,7 +616,7 @@ defmodule Backpex.LiveResource.Index do
     {:ok, items} =
       assigns
       |> LiveResource.build_criteria()
-      |> Resource.list(assigns, live_resource, fields)
+      |> Resource.list(fields, assigns, live_resource)
 
     assign(socket, :items, items)
   end

lib/backpex/live_resource/show.ex

@@ -54,7 +54,7 @@ defmodule Backpex.LiveResource.Show do
     %{live_resource: live_resource, fields: fields, params: params} = socket.assigns
     backpex_id = Map.fetch!(params, "backpex_id")
     primary_value = URI.decode(backpex_id)
-    item = Resource.get!(primary_value, socket.assigns, live_resource, fields)
+    item = Resource.get!(primary_value, fields, socket.assigns, live_resource)
 
     if not live_resource.can?(socket.assigns, :show, item), do: raise(Backpex.ForbiddenError)
 

lib/backpex/resource.ex

@@ -19,20 +19,20 @@ defmodule Backpex.Resource do
     search: {"hello", [:title, :description]}
   ]
   """
-  def list(criteria, assigns, live_resource, fields) do
+  def list(criteria, fields, assigns, live_resource) do
     adapter = live_resource.config(:adapter)
 
-    adapter.list(criteria, assigns, live_resource, fields)
+    adapter.list(criteria, fields, assigns, live_resource)
   end
 
   @doc """
   Gets the total count of the current live_resource.
   Possibly being constrained the item query and the search- and filter options.
   """
-  def count(criteria, assigns, live_resource, fields) do
+  def count(criteria, fields, assigns, live_resource) do
     adapter = live_resource.config(:adapter)
 
-    adapter.count(criteria, assigns, live_resource, fields)
+    adapter.count(criteria, fields, assigns, live_resource)
   end
 
   @doc """
@@ -46,17 +46,17 @@ defmodule Backpex.Resource do
   * `assigns` (map): The current assigns of the socket.
   * `live_resource` (module): The `Backpex.LiveResource` module.
   """
-  def get(primary_value, assigns, live_resource, fields) do
+  def get(primary_value, fields, assigns, live_resource) do
     adapter = live_resource.config(:adapter)
 
-    adapter.get(primary_value, assigns, live_resource, fields)
+    adapter.get(primary_value, fields, assigns, live_resource)
   end
 
   @doc """
   Same as `get/4` but returns the result or raises an error.
   """
-  def get!(primary_value, assigns, live_resource, fields) do
-    case get(primary_value, assigns, live_resource, fields) do
+  def get!(primary_value, fields, assigns, live_resource) do
+    case get(primary_value, fields, assigns, live_resource) do
       {:ok, nil} -> raise Backpex.NoResultsError
       {:ok, result} -> result
       {:error, _error} -> raise Backpex.NoResultsError
@@ -92,7 +92,7 @@ defmodule Backpex.Resource do
   * `attrs` (map): A map of parameters that will be passed to the `changeset_function`.
   * TODO: docs
   """
-  def insert(item, attrs, assigns, live_resource, fields, opts) do
+  def insert(item, attrs, fields, assigns, live_resource, opts) do
     {after_save_fun, opts} = Keyword.pop(opts, :after_save_fun, &{:ok, &1})
 
     adapter = live_resource.config(:adapter)
@@ -113,7 +113,7 @@ defmodule Backpex.Resource do
   * `attrs` (map): A map of parameters that will be passed to the `changeset_function`.
   * TODO: docs
   """
-  def update(item, attrs, assigns, fields, live_resource, opts \\ []) do
+  def update(item, attrs, fields, assigns, live_resource, opts \\ []) do
     {after_save_fun, opts} = Keyword.pop(opts, :after_save_fun, &{:ok, &1})
 
     adapter = live_resource.config(:adapter)