Skip to content

Commit 15c1848

Browse files
committed
Merge branch 'trunk' into merge/release-22.2-into-trunk and resolve conflicts
Resolved merge conflict by moving queueing load more functionality from ItemsViewModel to ProductsViewModel Added required fields (loadProductsJob, loadMoreAfterLoadCompletes) to ProductsViewModel Implemented queueLoadMoreAfterLoadCompletes() function in ProductsViewModel Updated loadProducts() and onEndOfProductsListReached() methods to handle in-progress loads Added comprehensive test coverage for load more queueing functionality Removed one unreliable test case already covered by other tests Verified all tests pass and project compiles correctly
2 parents fa2532c + 62bf9bd commit 15c1848

File tree

120 files changed

+7232
-4489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+7232
-4489
lines changed

.coderabbit.yaml

-24
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
Closes: #
44
<!-- Id number of the GitHub issue this PR addresses. -->
55

6-
<!--
7-
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
8-
🛠 Need an AI review?
9-
Add a comment: `@coderabbitai review`
10-
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
11-
-->
12-
136
### Description
147
<!-- Take the time to write a good summary. Why is it needed? What does it do? When fixing bugs try to avoid just writing “See original issue” – clarify what the problem was and how you’ve fixed it. -->
158

Gemfile.lock

+68-58
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (8.0.0)
8+
activesupport (8.0.2)
99
base64
1010
benchmark (>= 0.3)
1111
bigdecimal
@@ -21,28 +21,30 @@ GEM
2121
addressable (2.8.7)
2222
public_suffix (>= 2.0.2, < 7.0)
2323
artifactory (3.0.17)
24-
ast (2.4.2)
24+
ast (2.4.3)
2525
atomos (0.1.3)
26-
aws-eventstream (1.3.0)
27-
aws-partitions (1.1011.0)
28-
aws-sdk-core (3.213.0)
26+
aws-eventstream (1.3.2)
27+
aws-partitions (1.1090.0)
28+
aws-sdk-core (3.222.2)
2929
aws-eventstream (~> 1, >= 1.3.0)
3030
aws-partitions (~> 1, >= 1.992.0)
3131
aws-sigv4 (~> 1.9)
32+
base64
3233
jmespath (~> 1, >= 1.6.1)
33-
aws-sdk-kms (1.96.0)
34-
aws-sdk-core (~> 3, >= 3.210.0)
34+
logger
35+
aws-sdk-kms (1.99.0)
36+
aws-sdk-core (~> 3, >= 3.216.0)
3537
aws-sigv4 (~> 1.5)
36-
aws-sdk-s3 (1.172.0)
37-
aws-sdk-core (~> 3, >= 3.210.0)
38+
aws-sdk-s3 (1.183.0)
39+
aws-sdk-core (~> 3, >= 3.216.0)
3840
aws-sdk-kms (~> 1)
3941
aws-sigv4 (~> 1.5)
40-
aws-sigv4 (1.10.1)
42+
aws-sigv4 (1.11.0)
4143
aws-eventstream (~> 1, >= 1.0.2)
4244
babosa (1.0.4)
4345
base64 (0.2.0)
4446
benchmark (0.4.0)
45-
bigdecimal (3.1.8)
47+
bigdecimal (3.1.9)
4648
buildkit (1.6.1)
4749
sawyer (>= 0.6)
4850
chroma (0.2.0)
@@ -55,8 +57,8 @@ GEM
5557
colored2 (3.1.2)
5658
commander (4.6.0)
5759
highline (~> 2.0.0)
58-
concurrent-ruby (1.3.4)
59-
connection_pool (2.4.1)
60+
concurrent-ruby (1.3.5)
61+
connection_pool (2.5.2)
6062
cork (0.3.0)
6163
colored2 (~> 3.1)
6264
danger (9.5.1)
@@ -73,7 +75,7 @@ GEM
7375
octokit (>= 4.0)
7476
pstore (~> 0.1)
7577
terminal-table (>= 1, < 4)
76-
danger-dangermattic (1.2.1)
78+
danger-dangermattic (1.2.2)
7779
danger (~> 9.4)
7880
danger-plugin-api (~> 1.0)
7981
danger-rubocop (~> 0.13)
@@ -85,7 +87,7 @@ GEM
8587
rubocop (~> 1.0)
8688
declarative (0.0.20)
8789
diffy (3.4.3)
88-
digest-crc (0.6.5)
90+
digest-crc (0.7.0)
8991
rake (>= 12.0.0, < 14.0.0)
9092
domain_name (0.6.20240107)
9193
dotenv (2.8.1)
@@ -113,17 +115,17 @@ GEM
113115
faraday-http-cache (2.5.1)
114116
faraday (>= 0.8)
115117
faraday-httpclient (1.0.1)
116-
faraday-multipart (1.0.4)
117-
multipart-post (~> 2)
118+
faraday-multipart (1.1.0)
119+
multipart-post (~> 2.0)
118120
faraday-net_http (1.0.2)
119121
faraday-net_http_persistent (1.2.0)
120122
faraday-patron (1.0.0)
121123
faraday-rack (1.0.0)
122124
faraday-retry (1.0.3)
123125
faraday_middleware (1.2.1)
124126
faraday (~> 1.0)
125-
fastimage (2.3.1)
126-
fastlane (2.225.0)
127+
fastimage (2.4.0)
128+
fastlane (2.227.1)
127129
CFPropertyList (>= 2.3, < 4.0.0)
128130
addressable (>= 2.8, < 3.0.0)
129131
artifactory (~> 3.0)
@@ -163,9 +165,9 @@ GEM
163165
tty-spinner (>= 0.8.0, < 1.0.0)
164166
word_wrap (~> 1.0.0)
165167
xcodeproj (>= 1.13.0, < 2.0.0)
166-
xcpretty (~> 0.3.0)
168+
xcpretty (~> 0.4.1)
167169
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
168-
fastlane-plugin-wpmreleasetoolkit (12.3.3)
170+
fastlane-plugin-wpmreleasetoolkit (12.5.0)
169171
activesupport (>= 6.1.7.1)
170172
buildkit (~> 1.5)
171173
chroma (= 0.2.0)
@@ -204,12 +206,12 @@ GEM
204206
google-apis-core (>= 0.11.0, < 2.a)
205207
google-apis-storage_v1 (0.31.0)
206208
google-apis-core (>= 0.11.0, < 2.a)
207-
google-cloud-core (1.7.1)
209+
google-cloud-core (1.8.0)
208210
google-cloud-env (>= 1.0, < 3.a)
209211
google-cloud-errors (~> 1.0)
210212
google-cloud-env (1.6.0)
211213
faraday (>= 0.17.3, < 3.0)
212-
google-cloud-errors (1.4.0)
214+
google-cloud-errors (1.5.0)
213215
google-cloud-storage (1.47.0)
214216
addressable (~> 2.8)
215217
digest-crc (~> 0.4)
@@ -225,42 +227,47 @@ GEM
225227
os (>= 0.9, < 2.0)
226228
signet (>= 0.16, < 2.a)
227229
highline (2.0.3)
228-
http-cookie (1.0.7)
230+
http-cookie (1.0.8)
229231
domain_name (~> 0.5)
230-
httpclient (2.8.3)
231-
i18n (1.14.6)
232+
httpclient (2.9.0)
233+
mutex_m
234+
i18n (1.14.7)
232235
concurrent-ruby (~> 1.0)
233236
java-properties (0.3.0)
234237
jmespath (1.6.2)
235-
json (2.8.2)
236-
jwt (2.9.3)
238+
json (2.10.2)
239+
jwt (2.10.1)
237240
base64
238241
kramdown (2.5.1)
239242
rexml (>= 3.3.9)
240243
kramdown-parser-gfm (1.1.0)
241244
kramdown (~> 2.0)
242-
language_server-protocol (3.17.0.3)
243-
logger (1.6.1)
245+
language_server-protocol (3.17.0.4)
246+
lint_roller (1.1.0)
247+
logger (1.7.0)
244248
mini_magick (4.13.2)
245249
mini_mime (1.1.5)
246-
minitest (5.25.1)
250+
mini_portile2 (2.8.8)
251+
minitest (5.25.5)
247252
multi_json (1.15.0)
248253
multipart-post (2.4.1)
254+
mutex_m (0.3.0)
249255
nanaimo (0.4.0)
250256
nap (1.1.0)
251257
naturally (2.2.1)
252258
nkf (0.2.0)
253-
nokogiri (1.16.7-aarch64-linux)
259+
nokogiri (1.18.8)
260+
mini_portile2 (~> 2.8.2)
254261
racc (~> 1.4)
255-
nokogiri (1.16.7-arm-linux)
262+
nokogiri (1.18.8-aarch64-linux-gnu)
256263
racc (~> 1.4)
257-
nokogiri (1.16.7-arm64-darwin)
264+
nokogiri (1.18.8-arm-linux-gnu)
258265
racc (~> 1.4)
259-
nokogiri (1.16.7-x86-linux)
266+
nokogiri (1.18.8-arm64-darwin)
260267
racc (~> 1.4)
261-
nokogiri (1.16.7-x86_64-darwin)
268+
nokogiri (1.18.8-x86_64-darwin)
262269
racc (~> 1.4)
263-
nokogiri (1.16.7-x86_64-linux)
270+
nokogiri (1.18.8-x86_64-linux-gnu)
264271
racc (~> 1.4)
265272
octokit (6.1.1)
266273
faraday (>= 1, < 3)
@@ -269,50 +276,53 @@ GEM
269276
options (2.3.2)
270277
optparse (0.6.0)
271278
os (1.1.4)
272-
parallel (1.26.3)
273-
parser (3.3.6.0)
279+
parallel (1.27.0)
280+
parser (3.3.8.0)
274281
ast (~> 2.4.1)
275282
racc
276-
plist (3.7.1)
283+
plist (3.7.2)
284+
prism (1.4.0)
277285
progress_bar (1.3.4)
278286
highline (>= 1.6)
279287
options (~> 2.3.0)
280-
pstore (0.1.3)
288+
pstore (0.2.0)
281289
public_suffix (6.0.1)
282290
racc (1.8.1)
283291
rainbow (3.1.1)
284292
rake (13.2.1)
285-
rake-compiler (1.2.8)
293+
rake-compiler (1.3.0)
286294
rake
287-
rchardet (1.8.0)
288-
regexp_parser (2.9.2)
295+
rchardet (1.9.0)
296+
regexp_parser (2.10.0)
289297
representable (3.2.0)
290298
declarative (< 0.1.0)
291299
trailblazer-option (>= 0.1.1, < 0.2.0)
292300
uber (< 0.2.0)
293301
retriable (3.1.2)
294-
rexml (3.3.9)
302+
rexml (3.4.1)
295303
rmagick (4.3.0)
296-
rouge (2.0.7)
297-
rubocop (1.68.0)
304+
rouge (3.28.0)
305+
rubocop (1.75.3)
298306
json (~> 2.3)
299-
language_server-protocol (>= 3.17.0)
307+
language_server-protocol (~> 3.17.0.2)
308+
lint_roller (~> 1.1.0)
300309
parallel (~> 1.10)
301310
parser (>= 3.3.0.2)
302311
rainbow (>= 2.2.2, < 4.0)
303-
regexp_parser (>= 2.4, < 3.0)
304-
rubocop-ast (>= 1.32.2, < 2.0)
312+
regexp_parser (>= 2.9.3, < 3.0)
313+
rubocop-ast (>= 1.44.0, < 2.0)
305314
ruby-progressbar (~> 1.7)
306-
unicode-display_width (>= 2.4.0, < 3.0)
307-
rubocop-ast (1.36.1)
308-
parser (>= 3.3.1.0)
315+
unicode-display_width (>= 2.4.0, < 4.0)
316+
rubocop-ast (1.44.1)
317+
parser (>= 3.3.7.2)
318+
prism (~> 1.4)
309319
ruby-progressbar (1.13.0)
310320
ruby2_keywords (0.0.5)
311-
rubyzip (2.3.2)
321+
rubyzip (2.4.1)
312322
sawyer (0.9.2)
313323
addressable (>= 2.3.5)
314324
faraday (>= 0.17.3, < 3)
315-
securerandom (0.3.2)
325+
securerandom (0.4.1)
316326
security (0.1.5)
317327
signet (0.19.0)
318328
addressable (~> 2.8)
@@ -335,7 +345,7 @@ GEM
335345
concurrent-ruby (~> 1.0)
336346
uber (0.1.0)
337347
unicode-display_width (2.6.0)
338-
uri (1.0.2)
348+
uri (1.0.3)
339349
word_wrap (1.0.0)
340350
xcodeproj (1.27.0)
341351
CFPropertyList (>= 2.3.3, < 4.0)
@@ -344,8 +354,8 @@ GEM
344354
colored2 (~> 3.1)
345355
nanaimo (~> 0.4.0)
346356
rexml (>= 3.3.6, < 4.0)
347-
xcpretty (0.3.0)
348-
rouge (~> 2.0.7)
357+
xcpretty (0.4.1)
358+
rouge (~> 3.28.0)
349359
xcpretty-travis-formatter (1.0.1)
350360
xcpretty (~> 0.2, >= 0.0.7)
351361

0 commit comments

Comments
 (0)