Merge branch '1169'

Author: celeste-wahlquist

REUSE.toml

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>
+#
+# SPDX-License-Identifier: MIT
+
+version = 1
+
+# AALang-Gab assets are JSON-LD and other formats that cannot carry SPDX tags inline;
+# annotate the tree for REUSE compliance (see https://reuse.software/spec/).
+[[annotations]]
+path = "lib/AALang-Gab/.gitignore"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.jsonld"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.md"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.py"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.aacomp"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"

lib/ash/actions/action.ex

@@ -372,9 +372,6 @@ defmodule Ash.Actions.Action do
 
             Received #{inspect(filter)} when authorizing #{inspect(input.resource)}.#{input.action.name}
             """
-
-          :forbidden ->
-            {:halt, {:error, Ash.Authorizer.exception(authorizer, :forbidden, authorizer_state)}}
         end
       end
     )

lib/ash/actions/create/create.ex

@@ -588,11 +588,10 @@ defmodule Ash.Actions.Create do
   end
 
   defp validate_manual_action_return_result!(
-         {:ok, %resource{}, notifications} = result,
+         {:ok, %resource{}, %{notifications: _notifications}} = result,
          resource,
          _
-       )
-       when is_list(notifications) do
+       ) do
     result
   end
 

lib/ash/actions/managed_relationships.ex

@@ -963,28 +963,30 @@ defmodule Ash.Actions.ManagedRelationships do
              opts,
              notifications
            ),
-         creates <- additional_creates ++ creates,
-         # Batch creates
+         # Apply updates before batch-creating new related records. This preserves
+         # the relative ordering of already-present vs newly-created items for
+         # relationship lists backed by order-sensitive data layers (e.g. ETS).
          {:ok, new_value, notifications} <-
-           batch_creates(
-             creates,
+           process_updates(
+             updates,
              record,
              new_value,
              relationship,
              changeset,
              actor,
-             index,
+             pkeys,
              opts,
              notifications
            ) do
-      process_updates(
-        updates,
+      # Batch creates
+      batch_creates(
+        additional_creates ++ creates,
         record,
         new_value,
         relationship,
         changeset,
         actor,
-        pkeys,
+        index,
         opts,
         notifications
       )
@@ -1387,10 +1389,13 @@ defmodule Ash.Actions.ManagedRelationships do
       end)
 
     inputs_to_bulk_create =
-      Enum.map(map_inputs_with_joins, fn {{input, join_params}, _} ->
-        {input, join_params}
+      Enum.map(map_inputs_with_joins, fn {{input, join_params}, {_orig_input, input_index}} ->
+        {input, join_params, input_index}
       end)
 
+    input_indices_to_bulk_create =
+      Enum.map(inputs_to_bulk_create, fn {_, _, input_index} -> input_index end)
+
     if inputs_to_bulk_create == [] do
       # Only struct inputs - just create join records
       create_join_records_for_m2m(
@@ -1406,7 +1411,7 @@ defmodule Ash.Actions.ManagedRelationships do
       )
     else
       # Bulk create destination records
-      bulk_inputs = Enum.map(inputs_to_bulk_create, fn {input, _} -> input end)
+      bulk_inputs = Enum.map(inputs_to_bulk_create, fn {input, _, _} -> input end)
 
       bulk_context =
         Map.take(changeset.context, [:shared])
@@ -1446,7 +1451,7 @@ defmodule Ash.Actions.ManagedRelationships do
           created_with_joins =
             Enum.zip(
               created_records || [],
-              Enum.map(inputs_to_bulk_create, fn {_, join} -> join end)
+              Enum.map(inputs_to_bulk_create, fn {_, join, _} -> join end)
             )
             |> Enum.map(fn {created, join_params} -> {created, join_params} end)
 
@@ -1469,7 +1474,28 @@ defmodule Ash.Actions.ManagedRelationships do
           error = List.first(List.wrap(errors))
 
           if error do
-            {:error, add_bread_crumb(error, relationship, :create)}
+            # Bulk create errors don't carry the manage_relationship input index
+            # in a way AshPhoenix can route the nested errors. Reattach the
+            # index based on the position in the bulk inputs we sent.
+            bulk_index =
+              error
+              |> Map.get(:meta)
+              |> case do
+                %{bulk_create_index: idx} -> idx
+                _ -> nil
+              end || Map.get(error, :bulk_create_index) || 0
+
+            input_index = Enum.at(input_indices_to_bulk_create, bulk_index) || 0
+
+            relationship_error_key =
+              opts
+              |> Keyword.get(:meta, [])
+              |> Keyword.get(:id) || relationship.name
+
+            error
+            |> add_bread_crumb(relationship, :create)
+            |> Ash.Error.set_path([relationship_error_key, input_index])
+            |> then(&{:error, &1})
           else
             {:error,
              add_bread_crumb(

lib/ash/actions/read/read.ex

@@ -3730,6 +3730,7 @@ defmodule Ash.Actions.Read do
     end
   end
 
+  @dialyzer {:nowarn_function, do_add_field_level_auth: 3}
   defp do_add_field_level_auth(query, domain, opts) do
     data = %{
       query: query,
@@ -4181,6 +4182,7 @@ defmodule Ash.Actions.Read do
     |> then(&{&1, query})
   end
 
+  @dialyzer {:nowarn_function, validate_manual_action_return_result!: 3}
   defp validate_manual_action_return_result!({:ok, list} = result, _resource, _)
        when is_list(list) do
     result

lib/ash/actions/read/relationships.ex

@@ -513,7 +513,6 @@ defmodule Ash.Actions.Read.Relationships do
           |> case do
             {:ok, result} -> {:ok, result}
             {:error, error} -> {:error, error}
-            result when is_list(result) -> {:ok, result}
           end
           |> case do
             {:ok, result_records} ->

lib/ash/actions/update/update.ex

@@ -688,11 +688,10 @@ defmodule Ash.Actions.Update do
   end
 
   defp validate_manual_action_return_result!(
-         {:ok, %resource{}, notifications} = result,
+         {:ok, %resource{}, %{notifications: _notifications}} = result,
          resource,
          _
-       )
-       when is_list(notifications) do
+       ) do
     result
   end
 

lib/ash/can.ex

@@ -667,11 +667,6 @@ defmodule Ash.Can do
               {:authorized, authorizer_state} ->
                 {:cont, {true, query, [{authorizer, authorizer_state, context} | authorizers]}}
 
-              :forbidden ->
-                {:halt,
-                 {false, Ash.Authorizer.exception(authorizer, :forbidden, authorizer_state),
-                  {authorizer, authorizer_state, context}}}
-
               _ when not is_nil(context.action_input) ->
                 raise """
                 Cannot use filter or runtime checks with generic actions

lib/ash/error/forbidden/policy.ex

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 defmodule Ash.Error.Forbidden.Policy do
+  @dialyzer {:nowarn_function, describe: 5}
   @moduledoc "Raised when policy authorization for an action fails"
 
   require Logger
@@ -495,31 +496,49 @@ defmodule Ash.Error.Forbidden.Policy do
 
     if subject && function_exported?(mod, :expand_description, 3) do
       authorizer =
-        %Ash.Policy.Authorizer{
-          subject: subject,
-          actor: actor,
-          resource: resource
-        }
-
-      key =
         case subject do
-          %Ash.Changeset{} -> :changeset
-          %Ash.Query{} -> :query
-          %Ash.ActionInput{} -> :action_input
+          %Ash.Changeset{} = subject ->
+            %Ash.Policy.Authorizer{
+              subject: subject,
+              actor: actor,
+              resource: resource
+            }
+            |> Map.put(:changeset, subject)
+
+          %Ash.Query{} = subject ->
+            %Ash.Policy.Authorizer{
+              subject: subject,
+              actor: actor,
+              resource: resource
+            }
+            |> Map.put(:query, subject)
+
+          %Ash.ActionInput{} = subject ->
+            %Ash.Policy.Authorizer{
+              subject: subject,
+              actor: actor,
+              resource: resource
+            }
+            |> Map.put(:action_input, subject)
+
+          _ ->
+            nil
         end
 
-      authorizer = Map.put(authorizer, key, subject)
-
-      case Ash.Policy.Check.expand_description(mod, actor, authorizer, opts) do
-        {:ok, desc} ->
-          if Ash.Policy.Check.prefer_expanded_description?(mod) do
-            desc
-          else
-            description <> " | #{desc}"
-          end
+      if authorizer do
+        case Ash.Policy.Check.expand_description(mod, actor, authorizer, opts) do
+          {:ok, desc} ->
+            if Ash.Policy.Check.prefer_expanded_description?(mod) do
+              desc
+            else
+              description <> " | #{desc}"
+            end
 
-        _ ->
-          description
+          _ ->
+            description
+        end
+      else
+        description
       end
     else
       description

lib/ash/policy/chart/mermaid.ex

@@ -196,7 +196,7 @@ defmodule Ash.Policy.Chart.Mermaid do
             description = Ash.Policy.Check.describe(check.check_module, check.check_opts)
 
             description =
-              if description && description != "" do
+              if description != "" do
                 "{#{quote_and_escape(description)}}"
               else
                 "{}"