changed
CHANGELOG.md
|
@@ -5,6 +5,15 @@ See [Conventional Commits](Https://conventionalcommits.org) for commit guideline
|
5
5
|
|
6
6
|
<!-- changelog -->
|
7
7
|
|
8
|
+ ## [v2.1.4](https://github.com/ash-project/ash_phoenix/compare/v2.1.3...v2.1.4) (2024-09-30)
|
9
|
+
|
10
|
+
|
11
|
+
|
12
|
+
|
13
|
+ ### Bug Fixes:
|
14
|
+
|
15
|
+ * properly include calc args in `to_filter_map`
|
16
|
+
|
8
17
|
## [v2.1.3](https://github.com/ash-project/ash_phoenix/compare/v2.1.2...v2.1.3) (2024-09-30)
|
changed
README.md
|
@@ -15,7 +15,7 @@ Welcome! This is the package for integrating [Phoenix Framework](https://www.pho
|
15
15
|
Add `ash_phoenix` to your list of dependencies in `mix.exs`:
|
16
16
|
|
17
17
|
```elixir
|
18
|
- {:ash_phoenix, "~> 2.1.3"}
|
18
|
+ {:ash_phoenix, "~> 2.1.4"}
|
19
19
|
```
|
20
20
|
|
21
21
|
## Whats in the box?
|
changed
hex_metadata.config
|
@@ -1,7 +1,7 @@
|
1
1
|
{<<"links">>,
|
2
2
|
[{<<"GitHub">>,<<"https://github.com/ash-project/ash_phoenix">>}]}.
|
3
3
|
{<<"name">>,<<"ash_phoenix">>}.
|
4
|
- {<<"version">>,<<"2.1.3">>}.
|
4
|
+ {<<"version">>,<<"2.1.4">>}.
|
5
5
|
{<<"description">>,<<"Utilities for integrating Ash and Phoenix">>}.
|
6
6
|
{<<"elixir">>,<<"~> 1.11">>}.
|
7
7
|
{<<"app">>,<<"ash_phoenix">>}.
|
changed
lib/ash_phoenix/filter_form/filter_form.ex
|
@@ -371,14 +371,21 @@ defmodule AshPhoenix.FilterForm do
|
371
371
|
value: value,
|
372
372
|
operator: operator,
|
373
373
|
negated?: negated?,
|
374
|
+ arguments: arguments,
|
374
375
|
path: path
|
375
376
|
},
|
376
377
|
_resource
|
377
378
|
) do
|
378
379
|
expr =
|
379
|
- put_at_path(%{}, Enum.map(path, &to_string/1), %{
|
380
|
- to_string(field) => %{to_string(operator) => value}
|
381
|
- })
|
380
|
+ if arguments && arguments.input not in [nil, %{}] do
|
381
|
+ put_at_path(%{}, Enum.map(path, &to_string/1), %{
|
382
|
+ to_string(field) => %{to_string(operator) => value, "input" => arguments.input}
|
383
|
+ })
|
384
|
+ else
|
385
|
+ put_at_path(%{}, Enum.map(path, &to_string/1), %{
|
386
|
+ to_string(field) => %{to_string(operator) => value}
|
387
|
+ })
|
388
|
+ end
|
382
389
|
|
383
390
|
if negated? do
|
384
391
|
{:ok, %{"not" => expr}}
|
|
@@ -577,9 +584,6 @@ defmodule AshPhoenix.FilterForm do
|
577
584
|
resource: Ash.Resource.Info.related(resource, path),
|
578
585
|
input?: true
|
579
586
|
}}
|
580
|
- else
|
581
|
- {:error, error} ->
|
582
|
- {:error, error}
|
583
587
|
end
|
584
588
|
end
|
changed
mix.exs
|
@@ -5,7 +5,7 @@ defmodule AshPhoenix.MixProject do
|
5
5
|
Utilities for integrating Ash and Phoenix
|
6
6
|
"""
|
7
7
|
|
8
|
- @version "2.1.3"
|
8
|
+ @version "2.1.4"
|
9
9
|
|
10
10
|
def project do
|
11
11
|
[
|