Skip to content

Commit a67a3a0

Browse files
Paul-BobPaul-Bob
committed
Merge branch '4-dev' into feature/reactive_fields
2 parents f13b2e8 + e948ac3 commit a67a3a0

18 files changed

+290
-176
lines changed

‎.github/workflows/feature-tests.yml

+2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- main
77
- 1.x
88
- 2.x
9+
- 4-dev
910
push:
1011
branches:
1112
- main
1213
- 1.x
1314
- 2.x
15+
- 4-dev
1416

1517
concurrency:
1618
group: ${{ github.workflow }}-${{ github.ref }}

‎Gemfile.lock

+17-16
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ GEM
130130
money-rails (~> 1.12)
131131
avo-record_link_field (0.0.2)
132132
aws-eventstream (1.3.2)
133-
aws-partitions (1.1080.0)
133+
aws-partitions (1.1084.0)
134134
aws-sdk-core (3.222.1)
135135
aws-eventstream (~> 1, >= 1.3.0)
136136
aws-partitions (~> 1, >= 1.992.0)
@@ -282,7 +282,7 @@ GEM
282282
railties (>= 5.0.0)
283283
faker (3.5.1)
284284
i18n (>= 1.8.11, < 2)
285-
faraday (2.12.2)
285+
faraday (2.13.0)
286286
faraday-net_http (>= 2.0, < 3.5)
287287
json
288288
logger
@@ -355,7 +355,7 @@ GEM
355355
activesupport (>= 3.0)
356356
nokogiri (>= 1.6)
357357
io-console (0.8.0)
358-
irb (1.15.1)
358+
irb (1.15.2)
359359
pp (>= 0.6.0)
360360
rdoc (>= 4.0.0)
361361
reline (>= 0.4.2)
@@ -401,7 +401,7 @@ GEM
401401
net-pop
402402
net-smtp
403403
mapkick-rb (0.1.5)
404-
mapkick-static (0.1.1)
404+
mapkick-static (0.2.0)
405405
marcel (1.0.4)
406406
matrix (0.4.2)
407407
memory_profiler (1.1.0)
@@ -537,7 +537,7 @@ GEM
537537
rainbow (>= 2.0, < 4.0)
538538
rexml (~> 3.1)
539539
regexp_parser (2.10.0)
540-
reline (0.6.0)
540+
reline (0.6.1)
541541
io-console (~> 0.5)
542542
responders (3.1.1)
543543
actionpack (>= 5.2)
@@ -566,22 +566,23 @@ GEM
566566
rspec-retry (0.6.2)
567567
rspec-core (> 3.3)
568568
rspec-support (3.13.2)
569-
rubocop (1.71.2)
569+
rubocop (1.75.2)
570570
json (~> 2.3)
571571
language_server-protocol (>= 3.17.0)
572572
parallel (~> 1.10)
573573
parser (>= 3.3.0.2)
574574
rainbow (>= 2.2.2, < 4.0)
575575
regexp_parser (>= 2.9.3, < 3.0)
576-
rubocop-ast (>= 1.38.0, < 2.0)
576+
rubocop-ast (>= 1.44.0, < 2.0)
577577
ruby-progressbar (~> 1.7)
578578
unicode-display_width (>= 2.4.0, < 4.0)
579579
rubocop-ast (1.44.0)
580580
parser (>= 3.3.7.2)
581581
prism (~> 1.4)
582-
rubocop-performance (1.23.1)
583-
rubocop (>= 1.48.1, < 2.0)
584-
rubocop-ast (>= 1.31.1, < 2.0)
582+
rubocop-performance (1.25.0)
583+
lint_roller (~> 1.1)
584+
rubocop (>= 1.75.0, < 2.0)
585+
rubocop-ast (>= 1.38.0, < 2.0)
585586
rubocop-shopify (2.16.0)
586587
rubocop (~> 1.62)
587588
ruby-openai (8.1.0)
@@ -652,19 +653,19 @@ GEM
652653
actionpack (>= 6.1)
653654
activesupport (>= 6.1)
654655
sprockets (>= 3.0.0)
655-
standard (1.45.0)
656+
standard (1.49.0)
656657
language_server-protocol (~> 3.17.0.2)
657658
lint_roller (~> 1.0)
658-
rubocop (~> 1.71.0)
659+
rubocop (~> 1.75.2)
659660
standard-custom (~> 1.0.0)
660-
standard-performance (~> 1.6)
661+
standard-performance (~> 1.8)
661662
standard-custom (1.0.2)
662663
lint_roller (~> 1.0)
663664
rubocop (~> 1.50)
664-
standard-performance (1.6.0)
665+
standard-performance (1.8.0)
665666
lint_roller (~> 1.1)
666-
rubocop-performance (~> 1.23.0)
667-
stringio (3.1.5)
667+
rubocop-performance (~> 1.25.0)
668+
stringio (3.1.6)
668669
syntax_tree (6.2.0)
669670
prettier_print (>= 1.2.0)
670671
terminal-table (4.0.0)

‎app/controllers/avo/associations_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def index
2929
# When other field type, like has_many the @query is directly fetched from the parent record
3030
# Don't apply policy on array type since it can return an array of hashes where `.all` and other methods used on policy will fail.
3131
@query = if @field.type == "array"
32-
@resource.fetch_records(Avo::ExecutionContext.new(target: @field.block).handle || @parent_record.try(@field.id))
32+
@resource.fetch_records(Avo::ExecutionContext.new(target: @field.block, record: @parent_record).handle || @parent_record.try(@field.id))
3333
else
3434
@related_authorization.apply_policy(
3535
@parent_record.send(

‎gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock

+14-14
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ GEM
118118
money-rails (~> 1.12)
119119
avo-record_link_field (0.0.2)
120120
aws-eventstream (1.3.2)
121-
aws-partitions (1.1080.0)
121+
aws-partitions (1.1084.0)
122122
aws-sdk-core (3.222.1)
123123
aws-eventstream (~> 1, >= 1.3.0)
124124
aws-partitions (~> 1, >= 1.992.0)
@@ -268,7 +268,7 @@ GEM
268268
railties (>= 5.0.0)
269269
faker (3.5.1)
270270
i18n (>= 1.8.11, < 2)
271-
faraday (2.12.2)
271+
faraday (2.13.0)
272272
faraday-net_http (>= 2.0, < 3.5)
273273
json
274274
logger
@@ -341,7 +341,7 @@ GEM
341341
activesupport (>= 3.0)
342342
nokogiri (>= 1.6)
343343
io-console (0.8.0)
344-
irb (1.15.1)
344+
irb (1.15.2)
345345
pp (>= 0.6.0)
346346
rdoc (>= 4.0.0)
347347
reline (>= 0.4.2)
@@ -375,7 +375,7 @@ GEM
375375
net-pop
376376
net-smtp
377377
mapkick-rb (0.1.5)
378-
mapkick-static (0.1.1)
378+
mapkick-static (0.2.0)
379379
marcel (1.0.4)
380380
matrix (0.4.2)
381381
memory_profiler (1.1.0)
@@ -501,7 +501,7 @@ GEM
501501
rainbow (>= 2.0, < 4.0)
502502
rexml (~> 3.1)
503503
regexp_parser (2.10.0)
504-
reline (0.6.0)
504+
reline (0.6.1)
505505
io-console (~> 0.5)
506506
responders (3.1.1)
507507
actionpack (>= 5.2)
@@ -529,23 +529,23 @@ GEM
529529
rspec-retry (0.6.2)
530530
rspec-core (> 3.3)
531531
rspec-support (3.13.2)
532-
rubocop (1.73.2)
532+
rubocop (1.75.2)
533533
json (~> 2.3)
534534
language_server-protocol (~> 3.17.0.2)
535535
lint_roller (~> 1.1.0)
536536
parallel (~> 1.10)
537537
parser (>= 3.3.0.2)
538538
rainbow (>= 2.2.2, < 4.0)
539539
regexp_parser (>= 2.9.3, < 3.0)
540-
rubocop-ast (>= 1.38.0, < 2.0)
540+
rubocop-ast (>= 1.44.0, < 2.0)
541541
ruby-progressbar (~> 1.7)
542542
unicode-display_width (>= 2.4.0, < 4.0)
543543
rubocop-ast (1.44.0)
544544
parser (>= 3.3.7.2)
545545
prism (~> 1.4)
546-
rubocop-performance (1.24.0)
546+
rubocop-performance (1.25.0)
547547
lint_roller (~> 1.1)
548-
rubocop (>= 1.72.1, < 2.0)
548+
rubocop (>= 1.75.0, < 2.0)
549549
rubocop-ast (>= 1.38.0, < 2.0)
550550
rubocop-shopify (2.16.0)
551551
rubocop (~> 1.62)
@@ -617,18 +617,18 @@ GEM
617617
actionpack (>= 6.1)
618618
activesupport (>= 6.1)
619619
sprockets (>= 3.0.0)
620-
standard (1.47.0)
620+
standard (1.49.0)
621621
language_server-protocol (~> 3.17.0.2)
622622
lint_roller (~> 1.0)
623-
rubocop (~> 1.73.0)
623+
rubocop (~> 1.75.2)
624624
standard-custom (~> 1.0.0)
625-
standard-performance (~> 1.7)
625+
standard-performance (~> 1.8)
626626
standard-custom (1.0.2)
627627
lint_roller (~> 1.0)
628628
rubocop (~> 1.50)
629-
standard-performance (1.7.0)
629+
standard-performance (1.8.0)
630630
lint_roller (~> 1.1)
631-
rubocop-performance (~> 1.24.0)
631+
rubocop-performance (~> 1.25.0)
632632
syntax_tree (6.2.0)
633633
prettier_print (>= 1.2.0)
634634
terminal-table (4.0.0)

0 commit comments

Comments
 (0)