@salesforce/lds-drafts 1.114.1 → 1.114.2

package/dist/ldsDrafts.js

@@ -712,16 +712,24 @@ class DurableDraftQueue {
                 await this.startQueueSafe();
                 return Promise.reject('No action to replace');
             }
-            const { actionToReplace, replacingAction } = this.getHandler(first.handler).handleReplaceAction(actionId, withActionId, this.uploadingActionId, actions);
-            // TODO [W-8873834]: Will add batching support to durable store
-            // we should use that here to remove and set both actions in one operation
-            await this.removeDraftAction(replacingAction.id);
-            await this.draftStore.writeAction(actionToReplace);
-            await this.notifyChangedListeners({
-                type: DraftQueueEventType.ActionUpdated,
-                action: actionToReplace,
-            });
-            this.replacingAction = undefined;
+            // put in a try/finally block so we don't leave this.replacingAction
+            // indefinitely set
+            let actionToReplace;
+            try {
+                const replaceResult = this.getHandler(first.handler).handleReplaceAction(actionId, withActionId, this.uploadingActionId, actions);
+                actionToReplace = replaceResult.actionToReplace;
+                // TODO [W-8873834]: Will add batching support to durable store
+                // we should use that here to remove and set both actions in one operation
+                await this.removeDraftAction(replaceResult.replacingAction.id);
+                await this.draftStore.writeAction(actionToReplace);
+                await this.notifyChangedListeners({
+                    type: DraftQueueEventType.ActionUpdated,
+                    action: actionToReplace,
+                });
+            }
+            finally {
+                this.replacingAction = undefined;
+            }
             await this.startQueueSafe();
             return actionToReplace;
         });
@@ -751,16 +759,23 @@ class DurableDraftQueue {
                 await this.startQueueSafe();
                 throw Error('No action to replace');
             }
-            const merged = this.getHandler(target.handler).mergeActions(target, source);
-            // update the target
-            await this.draftStore.writeAction(merged);
-            await this.notifyChangedListeners({
-                type: DraftQueueEventType.ActionUpdated,
-                action: merged,
-            });
-            // remove the source from queue
-            await this.removeDraftAction(sourceActionId);
-            this.replacingAction = undefined;
+            // put in a try/finally block so we don't leave this.replacingAction
+            // indefinitely set
+            let merged;
+            try {
+                merged = this.getHandler(target.handler).mergeActions(target, source);
+                // update the target
+                await this.draftStore.writeAction(merged);
+                await this.notifyChangedListeners({
+                    type: DraftQueueEventType.ActionUpdated,
+                    action: merged,
+                });
+                // remove the source from queue
+                await this.removeDraftAction(sourceActionId);
+            }
+            finally {
+                this.replacingAction = undefined;
+            }
             await this.startQueueSafe();
             return merged;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-drafts",
-    "version": "1.114.1",
+    "version": "1.114.2",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS Drafts",
     "main": "dist/ldsDrafts.js",
@@ -26,6 +26,6 @@
     "dependencies": {
         "@luvio/engine": "0.137.1",
         "@luvio/environments": "0.137.1",
-        "@salesforce/lds-utils-adapters": "^1.114.1"
+        "@salesforce/lds-utils-adapters": "^1.114.2"
     }
 }