Merge remote-tracking branch 'origin/main' into feature/skippable-collection-member-ids

Author: fabioh8010

lib/Onyx.ts

@@ -848,7 +848,19 @@ function setCollection<TKey extends CollectionKeyBase, TMap>(collectionKey: TKey
             mutableCollection[key] = null;
         });
 
-        return multiSet(mutableCollection);
+        const keyValuePairs = OnyxUtils.prepareKeyValuePairsForStorage(mutableCollection, true);
+        const previousCollection = OnyxUtils.getCachedCollection(collectionKey);
+
+        keyValuePairs.forEach(([key, value]) => cache.set(key, value));
+
+        const updatePromise = OnyxUtils.scheduleNotifyCollectionSubscribers(collectionKey, mutableCollection, previousCollection);
+
+        return Storage.multiSet(keyValuePairs)
+            .catch((error) => OnyxUtils.evictStorageAndRetry(error, setCollection, collectionKey, collection))
+            .then(() => {
+                OnyxUtils.sendActionToDevTools(OnyxUtils.METHOD.SET_COLLECTION, undefined, mutableCollection);
+                return updatePromise;
+            });
     });
 }
 

lib/OnyxUtils.ts

@@ -181,13 +181,13 @@ function initStoreValues(keys: DeepRecord<string, OnyxKey>, initialKeyStates: Pa
  * @param mergedValue - (optional) value that was written in the storage after a merge method was executed.
  */
 function sendActionToDevTools(
-    method: typeof METHOD.MERGE_COLLECTION | typeof METHOD.MULTI_SET,
+    method: typeof METHOD.MERGE_COLLECTION | typeof METHOD.MULTI_SET | typeof METHOD.SET_COLLECTION,
     key: undefined,
     value: OnyxCollection<KeyValueMapping[OnyxKey]>,
     mergedValue?: undefined,
 ): void;
 function sendActionToDevTools(
-    method: Exclude<OnyxMethod, typeof METHOD.MERGE_COLLECTION | typeof METHOD.MULTI_SET>,
+    method: Exclude<OnyxMethod, typeof METHOD.MERGE_COLLECTION | typeof METHOD.MULTI_SET | typeof METHOD.SET_COLLECTION>,
     key: OnyxKey,
     value: OnyxEntry<KeyValueMapping[OnyxKey]>,
     mergedValue?: OnyxEntry<KeyValueMapping[OnyxKey]>,
@@ -1139,7 +1139,7 @@ function reportStorageQuota(): Promise<void> {
  * evicting some data from Onyx and then retrying to do
  * whatever it is we attempted to do.
  */
-function evictStorageAndRetry<TMethod extends typeof Onyx.set | typeof Onyx.multiSet | typeof Onyx.mergeCollection>(
+function evictStorageAndRetry<TMethod extends typeof Onyx.set | typeof Onyx.multiSet | typeof Onyx.mergeCollection | typeof Onyx.setCollection>(
     error: Error,
     onyxMethod: TMethod,
     ...args: Parameters<TMethod>