avo 1.18.1 → 1.18.2.pre.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of avo might be problematic. Click here for more details.

Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -1
  3. data/Gemfile.lock +195 -167
  4. data/app/components/avo/index/resource_controls_component.rb +1 -1
  5. data/app/components/avo/views/resource_edit_component.html.erb +1 -1
  6. data/app/controllers/avo/application_controller.rb +5 -19
  7. data/app/helpers/avo/application_helper.rb +18 -0
  8. data/db/factories.rb +9 -0
  9. data/lib/avo/base_resource.rb +9 -2
  10. data/lib/avo/version.rb +1 -1
  11. data/public/avo-packs/css/application-f9191617.css.map +1 -1
  12. data/public/avo-packs/css/application-f9191617.css.map.br +0 -0
  13. data/public/avo-packs/css/application-f9191617.css.map.gz +0 -0
  14. data/public/avo-packs/js/application-cc89f096028eb1d4d971.js.map +1 -1
  15. data/public/avo-packs/js/application-cc89f096028eb1d4d971.js.map.br +0 -0
  16. data/public/avo-packs/js/application-cc89f096028eb1d4d971.js.map.gz +0 -0
  17. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 46ae39b5c77496f7ebfc4da3404f2d7a5a906cb4098fa174b2b1b37c7ad07dde
4
- data.tar.gz: 1769e6b5c3b2db3d45cc40985a1fb098b7fc8514c42be1317769312571c0c302
3
+ metadata.gz: 88cca5eb20b3bf2b5ffec2d183425a17397af2e2348f75f77b04eba1b7273f42
4
+ data.tar.gz: 95f9929e160e72e1d3b1f2916e234c5aca8831951af44b262552c29418435776
5
5
  SHA512:
6
- metadata.gz: 61a8c1c00aba9bd9673be393add7b9d6b18efca2006ca2527299231fe152e5e0cdf0f2ee1f7f2f889afb5dc9726a29963b13d2b5be451387d96e30dc8f0d06e0
7
- data.tar.gz: e195465f471e4c9cd37bb5e2db31711ee1f9101f7dd5095da752acb6f4a76a818bccac7552434c545f108726c96139fb45f15113b57c3649e7807292f6fe6586
6
+ metadata.gz: 84865027b7970efac44ab3899268123af6d081b59cd28781a26c5075c7ccff3197b6546f70bed48aa202ecdee3d7586f4356863908f42a462bf35871cd0d59ae
7
+ data.tar.gz: 5dd638cd5699db08ab642cfc00523ff19f9cb8338408d9b38ba0b167ec23fab209529367be43f87ac117f2f9173fe498e5cdc37ec8533202135902a6b4a80b75
data/Gemfile CHANGED
@@ -15,7 +15,7 @@ gemspec
15
15
  # gem 'byebug', group: [:development, :test]
16
16
 
17
17
  # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
18
- gem "webpacker", "6.0.0.beta.6"
18
+ gem "webpacker", "6.0.0.rc.6"
19
19
 
20
20
  gem "countries"
21
21
 
@@ -132,3 +132,5 @@ gem 'ransack'
132
132
  gem 'friendly_id', '~> 5.4.0'
133
133
 
134
134
  gem "aws-sdk-s3", require: false
135
+
136
+ gem 'net-smtp', require: false
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- avo (1.18.1)
4
+ avo (1.18.2.pre.0)
5
5
  active_link_to
6
6
  addressable
7
7
  breadcrumbs_on_rails
@@ -20,40 +20,40 @@ PATH
20
20
  GEM
21
21
  remote: https://rubygems.org/
22
22
  specs:
23
- actioncable (6.1.3.2)
24
- actionpack (= 6.1.3.2)
25
- activesupport (= 6.1.3.2)
23
+ actioncable (6.1.4.4)
24
+ actionpack (= 6.1.4.4)
25
+ activesupport (= 6.1.4.4)
26
26
  nio4r (~> 2.0)
27
27
  websocket-driver (>= 0.6.1)
28
- actionmailbox (6.1.3.2)
29
- actionpack (= 6.1.3.2)
30
- activejob (= 6.1.3.2)
31
- activerecord (= 6.1.3.2)
32
- activestorage (= 6.1.3.2)
33
- activesupport (= 6.1.3.2)
28
+ actionmailbox (6.1.4.4)
29
+ actionpack (= 6.1.4.4)
30
+ activejob (= 6.1.4.4)
31
+ activerecord (= 6.1.4.4)
32
+ activestorage (= 6.1.4.4)
33
+ activesupport (= 6.1.4.4)
34
34
  mail (>= 2.7.1)
35
- actionmailer (6.1.3.2)
36
- actionpack (= 6.1.3.2)
37
- actionview (= 6.1.3.2)
38
- activejob (= 6.1.3.2)
39
- activesupport (= 6.1.3.2)
35
+ actionmailer (6.1.4.4)
36
+ actionpack (= 6.1.4.4)
37
+ actionview (= 6.1.4.4)
38
+ activejob (= 6.1.4.4)
39
+ activesupport (= 6.1.4.4)
40
40
  mail (~> 2.5, >= 2.5.4)
41
41
  rails-dom-testing (~> 2.0)
42
- actionpack (6.1.3.2)
43
- actionview (= 6.1.3.2)
44
- activesupport (= 6.1.3.2)
42
+ actionpack (6.1.4.4)
43
+ actionview (= 6.1.4.4)
44
+ activesupport (= 6.1.4.4)
45
45
  rack (~> 2.0, >= 2.0.9)
46
46
  rack-test (>= 0.6.3)
47
47
  rails-dom-testing (~> 2.0)
48
48
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
49
- actiontext (6.1.3.2)
50
- actionpack (= 6.1.3.2)
51
- activerecord (= 6.1.3.2)
52
- activestorage (= 6.1.3.2)
53
- activesupport (= 6.1.3.2)
49
+ actiontext (6.1.4.4)
50
+ actionpack (= 6.1.4.4)
51
+ activerecord (= 6.1.4.4)
52
+ activestorage (= 6.1.4.4)
53
+ activesupport (= 6.1.4.4)
54
54
  nokogiri (>= 1.8.5)
55
- actionview (6.1.3.2)
56
- activesupport (= 6.1.3.2)
55
+ actionview (6.1.4.4)
56
+ activesupport (= 6.1.4.4)
57
57
  builder (~> 3.1)
58
58
  erubi (~> 1.4)
59
59
  rails-dom-testing (~> 2.0)
@@ -61,22 +61,22 @@ GEM
61
61
  active_link_to (1.0.5)
62
62
  actionpack
63
63
  addressable
64
- activejob (6.1.3.2)
65
- activesupport (= 6.1.3.2)
64
+ activejob (6.1.4.4)
65
+ activesupport (= 6.1.4.4)
66
66
  globalid (>= 0.3.6)
67
- activemodel (6.1.3.2)
68
- activesupport (= 6.1.3.2)
69
- activerecord (6.1.3.2)
70
- activemodel (= 6.1.3.2)
71
- activesupport (= 6.1.3.2)
72
- activestorage (6.1.3.2)
73
- actionpack (= 6.1.3.2)
74
- activejob (= 6.1.3.2)
75
- activerecord (= 6.1.3.2)
76
- activesupport (= 6.1.3.2)
67
+ activemodel (6.1.4.4)
68
+ activesupport (= 6.1.4.4)
69
+ activerecord (6.1.4.4)
70
+ activemodel (= 6.1.4.4)
71
+ activesupport (= 6.1.4.4)
72
+ activestorage (6.1.4.4)
73
+ actionpack (= 6.1.4.4)
74
+ activejob (= 6.1.4.4)
75
+ activerecord (= 6.1.4.4)
76
+ activesupport (= 6.1.4.4)
77
77
  marcel (~> 1.0.0)
78
- mini_mime (~> 1.0.2)
79
- activesupport (6.1.3.2)
78
+ mini_mime (>= 1.1.0)
79
+ activesupport (6.1.4.4)
80
80
  concurrent-ruby (~> 1.0, >= 1.0.2)
81
81
  i18n (>= 1.6, < 2)
82
82
  minitest (>= 5.1)
@@ -84,104 +84,114 @@ GEM
84
84
  zeitwerk (~> 2.3)
85
85
  addressable (2.8.0)
86
86
  public_suffix (>= 2.0.2, < 5.0)
87
- appraisal (2.4.0)
87
+ appraisal (2.4.1)
88
88
  bundler
89
89
  rake
90
90
  thor (>= 0.14.0)
91
91
  ast (2.4.2)
92
- aws-eventstream (1.1.1)
93
- aws-partitions (1.465.0)
94
- aws-sdk-core (3.114.1)
92
+ aws-eventstream (1.2.0)
93
+ aws-partitions (1.547.0)
94
+ aws-sdk-core (3.125.2)
95
95
  aws-eventstream (~> 1, >= 1.0.2)
96
- aws-partitions (~> 1, >= 1.239.0)
96
+ aws-partitions (~> 1, >= 1.525.0)
97
97
  aws-sigv4 (~> 1.1)
98
98
  jmespath (~> 1.0)
99
- aws-sdk-kms (1.43.0)
100
- aws-sdk-core (~> 3, >= 3.112.0)
99
+ aws-sdk-kms (1.53.0)
100
+ aws-sdk-core (~> 3, >= 3.125.0)
101
101
  aws-sigv4 (~> 1.1)
102
- aws-sdk-s3 (1.95.1)
103
- aws-sdk-core (~> 3, >= 3.112.0)
102
+ aws-sdk-s3 (1.111.1)
103
+ aws-sdk-core (~> 3, >= 3.125.0)
104
104
  aws-sdk-kms (~> 1)
105
- aws-sigv4 (~> 1.1)
106
- aws-sigv4 (1.2.3)
105
+ aws-sigv4 (~> 1.4)
106
+ aws-sigv4 (1.4.0)
107
107
  aws-eventstream (~> 1, >= 1.0.2)
108
108
  bcrypt (3.1.16)
109
109
  bindex (0.8.1)
110
110
  bootsnap (1.9.3)
111
111
  msgpack (~> 1.0)
112
- breadcrumbs_on_rails (4.0.0)
113
- rails (>= 5.0)
112
+ breadcrumbs_on_rails (4.1.0)
113
+ railties (>= 5.0)
114
114
  builder (3.2.4)
115
- bump (0.9.0)
115
+ bump (0.10.0)
116
116
  byebug (11.1.3)
117
- capybara (3.33.0)
117
+ capybara (3.36.0)
118
118
  addressable
119
+ matrix
119
120
  mini_mime (>= 0.1.3)
120
121
  nokogiri (~> 1.8)
121
122
  rack (>= 1.6.0)
122
123
  rack-test (>= 0.6.3)
123
- regexp_parser (~> 1.5)
124
+ regexp_parser (>= 1.5, < 3.0)
124
125
  xpath (~> 3.2)
125
- childprocess (3.0.0)
126
+ childprocess (4.1.0)
126
127
  concurrent-ruby (1.1.9)
127
- countries (3.1.0)
128
- i18n_data (~> 0.11.0)
128
+ countries (4.1.3)
129
+ i18n_data (~> 0.15.0)
129
130
  sixarm_ruby_unaccent (~> 1.1)
130
- unicode_utils (~> 1.4)
131
- crack (0.4.4)
131
+ crack (0.4.5)
132
+ rexml
132
133
  crass (1.0.6)
133
- database_cleaner (1.8.5)
134
+ database_cleaner (2.0.1)
135
+ database_cleaner-active_record (~> 2.0.0)
136
+ database_cleaner-active_record (2.0.1)
137
+ activerecord (>= 5.a)
138
+ database_cleaner-core (~> 2.0.0)
139
+ database_cleaner-core (2.0.1)
134
140
  devise (4.8.1)
135
141
  bcrypt (~> 3.0)
136
142
  orm_adapter (~> 0.1)
137
143
  railties (>= 4.1.0)
138
144
  responders
139
145
  warden (~> 1.2.3)
140
- diff-lcs (1.4.4)
141
- docile (1.3.2)
146
+ diff-lcs (1.5.0)
147
+ digest (3.1.0)
148
+ docile (1.4.0)
142
149
  dotenv (2.7.6)
143
150
  dotenv-rails (2.7.6)
144
151
  dotenv (= 2.7.6)
145
152
  railties (>= 3.2)
146
153
  erubi (1.10.0)
147
- factory_bot (6.1.0)
154
+ factory_bot (6.2.0)
148
155
  activesupport (>= 5.0.0)
149
- factory_bot_rails (6.1.0)
150
- factory_bot (~> 6.1.0)
156
+ factory_bot_rails (6.2.0)
157
+ factory_bot (~> 6.2.0)
151
158
  railties (>= 5.0.0)
152
- faker (2.14.0)
159
+ faker (2.19.0)
153
160
  i18n (>= 1.6, < 2)
154
- ffi (1.15.0)
161
+ ffi (1.15.5)
155
162
  friendly_id (5.4.2)
156
163
  activerecord (>= 4.0.0)
157
- fuubar (2.5.0)
164
+ fuubar (2.5.1)
158
165
  rspec-core (~> 3.0)
159
166
  ruby-progressbar (~> 1.4)
160
- gem-release (2.1.1)
161
- globalid (0.4.2)
162
- activesupport (>= 4.2.0)
167
+ gem-release (2.2.2)
168
+ globalid (1.0.0)
169
+ activesupport (>= 5.0)
163
170
  hashdiff (1.0.1)
164
171
  hotwire-rails (0.1.3)
165
172
  rails (>= 6.0.0)
166
173
  stimulus-rails
167
174
  turbo-rails
168
- httparty (0.18.1)
175
+ httparty (0.20.0)
169
176
  mime-types (~> 3.0)
170
177
  multi_xml (>= 0.5.2)
171
178
  i18n (1.8.11)
172
179
  concurrent-ruby (~> 1.0)
173
- i18n_data (0.11.0)
180
+ i18n_data (0.15.0)
181
+ simple_po_parser (~> 1.1)
174
182
  image_processing (1.12.1)
175
183
  mini_magick (>= 4.9.5, < 5)
176
184
  ruby-vips (>= 2.0.17, < 3)
177
- iso (0.3.0)
185
+ io-wait (0.2.1)
186
+ iso (0.4.0)
178
187
  i18n
179
- jbuilder (2.10.1)
188
+ jbuilder (2.11.5)
189
+ actionview (>= 5.0.0)
180
190
  activesupport (>= 5.0.0)
181
- jmespath (1.4.0)
191
+ jmespath (1.5.0)
182
192
  launchy (2.5.0)
183
193
  addressable (~> 2.7)
184
- listen (3.5.1)
194
+ listen (3.7.0)
185
195
  rb-fsevent (~> 0.10, >= 0.10.3)
186
196
  rb-inotify (~> 0.9, >= 0.9.10)
187
197
  loofah (2.13.0)
@@ -189,57 +199,67 @@ GEM
189
199
  nokogiri (>= 1.5.9)
190
200
  mail (2.7.1)
191
201
  mini_mime (>= 0.1.1)
192
- manifester (0.1.7)
202
+ manifester (0.1.8)
193
203
  rails (>= 6.0)
194
204
  zeitwerk
195
- marcel (1.0.1)
196
- meta-tags (2.14.0)
197
- actionpack (>= 3.2.0, < 6.2)
205
+ marcel (1.0.2)
206
+ matrix (0.4.2)
207
+ meta-tags (2.16.0)
208
+ actionpack (>= 3.2.0, < 7.1)
198
209
  method_source (1.0.0)
199
- mime-types (3.3.1)
210
+ mime-types (3.4.1)
200
211
  mime-types-data (~> 3.2015)
201
- mime-types-data (3.2021.0225)
212
+ mime-types-data (3.2022.0105)
202
213
  mini_magick (4.11.0)
203
- mini_mime (1.0.3)
204
- mini_portile2 (2.6.1)
214
+ mini_mime (1.1.2)
215
+ mini_portile2 (2.7.1)
205
216
  minitest (5.15.0)
206
217
  msgpack (1.4.2)
207
218
  multi_xml (0.6.0)
219
+ net-protocol (0.1.2)
220
+ io-wait
221
+ timeout
222
+ net-smtp (0.3.1)
223
+ digest
224
+ net-protocol
225
+ timeout
208
226
  nio4r (2.5.8)
209
- nokogiri (1.12.5)
210
- mini_portile2 (~> 2.6.1)
227
+ nokogiri (1.13.0)
228
+ mini_portile2 (~> 2.7.0)
229
+ racc (~> 1.4)
230
+ nokogiri (1.13.0-x86_64-linux)
211
231
  racc (~> 1.4)
212
232
  orm_adapter (0.5.0)
213
- pagy (5.6.10)
214
- parallel (1.20.1)
215
- parser (3.0.0.0)
233
+ pagy (5.7.1)
234
+ parallel (1.21.0)
235
+ parser (3.1.0.0)
216
236
  ast (~> 2.4.1)
217
237
  pg (1.2.3)
218
238
  public_suffix (4.0.6)
219
- puma (5.5.1)
239
+ puma (5.5.2)
220
240
  nio4r (~> 2.0)
221
- pundit (2.1.0)
241
+ pundit (2.1.1)
222
242
  activesupport (>= 3.0.0)
223
243
  racc (1.6.0)
224
244
  rack (2.2.3)
225
- rack-proxy (0.6.5)
245
+ rack-proxy (0.7.2)
226
246
  rack
227
247
  rack-test (1.1.0)
228
248
  rack (>= 1.0, < 3)
229
- rails (6.1.3.2)
230
- actioncable (= 6.1.3.2)
231
- actionmailbox (= 6.1.3.2)
232
- actionmailer (= 6.1.3.2)
233
- actionpack (= 6.1.3.2)
234
- actiontext (= 6.1.3.2)
235
- actionview (= 6.1.3.2)
236
- activejob (= 6.1.3.2)
237
- activemodel (= 6.1.3.2)
238
- activerecord (= 6.1.3.2)
239
- activestorage (= 6.1.3.2)
240
- activesupport (= 6.1.3.2)
249
+ rails (6.1.4.4)
250
+ actioncable (= 6.1.4.4)
251
+ actionmailbox (= 6.1.4.4)
252
+ actionmailer (= 6.1.4.4)
253
+ actionpack (= 6.1.4.4)
254
+ actiontext (= 6.1.4.4)
255
+ actionview (= 6.1.4.4)
256
+ activejob (= 6.1.4.4)
257
+ activemodel (= 6.1.4.4)
258
+ activerecord (= 6.1.4.4)
259
+ activestorage (= 6.1.4.4)
260
+ activesupport (= 6.1.4.4)
241
261
  bundler (>= 1.15.0)
242
- railties (= 6.1.3.2)
262
+ railties (= 6.1.4.4)
243
263
  sprockets-rails (>= 2.0.0)
244
264
  rails-controller-testing (1.0.5)
245
265
  actionpack (>= 5.0.1.rc1)
@@ -250,63 +270,63 @@ GEM
250
270
  nokogiri (>= 1.6)
251
271
  rails-html-sanitizer (1.4.2)
252
272
  loofah (~> 2.3)
253
- railties (6.1.3.2)
254
- actionpack (= 6.1.3.2)
255
- activesupport (= 6.1.3.2)
273
+ railties (6.1.4.4)
274
+ actionpack (= 6.1.4.4)
275
+ activesupport (= 6.1.4.4)
256
276
  method_source
257
- rake (>= 0.8.7)
277
+ rake (>= 0.13)
258
278
  thor (~> 1.0)
259
279
  rainbow (3.0.0)
260
280
  rake (13.0.6)
261
- ransack (2.4.2)
281
+ ransack (2.5.0)
262
282
  activerecord (>= 5.2.4)
263
283
  activesupport (>= 5.2.4)
264
284
  i18n
265
- rb-fsevent (0.10.4)
285
+ rb-fsevent (0.11.0)
266
286
  rb-inotify (0.10.1)
267
287
  ffi (~> 1.0)
268
- regexp_parser (1.8.1)
288
+ regexp_parser (2.2.0)
269
289
  responders (3.0.1)
270
290
  actionpack (>= 5.0)
271
291
  railties (>= 5.0)
272
292
  rexml (3.2.5)
273
- rspec-core (3.9.2)
274
- rspec-support (~> 3.9.3)
275
- rspec-expectations (3.9.2)
293
+ rspec-core (3.10.1)
294
+ rspec-support (~> 3.10.0)
295
+ rspec-expectations (3.10.1)
276
296
  diff-lcs (>= 1.2.0, < 2.0)
277
- rspec-support (~> 3.9.0)
278
- rspec-mocks (3.9.1)
297
+ rspec-support (~> 3.10.0)
298
+ rspec-mocks (3.10.2)
279
299
  diff-lcs (>= 1.2.0, < 2.0)
280
- rspec-support (~> 3.9.0)
281
- rspec-rails (4.0.1)
300
+ rspec-support (~> 3.10.0)
301
+ rspec-rails (4.0.2)
282
302
  actionpack (>= 4.2)
283
303
  activesupport (>= 4.2)
284
304
  railties (>= 4.2)
285
- rspec-core (~> 3.9)
286
- rspec-expectations (~> 3.9)
287
- rspec-mocks (~> 3.9)
288
- rspec-support (~> 3.9)
289
- rspec-support (3.9.3)
290
- rubocop (1.11.0)
305
+ rspec-core (~> 3.10)
306
+ rspec-expectations (~> 3.10)
307
+ rspec-mocks (~> 3.10)
308
+ rspec-support (~> 3.10)
309
+ rspec-support (3.10.3)
310
+ rubocop (1.24.1)
291
311
  parallel (~> 1.10)
292
312
  parser (>= 3.0.0.0)
293
313
  rainbow (>= 2.2.2, < 4.0)
294
314
  regexp_parser (>= 1.8, < 3.0)
295
315
  rexml
296
- rubocop-ast (>= 1.2.0, < 2.0)
316
+ rubocop-ast (>= 1.15.1, < 2.0)
297
317
  ruby-progressbar (~> 1.7)
298
318
  unicode-display_width (>= 1.4.0, < 3.0)
299
- rubocop-ast (1.4.1)
300
- parser (>= 2.7.1.5)
301
- rubocop-performance (1.10.1)
302
- rubocop (>= 0.90.0, < 2.0)
319
+ rubocop-ast (1.15.1)
320
+ parser (>= 3.0.1.1)
321
+ rubocop-performance (1.13.1)
322
+ rubocop (>= 1.7.0, < 2.0)
303
323
  rubocop-ast (>= 0.4.0)
304
- ruby-debug-ide (0.7.2)
324
+ ruby-debug-ide (0.7.3)
305
325
  rake (>= 0.8.1)
306
- ruby-progressbar (1.10.1)
307
- ruby-vips (2.1.0)
326
+ ruby-progressbar (1.11.0)
327
+ ruby-vips (2.1.4)
308
328
  ffi (~> 1.12)
309
- rubyzip (2.3.0)
329
+ rubyzip (2.3.2)
310
330
  sass-rails (6.0.0)
311
331
  sassc-rails (~> 2.1, >= 2.1.1)
312
332
  sassc (2.4.0)
@@ -317,69 +337,76 @@ GEM
317
337
  sprockets (> 3.0)
318
338
  sprockets-rails
319
339
  tilt
320
- selenium-webdriver (3.142.7)
321
- childprocess (>= 0.5, < 4.0)
340
+ selenium-webdriver (4.1.0)
341
+ childprocess (>= 0.5, < 5.0)
342
+ rexml (~> 3.2, >= 3.2.5)
322
343
  rubyzip (>= 1.2.2)
323
344
  semantic_range (3.0.0)
324
- simplecov (0.19.0)
345
+ simple_po_parser (1.1.5)
346
+ simplecov (0.21.2)
325
347
  docile (~> 1.1)
326
348
  simplecov-html (~> 0.11)
327
- simplecov-cobertura (1.4.1)
328
- simplecov (~> 0.8)
349
+ simplecov_json_formatter (~> 0.1)
350
+ simplecov-cobertura (2.1.0)
351
+ rexml
352
+ simplecov (~> 0.19)
329
353
  simplecov-html (0.12.3)
354
+ simplecov_json_formatter (0.1.3)
330
355
  sixarm_ruby_unaccent (1.2.0)
331
- spring (2.1.1)
356
+ spring (4.0.0)
332
357
  spring-commands-rspec (1.0.4)
333
358
  spring (>= 0.9.1)
334
359
  sprockets (4.0.2)
335
360
  concurrent-ruby (~> 1.0)
336
361
  rack (> 1, < 3)
337
- sprockets-rails (3.2.2)
338
- actionpack (>= 4.0)
339
- activesupport (>= 4.0)
362
+ sprockets-rails (3.4.2)
363
+ actionpack (>= 5.2)
364
+ activesupport (>= 5.2)
340
365
  sprockets (>= 3.0.0)
341
- standard (1.0.4)
342
- rubocop (= 1.11.0)
343
- rubocop-performance (= 1.10.1)
344
- stimulus-rails (0.2.3)
345
- rails (>= 6.0.0)
346
- test-prof (0.12.2)
347
- thor (1.1.0)
366
+ standard (1.6.0)
367
+ rubocop (= 1.24.1)
368
+ rubocop-performance (= 1.13.1)
369
+ stimulus-rails (1.0.2)
370
+ railties (>= 6.0.0)
371
+ test-prof (1.0.7)
372
+ thor (1.2.1)
348
373
  tilt (2.0.10)
349
- turbo-rails (0.5.9)
350
- rails (>= 6.0.0)
374
+ timeout (0.2.0)
375
+ turbo-rails (1.0.0)
376
+ actionpack (>= 6.0.0)
377
+ railties (>= 6.0.0)
351
378
  tzinfo (2.0.4)
352
379
  concurrent-ruby (~> 1.0)
353
- unicode-display_width (2.0.0)
354
- unicode_utils (1.4.0)
355
- view_component (2.33.0)
356
- activesupport (>= 5.0.0, < 7.0)
380
+ unicode-display_width (2.1.0)
381
+ view_component (2.47.0)
382
+ activesupport (>= 5.0.0, < 8.0)
383
+ method_source (~> 1.0)
357
384
  warden (1.2.9)
358
385
  rack (>= 2.0.9)
359
- web-console (4.1.0)
386
+ web-console (4.2.0)
360
387
  actionview (>= 6.0.0)
361
388
  activemodel (>= 6.0.0)
362
389
  bindex (>= 0.4.0)
363
390
  railties (>= 6.0.0)
364
- webdrivers (4.4.1)
391
+ webdrivers (5.0.0)
365
392
  nokogiri (~> 1.6)
366
393
  rubyzip (>= 1.3.0)
367
- selenium-webdriver (>= 3.0, < 4.0)
368
- webmock (3.9.3)
369
- addressable (>= 2.3.6)
394
+ selenium-webdriver (~> 4.0)
395
+ webmock (3.14.0)
396
+ addressable (>= 2.8.0)
370
397
  crack (>= 0.3.2)
371
398
  hashdiff (>= 0.4.0, < 2.0.0)
372
- webpacker (6.0.0.beta.6)
399
+ webpacker (6.0.0.rc.6)
373
400
  activesupport (>= 5.2)
374
401
  rack-proxy (>= 0.6.1)
375
402
  railties (>= 5.2)
376
403
  semantic_range (>= 2.3.0)
377
- websocket-driver (0.7.4)
404
+ websocket-driver (0.7.5)
378
405
  websocket-extensions (>= 0.1.0)
379
406
  websocket-extensions (0.1.5)
380
407
  xpath (3.2.0)
381
408
  nokogiri (~> 1.8)
382
- zeitwerk (2.5.2)
409
+ zeitwerk (2.5.3)
383
410
 
384
411
  PLATFORMS
385
412
  ruby
@@ -414,6 +441,7 @@ DEPENDENCIES
414
441
  listen (>= 3.5.1)
415
442
  manifester
416
443
  meta-tags
444
+ net-smtp
417
445
  pg (>= 0.18, < 2.0)
418
446
  puma (~> 5.5.1)
419
447
  pundit
@@ -435,7 +463,7 @@ DEPENDENCIES
435
463
  web-console (>= 3.3.0)
436
464
  webdrivers
437
465
  webmock
438
- webpacker (= 6.0.0.beta.6)
466
+ webpacker (= 6.0.0.rc.6)
439
467
  zeitwerk (~> 2.3)
440
468
 
441
469
  BUNDLED WITH
data/app/components/avo/index/resource_controls_component.rb CHANGED
@@ -11,7 +11,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
11
11
  @reflection.present? &&
12
12
  @resource.model.present? &&
13
13
  (@reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)) &&
14
- authorize_association_for('detach')
14
+ authorize_association_for("detach")
15
15
  end
16
16
 
17
17
  def can_edit?
data/app/components/avo/views/resource_edit_component.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <div data-model-id="<%= @resource.model.id %>">
2
2
  <% @resource.panels.each do |resource_panel| %>
3
- <%= form_with model: @resource.model, url: helpers.resource_path(@resource.model), method: :put, multipart: true do |form| %>
3
+ <%= form_with model: @resource.model, scope: @resource.form_scope, url: helpers.resource_path(@resource.model), method: :put, multipart: true do |form| %>
4
4
  <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>
5
5
 
6
6
  <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
data/app/controllers/avo/application_controller.rb CHANGED
@@ -2,6 +2,8 @@ module Avo
2
2
  class ApplicationController < ::ActionController::Base
3
3
  include Pundit
4
4
  include Pagy::Backend
5
+ include Avo::ApplicationHelper
6
+
5
7
  protect_from_forgery with: :exception
6
8
  before_action :init_app
7
9
  before_action :check_avo_license
@@ -71,6 +73,8 @@ module Avo
71
73
  def resources_path(model, keep_query_params: false, **args)
72
74
  return if model.nil?
73
75
 
76
+ model_class = get_model_class model
77
+
74
78
  existing_params = {}
75
79
 
76
80
  begin
@@ -78,7 +82,7 @@ module Avo
78
82
  existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
79
83
  end
80
84
  rescue; end
81
- avo.send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
85
+ avo.send :"resources_#{model_class.base_class.model_name.route_key}_path", **existing_params, **args
82
86
  end
83
87
 
84
88
  def related_resources_path(parent_model, model, keep_query_params: false, **args)
@@ -283,23 +287,5 @@ module Avo
283
287
  def on_api_path
284
288
  request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
285
289
  end
286
-
287
- def get_model_class(model)
288
- if model.instance_of?(Class)
289
- model
290
- else
291
- model.class
292
- end
293
- end
294
-
295
- def singular_name(model_or_class)
296
- model_class = get_model_class model_or_class
297
-
298
- if ActiveModel::Naming.uncountable? model_class
299
- model_class.model_name.route_key.singularize.gsub('_index', '')
300
- else
301
- model_class.model_name.route_key.singularize
302
- end
303
- end
304
290
  end
305
291
  end