Merge pull request #521 from bernhardoj/fix/sync-multi-set-and-merge

Fix multiMerge and multiSet data doesn't synchronize between tabs
Expensify · Mar 27, 2024 · cfd00c0 · cfd00c0
2 parents b0cde54 + e7cfee5
commit cfd00c0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/lib/storage/InstanceSync/index.ts b/lib/storage/InstanceSync/index.ts
@@ -10,6 +10,8 @@ const InstanceSync = {
     setItem: NOOP,
     removeItem: NOOP,
     removeItems: NOOP,
+    multiMerge: NOOP,
+    multiSet: NOOP,
     mergeItem: NOOP,
     clear: <T extends () => void>(callback: T) => Promise.resolve(callback()),
 };

diff --git a/lib/storage/InstanceSync/index.web.ts b/lib/storage/InstanceSync/index.web.ts
@@ -50,6 +50,8 @@ const InstanceSync = {
     setItem: raiseStorageSyncEvent,
     removeItem: raiseStorageSyncEvent,
     removeItems: raiseStorageSyncManyKeysEvent,
+    multiMerge: raiseStorageSyncManyKeysEvent,
+    multiSet: raiseStorageSyncManyKeysEvent,
     mergeItem: raiseStorageSyncEvent,
     clear: (clearImplementation: () => void) => {
         let allKeys: KeyList;

diff --git a/lib/storage/index.ts b/lib/storage/index.ts
@@ -100,7 +100,16 @@ const Storage: Storage = {
     /**
      * Stores multiple key-value pairs in a batch
      */
-    multiSet: (pairs) => tryOrDegradePerformance(() => provider.multiSet(pairs)),
+    multiSet: (pairs) =>
+        tryOrDegradePerformance(() => {
+            const promise = provider.multiSet(pairs);
+
+            if (shouldKeepInstancesSync) {
+                return promise.then(() => InstanceSync.multiSet(pairs.map((pair) => pair[0])));
+            }
+
+            return promise;
+        }),
 
     /**
      * Merging an existing value with a new one
@@ -120,7 +129,16 @@ const Storage: Storage = {
      * Multiple merging of existing and new values in a batch
      * This function also removes all nested null values from an object.
      */
-    multiMerge: (pairs) => tryOrDegradePerformance(() => provider.multiMerge(pairs)),
+    multiMerge: (pairs) =>
+        tryOrDegradePerformance(() => {
+            const promise = provider.multiMerge(pairs);
+
+            if (shouldKeepInstancesSync) {
+                return promise.then(() => InstanceSync.multiMerge(pairs.map((pair) => pair[0])));
+            }
+
+            return promise;
+        }),
 
     /**
      * Removes given key and its value

diff --git a/lib/storage/providers/types.ts b/lib/storage/providers/types.ts
@@ -39,7 +39,7 @@ type StorageProvider = {
     /**
      * Multiple merging of existing and new values in a batch
      */
-    multiMerge: (pairs: KeyValuePairList) => Promise<BatchQueryResult | IDBValidKey[]>;
+    multiMerge: (pairs: KeyValuePairList) => Promise<BatchQueryResult | IDBValidKey[] | void>;
 
     /**
      * Merges an existing value with a new one by leveraging JSON_PATCH