fix: compilation errors

frankdugan3 · May 31, 2023 · c28a8d4 · c28a8d4
1 parent 70c8554
commit c28a8d4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.formatter.exs b/.formatter.exs
@@ -18,11 +18,12 @@ spark_locals_without_parens = [
   description: 1,
   field: 1,
   field: 2,
+  field_group: 1,
   field_group: 2,
-  field_group: 3,
   input_class: 1,
   label: 1,
   module: 1,
+  options: 1,
   path: 1,
   prompt: 1,
   resource_label: 1,

diff --git a/config/dev.exs b/config/dev.exs
@@ -20,7 +20,7 @@ if Mix.env() == :dev do
 
   # Configure esbuild (the version is required)
   config :esbuild,
-    version: "0.17.18",
+    version: "0.17.19",
     default: [
       args:
         ~w(js/app.js --bundle --target=es2017 --outdir=../priv/static/assets --external:/fonts/* --external:/images/*),

diff --git a/dev/component_previewer/ash/user.ex b/dev/component_previewer/ash/user.ex
@@ -36,7 +36,7 @@ defmodule ComponentPreviewer.Ash.User do
           field :roles do
             label "Roles"
             type :select
-            options(ComponentPreviewer.Ash.UserRole.values())
+            options UserRole.values()
           end
 
           field :active do
@@ -98,9 +98,7 @@ defmodule ComponentPreviewer.Ash.User do
   end
 
   calculations do
-    calculate :name_email, :ci_string do
-      calculation expr(name <> " (" <> email <> ")")
-    end
+    calculate :name_email, :ci_string, expr(name <> " (" <> email <> ")")
   end
 
   actions do

diff --git a/lib/pyro/extension/resource/resource.ex b/lib/pyro/extension/resource/resource.ex
@@ -15,7 +15,7 @@ if Code.ensure_loaded?(Ash) do
       schema: Pyro.Resource.Form.FieldGroup.schema(),
       target: Pyro.Resource.Form.FieldGroup,
       recursive_as: :fields,
-      args: [:name, :label],
+      args: [:name],
       entities: [
         fields: [@field]
       ]

diff --git a/lib/pyro/extension/resource/transformers/merge_form_actions.ex b/lib/pyro/extension/resource/transformers/merge_form_actions.ex
@@ -205,15 +205,14 @@ if Code.ensure_loaded?(Ash) do
     defp merge_field(old, new),
       do:
         old
-        |> maybe_override(new, :label)
         |> maybe_override(new, :type)
         |> maybe_override(new, :options)
         |> maybe_override(new, :label)
         |> maybe_override(new, :description)
         |> maybe_override(new, :path)
         |> maybe_override(new, :class)
-        |> maybe_override(new, :input_class)
         |> maybe_override(new, :autofocus)
+        |> maybe_override(new, :input_class)
         |> maybe_override(new, :prompt)
         |> maybe_override(new, :autocomplete_search_action)
         |> maybe_override(new, :autocomplete_search_arg)