@atlaskit/editor-synced-block-provider 2.14.0 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.15.0
+
+### Minor Changes
+
+- [`4daaa6358e6fb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4daaa6358e6fb) -
+  Update resourceId generation for create reference from browser copy + pasting source block
+
+### Patch Changes
+
+- [`dcc6a3e73f414`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dcc6a3e73f414) -
+  [ux] EDITOR-3304 add offline error state for sync blocks and update other error UI to match new
+  designs
+- Updated dependencies
+
+## 2.14.1
+
+### Patch Changes
+
+- [`433b512284284`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/433b512284284) -
+  [EDITOR-2558] Update bodiedSyncBlock deletion failure flow
+- Updated dependencies
+
 ## 2.14.0
 
 ### Minor Changes

package/dist/cjs/common/types.js

@@ -13,6 +13,8 @@ var SyncBlockError = exports.SyncBlockError = /*#__PURE__*/function (SyncBlockEr
   SyncBlockError["Conflict"] = "conflict";
   // attempt to create block that already exists
   SyncBlockError["ServerError"] = "server_error";
-  SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
+  SyncBlockError["InvalidContent"] = "invalid_content";
+  // content is not a valid JSON
+  SyncBlockError["Offline"] = "offline";
   return SyncBlockError;
 }({});

package/dist/cjs/providers/block-service/blockServiceAPI.js

@@ -196,10 +196,11 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
-  function BlockServiceADFWriteProvider(sourceAri, product) {
+  function BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId) {
     (0, _classCallCheck2.default)(this, BlockServiceADFWriteProvider);
     this.sourceAri = sourceAri;
     this.product = product;
+    this.sourceDocumentId = sourceDocumentId;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -352,12 +353,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {
-      var match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-      if (!(match !== null && match !== void 0 && match[1])) {
-        throw new Error("Invalid source ARI: ".concat(this.sourceAri));
-      }
-      var pageId = match[3];
-      return "".concat(this.product, "/").concat(pageId, "/").concat(sourceId);
+      return "".concat(this.product, "/").concat(this.sourceDocumentId, "/").concat(sourceId);
     }
   }, {
     key: "generateResourceId",
@@ -369,16 +365,16 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
 /**
  * Factory function to create both providers with shared configuration
  */
-var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product) {
+var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   var fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
+  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId);
   return {
     fetchProvider: fetchProvider,
     writeProvider: writeProvider
   };
 };
-var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product) {
+var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   return (0, _react.useMemo)(function () {
-    return createBlockServiceAPIProviders(sourceAri, product);
-  }, [sourceAri, product]);
+    return createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId);
+  }, [sourceAri, product, sourceDocumentId]);
 };

package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js

@@ -274,49 +274,40 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       }
     }
   }, {
-    key: "deleteSyncBlocksWithConfirmation",
+    key: "delete",
     value: function () {
-      var _deleteSyncBlocksWithConfirmation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockIds, deleteCallback) {
+      var _delete2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockIds, onDelete, onDeleteCompleted) {
         var _this5 = this;
-        var confirmed, results, callback, _this$fireAnalyticsEv4;
+        var results, callback, isDeleteSuccessful, _this$fireAnalyticsEv4;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!this.confirmationCallback) {
-                _context2.next = 22;
-                break;
-              }
-              _context2.next = 3;
-              return this.confirmationCallback(syncBlockIds.length);
-            case 3:
-              confirmed = _context2.sent;
-              if (!confirmed) {
-                _context2.next = 22;
-                break;
-              }
-              deleteCallback();
-              _context2.prev = 6;
+              _context2.prev = 0;
               if (this.dataProvider) {
-                _context2.next = 9;
+                _context2.next = 3;
                 break;
               }
               throw new Error('Data provider not set');
-            case 9:
+            case 3:
               syncBlockIds.forEach(function (Ids) {
                 _this5.setPendingDeletion(Ids, true);
               });
-              _context2.next = 12;
+              _context2.next = 6;
               return this.dataProvider.deleteNodesData(syncBlockIds.map(function (attrs) {
                 return attrs.resourceId;
               }));
-            case 12:
+            case 6:
               results = _context2.sent;
-              if (results.every(function (result) {
+              isDeleteSuccessful = results.every(function (result) {
                 return result.success;
-              })) {
+              });
+              onDeleteCompleted(isDeleteSuccessful);
+              if (isDeleteSuccessful) {
+                onDelete();
                 callback = function callback(Ids) {
                   return _this5.syncBlockCache.delete(Ids.resourceId);
                 };
+                this.clearPendingDeletion();
               } else {
                 callback = function callback(Ids) {
                   _this5.setPendingDeletion(Ids, false);
@@ -329,11 +320,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                 });
               }
               syncBlockIds.forEach(callback);
-              _context2.next = 22;
-              break;
-            case 17:
-              _context2.prev = 17;
-              _context2.t0 = _context2["catch"](6);
+              return _context2.abrupt("return", isDeleteSuccessful);
+            case 14:
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](0);
               syncBlockIds.forEach(function (Ids) {
                 _this5.setPendingDeletion(Ids, false);
               });
@@ -341,17 +331,119 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                 location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
               });
               (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, (0, _errorHandling.deleteErrorPayload)(_context2.t0.message));
-            case 22:
+              onDeleteCompleted(false);
+              return _context2.abrupt("return", false);
+            case 21:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[6, 17]]);
+        }, _callee2, this, [[0, 14]]);
+      }));
+      function _delete(_x, _x2, _x3) {
+        return _delete2.apply(this, arguments);
+      }
+      return _delete;
+    }()
+  }, {
+    key: "isRetryingDeletion",
+    value: function isRetryingDeletion() {
+      return !!this.deletionRetryInfo;
+    }
+  }, {
+    key: "retryDeletion",
+    value: function () {
+      var _retryDeletion = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var _this$deletionRetryIn, syncBlockIds, onDelete, onDeleteCompleted;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (this.deletionRetryInfo) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return", Promise.resolve());
+            case 2:
+              _this$deletionRetryIn = this.deletionRetryInfo, syncBlockIds = _this$deletionRetryIn.syncBlockIds, onDelete = _this$deletionRetryIn.onDelete, onDeleteCompleted = _this$deletionRetryIn.onDeleteCompleted;
+              if (!this.confirmationCallback) {
+                _context3.next = 6;
+                break;
+              }
+              _context3.next = 6;
+              return this.delete(syncBlockIds, onDelete, onDeleteCompleted);
+            case 6:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
       }));
-      function deleteSyncBlocksWithConfirmation(_x, _x2) {
+      function retryDeletion() {
+        return _retryDeletion.apply(this, arguments);
+      }
+      return retryDeletion;
+    }()
+  }, {
+    key: "clearPendingDeletion",
+    value: function clearPendingDeletion() {
+      var _this$deletionRetryIn2;
+      (_this$deletionRetryIn2 = this.deletionRetryInfo) === null || _this$deletionRetryIn2 === void 0 || _this$deletionRetryIn2.destroyCallback();
+      this.deletionRetryInfo = undefined;
+    }
+
+    /**
+     *
+     * @param syncBlockIds - The sync block ids to delete
+     * @param onDelete - The callback to delete sync block node from document
+     * @param onDeleteCompleted - The callback for after the deletion is saved to BE (whether successful or not)
+     * @param destroyCallback - The callback to clear any reference stored for deletion (regardless if deletion is completed or abort)
+     */
+  }, {
+    key: "deleteSyncBlocksWithConfirmation",
+    value: (function () {
+      var _deleteSyncBlocksWithConfirmation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(syncBlockIds, onDelete, onDeleteCompleted, destroyCallback) {
+        var confirmed, isDeleteSuccessful;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!this.confirmationCallback) {
+                _context4.next = 12;
+                break;
+              }
+              _context4.next = 3;
+              return this.confirmationCallback(syncBlockIds.length);
+            case 3:
+              confirmed = _context4.sent;
+              if (!confirmed) {
+                _context4.next = 11;
+                break;
+              }
+              _context4.next = 7;
+              return this.delete(syncBlockIds, onDelete, onDeleteCompleted);
+            case 7:
+              isDeleteSuccessful = _context4.sent;
+              if (!isDeleteSuccessful) {
+                // If deletion failed, save deletion info for potential retry
+                this.deletionRetryInfo = {
+                  syncBlockIds: syncBlockIds,
+                  onDelete: onDelete,
+                  onDeleteCompleted: onDeleteCompleted,
+                  destroyCallback: destroyCallback
+                };
+              }
+              _context4.next = 12;
+              break;
+            case 11:
+              destroyCallback();
+            case 12:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function deleteSyncBlocksWithConfirmation(_x4, _x5, _x6, _x7) {
         return _deleteSyncBlocksWithConfirmation.apply(this, arguments);
       }
       return deleteSyncBlocksWithConfirmation;
-    }()
+    }())
   }, {
     key: "destroy",
     value: function destroy() {
@@ -360,6 +452,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       this.pendingResourceId = undefined;
       this.creationCallback = undefined;
       this.dataProvider = undefined;
+      this.clearPendingDeletion();
     }
   }]);
 }();

package/dist/es2019/common/types.js

@@ -7,6 +7,8 @@ export let SyncBlockError = /*#__PURE__*/function (SyncBlockError) {
   SyncBlockError["Conflict"] = "conflict";
   // attempt to create block that already exists
   SyncBlockError["ServerError"] = "server_error";
-  SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
+  SyncBlockError["InvalidContent"] = "invalid_content";
+  // content is not a valid JSON
+  SyncBlockError["Offline"] = "offline";
   return SyncBlockError;
 }({});

package/dist/es2019/providers/block-service/blockServiceAPI.js

@@ -134,9 +134,10 @@ class BlockServiceADFFetchProvider {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
-  constructor(sourceAri, product) {
+  constructor(sourceAri, product, sourceDocumentId) {
     this.sourceAri = sourceAri;
     this.product = product;
+    this.sourceDocumentId = sourceDocumentId;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -227,12 +228,7 @@ class BlockServiceADFWriteProvider {
 
   // the sourceId is the resourceId of the source synced block.
   generateResourceIdForReference(sourceId) {
-    const match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-    if (!(match !== null && match !== void 0 && match[1])) {
-      throw new Error(`Invalid source ARI: ${this.sourceAri}`);
-    }
-    const pageId = match[3];
-    return `${this.product}/${pageId}/${sourceId}`;
+    return `${this.product}/${this.sourceDocumentId}/${sourceId}`;
   }
   generateResourceId() {
     return crypto.randomUUID();
@@ -242,14 +238,14 @@ class BlockServiceADFWriteProvider {
 /**
  * Factory function to create both providers with shared configuration
  */
-const createBlockServiceAPIProviders = (sourceAri, product) => {
+const createBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId) => {
   const fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
+  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId);
   return {
     fetchProvider,
     writeProvider
   };
 };
-export const useMemoizedBlockServiceAPIProviders = (sourceAri, product) => {
-  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product), [sourceAri, product]);
+export const useMemoizedBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId) => {
+  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId), [sourceAri, product, sourceDocumentId]);
 };

package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js

@@ -205,42 +205,91 @@ export class SourceSyncBlockStoreManager {
       (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, createErrorPayload(error.message));
     }
   }
-  async deleteSyncBlocksWithConfirmation(syncBlockIds, deleteCallback) {
+  async delete(syncBlockIds, onDelete, onDeleteCompleted) {
+    try {
+      if (!this.dataProvider) {
+        throw new Error('Data provider not set');
+      }
+      syncBlockIds.forEach(Ids => {
+        this.setPendingDeletion(Ids, true);
+      });
+      const results = await this.dataProvider.deleteNodesData(syncBlockIds.map(attrs => attrs.resourceId));
+      let callback;
+      const isDeleteSuccessful = results.every(result => result.success);
+      onDeleteCompleted(isDeleteSuccessful);
+      if (isDeleteSuccessful) {
+        onDelete();
+        callback = Ids => this.syncBlockCache.delete(Ids.resourceId);
+        this.clearPendingDeletion();
+      } else {
+        callback = Ids => {
+          this.setPendingDeletion(Ids, false);
+        };
+        results.filter(result => result.resourceId === undefined).forEach(result => {
+          var _this$fireAnalyticsEv7;
+          (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block'));
+        });
+      }
+      syncBlockIds.forEach(callback);
+      return isDeleteSuccessful;
+    } catch (error) {
+      var _this$fireAnalyticsEv8;
+      syncBlockIds.forEach(Ids => {
+        this.setPendingDeletion(Ids, false);
+      });
+      logException(error, {
+        location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, deleteErrorPayload(error.message));
+      onDeleteCompleted(false);
+      return false;
+    }
+  }
+  isRetryingDeletion() {
+    return !!this.deletionRetryInfo;
+  }
+  async retryDeletion() {
+    if (!this.deletionRetryInfo) {
+      return Promise.resolve();
+    }
+    const {
+      syncBlockIds,
+      onDelete,
+      onDeleteCompleted
+    } = this.deletionRetryInfo;
+    if (this.confirmationCallback) {
+      await this.delete(syncBlockIds, onDelete, onDeleteCompleted);
+    }
+  }
+  clearPendingDeletion() {
+    var _this$deletionRetryIn;
+    (_this$deletionRetryIn = this.deletionRetryInfo) === null || _this$deletionRetryIn === void 0 ? void 0 : _this$deletionRetryIn.destroyCallback();
+    this.deletionRetryInfo = undefined;
+  }
+
+  /**
+   *
+   * @param syncBlockIds - The sync block ids to delete
+   * @param onDelete - The callback to delete sync block node from document
+   * @param onDeleteCompleted - The callback for after the deletion is saved to BE (whether successful or not)
+   * @param destroyCallback - The callback to clear any reference stored for deletion (regardless if deletion is completed or abort)
+   */
+  async deleteSyncBlocksWithConfirmation(syncBlockIds, onDelete, onDeleteCompleted, destroyCallback) {
     if (this.confirmationCallback) {
       const confirmed = await this.confirmationCallback(syncBlockIds.length);
       if (confirmed) {
-        deleteCallback();
-        try {
-          if (!this.dataProvider) {
-            throw new Error('Data provider not set');
-          }
-          syncBlockIds.forEach(Ids => {
-            this.setPendingDeletion(Ids, true);
-          });
-          const results = await this.dataProvider.deleteNodesData(syncBlockIds.map(attrs => attrs.resourceId));
-          let callback;
-          if (results.every(result => result.success)) {
-            callback = Ids => this.syncBlockCache.delete(Ids.resourceId);
-          } else {
-            callback = Ids => {
-              this.setPendingDeletion(Ids, false);
-            };
-            results.filter(result => result.resourceId === undefined).forEach(result => {
-              var _this$fireAnalyticsEv7;
-              (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block'));
-            });
-          }
-          syncBlockIds.forEach(callback);
-        } catch (error) {
-          var _this$fireAnalyticsEv8;
-          syncBlockIds.forEach(Ids => {
-            this.setPendingDeletion(Ids, false);
-          });
-          logException(error, {
-            location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
-          });
-          (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, deleteErrorPayload(error.message));
+        const isDeleteSuccessful = await this.delete(syncBlockIds, onDelete, onDeleteCompleted);
+        if (!isDeleteSuccessful) {
+          // If deletion failed, save deletion info for potential retry
+          this.deletionRetryInfo = {
+            syncBlockIds,
+            onDelete,
+            onDeleteCompleted,
+            destroyCallback
+          };
         }
+      } else {
+        destroyCallback();
       }
     }
   }
@@ -250,5 +299,6 @@ export class SourceSyncBlockStoreManager {
     this.pendingResourceId = undefined;
     this.creationCallback = undefined;
     this.dataProvider = undefined;
+    this.clearPendingDeletion();
   }
 }

package/dist/esm/common/types.js

@@ -7,6 +7,8 @@ export var SyncBlockError = /*#__PURE__*/function (SyncBlockError) {
   SyncBlockError["Conflict"] = "conflict";
   // attempt to create block that already exists
   SyncBlockError["ServerError"] = "server_error";
-  SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
+  SyncBlockError["InvalidContent"] = "invalid_content";
+  // content is not a valid JSON
+  SyncBlockError["Offline"] = "offline";
   return SyncBlockError;
 }({});

package/dist/esm/providers/block-service/blockServiceAPI.js

@@ -188,10 +188,11 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
-  function BlockServiceADFWriteProvider(sourceAri, product) {
+  function BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId) {
     _classCallCheck(this, BlockServiceADFWriteProvider);
     this.sourceAri = sourceAri;
     this.product = product;
+    this.sourceDocumentId = sourceDocumentId;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -344,12 +345,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {
-      var match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-      if (!(match !== null && match !== void 0 && match[1])) {
-        throw new Error("Invalid source ARI: ".concat(this.sourceAri));
-      }
-      var pageId = match[3];
-      return "".concat(this.product, "/").concat(pageId, "/").concat(sourceId);
+      return "".concat(this.product, "/").concat(this.sourceDocumentId, "/").concat(sourceId);
     }
   }, {
     key: "generateResourceId",
@@ -361,16 +357,16 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
 /**
  * Factory function to create both providers with shared configuration
  */
-var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product) {
+var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   var fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
+  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId);
   return {
     fetchProvider: fetchProvider,
     writeProvider: writeProvider
   };
 };
-export var useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product) {
+export var useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   return useMemo(function () {
-    return createBlockServiceAPIProviders(sourceAri, product);
-  }, [sourceAri, product]);
+    return createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId);
+  }, [sourceAri, product, sourceDocumentId]);
 };

package/dist/esm/store-manager/sourceSyncBlockStoreManager.js

@@ -267,49 +267,40 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "deleteSyncBlocksWithConfirmation",
+    key: "delete",
     value: function () {
-      var _deleteSyncBlocksWithConfirmation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syncBlockIds, deleteCallback) {
+      var _delete2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syncBlockIds, onDelete, onDeleteCompleted) {
         var _this5 = this;
-        var confirmed, results, callback, _this$fireAnalyticsEv4;
+        var results, callback, isDeleteSuccessful, _this$fireAnalyticsEv4;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!this.confirmationCallback) {
-                _context2.next = 22;
-                break;
-              }
-              _context2.next = 3;
-              return this.confirmationCallback(syncBlockIds.length);
-            case 3:
-              confirmed = _context2.sent;
-              if (!confirmed) {
-                _context2.next = 22;
-                break;
-              }
-              deleteCallback();
-              _context2.prev = 6;
+              _context2.prev = 0;
               if (this.dataProvider) {
-                _context2.next = 9;
+                _context2.next = 3;
                 break;
               }
               throw new Error('Data provider not set');
-            case 9:
+            case 3:
               syncBlockIds.forEach(function (Ids) {
                 _this5.setPendingDeletion(Ids, true);
               });
-              _context2.next = 12;
+              _context2.next = 6;
               return this.dataProvider.deleteNodesData(syncBlockIds.map(function (attrs) {
                 return attrs.resourceId;
               }));
-            case 12:
+            case 6:
               results = _context2.sent;
-              if (results.every(function (result) {
+              isDeleteSuccessful = results.every(function (result) {
                 return result.success;
-              })) {
+              });
+              onDeleteCompleted(isDeleteSuccessful);
+              if (isDeleteSuccessful) {
+                onDelete();
                 callback = function callback(Ids) {
                   return _this5.syncBlockCache.delete(Ids.resourceId);
                 };
+                this.clearPendingDeletion();
               } else {
                 callback = function callback(Ids) {
                   _this5.setPendingDeletion(Ids, false);
@@ -322,11 +313,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 });
               }
               syncBlockIds.forEach(callback);
-              _context2.next = 22;
-              break;
-            case 17:
-              _context2.prev = 17;
-              _context2.t0 = _context2["catch"](6);
+              return _context2.abrupt("return", isDeleteSuccessful);
+            case 14:
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](0);
               syncBlockIds.forEach(function (Ids) {
                 _this5.setPendingDeletion(Ids, false);
               });
@@ -334,17 +324,119 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
               });
               (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, deleteErrorPayload(_context2.t0.message));
-            case 22:
+              onDeleteCompleted(false);
+              return _context2.abrupt("return", false);
+            case 21:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[6, 17]]);
+        }, _callee2, this, [[0, 14]]);
+      }));
+      function _delete(_x, _x2, _x3) {
+        return _delete2.apply(this, arguments);
+      }
+      return _delete;
+    }()
+  }, {
+    key: "isRetryingDeletion",
+    value: function isRetryingDeletion() {
+      return !!this.deletionRetryInfo;
+    }
+  }, {
+    key: "retryDeletion",
+    value: function () {
+      var _retryDeletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        var _this$deletionRetryIn, syncBlockIds, onDelete, onDeleteCompleted;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (this.deletionRetryInfo) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return", Promise.resolve());
+            case 2:
+              _this$deletionRetryIn = this.deletionRetryInfo, syncBlockIds = _this$deletionRetryIn.syncBlockIds, onDelete = _this$deletionRetryIn.onDelete, onDeleteCompleted = _this$deletionRetryIn.onDeleteCompleted;
+              if (!this.confirmationCallback) {
+                _context3.next = 6;
+                break;
+              }
+              _context3.next = 6;
+              return this.delete(syncBlockIds, onDelete, onDeleteCompleted);
+            case 6:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
       }));
-      function deleteSyncBlocksWithConfirmation(_x, _x2) {
+      function retryDeletion() {
+        return _retryDeletion.apply(this, arguments);
+      }
+      return retryDeletion;
+    }()
+  }, {
+    key: "clearPendingDeletion",
+    value: function clearPendingDeletion() {
+      var _this$deletionRetryIn2;
+      (_this$deletionRetryIn2 = this.deletionRetryInfo) === null || _this$deletionRetryIn2 === void 0 || _this$deletionRetryIn2.destroyCallback();
+      this.deletionRetryInfo = undefined;
+    }
+
+    /**
+     *
+     * @param syncBlockIds - The sync block ids to delete
+     * @param onDelete - The callback to delete sync block node from document
+     * @param onDeleteCompleted - The callback for after the deletion is saved to BE (whether successful or not)
+     * @param destroyCallback - The callback to clear any reference stored for deletion (regardless if deletion is completed or abort)
+     */
+  }, {
+    key: "deleteSyncBlocksWithConfirmation",
+    value: (function () {
+      var _deleteSyncBlocksWithConfirmation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(syncBlockIds, onDelete, onDeleteCompleted, destroyCallback) {
+        var confirmed, isDeleteSuccessful;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!this.confirmationCallback) {
+                _context4.next = 12;
+                break;
+              }
+              _context4.next = 3;
+              return this.confirmationCallback(syncBlockIds.length);
+            case 3:
+              confirmed = _context4.sent;
+              if (!confirmed) {
+                _context4.next = 11;
+                break;
+              }
+              _context4.next = 7;
+              return this.delete(syncBlockIds, onDelete, onDeleteCompleted);
+            case 7:
+              isDeleteSuccessful = _context4.sent;
+              if (!isDeleteSuccessful) {
+                // If deletion failed, save deletion info for potential retry
+                this.deletionRetryInfo = {
+                  syncBlockIds: syncBlockIds,
+                  onDelete: onDelete,
+                  onDeleteCompleted: onDeleteCompleted,
+                  destroyCallback: destroyCallback
+                };
+              }
+              _context4.next = 12;
+              break;
+            case 11:
+              destroyCallback();
+            case 12:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function deleteSyncBlocksWithConfirmation(_x4, _x5, _x6, _x7) {
         return _deleteSyncBlocksWithConfirmation.apply(this, arguments);
       }
       return deleteSyncBlocksWithConfirmation;
-    }()
+    }())
   }, {
     key: "destroy",
     value: function destroy() {
@@ -353,6 +445,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       this.pendingResourceId = undefined;
       this.creationCallback = undefined;
       this.dataProvider = undefined;
+      this.clearPendingDeletion();
     }
   }]);
 }();

package/dist/types/common/types.d.ts

@@ -20,7 +20,8 @@ export declare enum SyncBlockError {
     RateLimited = "rate_limited",
     Conflict = "conflict",// attempt to create block that already exists
     ServerError = "server_error",
-    InvalidContent = "invalid_content"
+    InvalidContent = "invalid_content",// content is not a valid JSON
+    Offline = "offline"
 }
 export interface SyncBlockData {
     blockInstanceId: BlockInstanceId;

package/dist/types/providers/block-service/blockServiceAPI.d.ts

@@ -14,15 +14,16 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
  */
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     private sourceAri;
+    private sourceDocumentId;
     product: SyncBlockProduct;
-    constructor(sourceAri: string, product: SyncBlockProduct);
+    constructor(sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string);
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     generateResourceId(): ResourceId;
 }
-export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct) => {
+export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string) => {
     fetchProvider: BlockServiceADFFetchProvider;
     writeProvider: BlockServiceADFWriteProvider;
 };

package/dist/types/store-manager/sourceSyncBlockStoreManager.d.ts

@@ -3,12 +3,16 @@ import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResourceId, SyncBlockAttrs } from '../common/types';
 import type { SyncBlockDataProvider } from '../providers/types';
 export type ConfirmationCallback = (syncBlockCount: number) => Promise<boolean>;
+type OnDelete = () => void;
+type OnDeleteCompleted = (success: boolean) => void;
+type DestroyCallback = () => void;
 export type CreationCallback = () => void;
 export declare class SourceSyncBlockStoreManager {
     private dataProvider?;
     private fireAnalyticsEvent?;
     private syncBlockCache;
     private confirmationCallback?;
+    private deletionRetryInfo?;
     private pendingResourceId?;
     private creationCallback?;
     constructor(dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void);
@@ -51,6 +55,18 @@ export declare class SourceSyncBlockStoreManager {
      */
     createBodiedSyncBlockNode(attrs: SyncBlockAttrs): void;
     private setPendingDeletion;
-    deleteSyncBlocksWithConfirmation(syncBlockIds: SyncBlockAttrs[], deleteCallback: () => void): Promise<void>;
+    private delete;
+    isRetryingDeletion(): boolean;
+    retryDeletion(): Promise<void>;
+    clearPendingDeletion(): void;
+    /**
+     *
+     * @param syncBlockIds - The sync block ids to delete
+     * @param onDelete - The callback to delete sync block node from document
+     * @param onDeleteCompleted - The callback for after the deletion is saved to BE (whether successful or not)
+     * @param destroyCallback - The callback to clear any reference stored for deletion (regardless if deletion is completed or abort)
+     */
+    deleteSyncBlocksWithConfirmation(syncBlockIds: SyncBlockAttrs[], onDelete: OnDelete, onDeleteCompleted: OnDeleteCompleted, destroyCallback: DestroyCallback): Promise<void>;
     destroy(): void;
 }
+export {};

package/dist/types-ts4.5/common/types.d.ts

@@ -20,7 +20,8 @@ export declare enum SyncBlockError {
     RateLimited = "rate_limited",
     Conflict = "conflict",// attempt to create block that already exists
     ServerError = "server_error",
-    InvalidContent = "invalid_content"
+    InvalidContent = "invalid_content",// content is not a valid JSON
+    Offline = "offline"
 }
 export interface SyncBlockData {
     blockInstanceId: BlockInstanceId;

package/dist/types-ts4.5/providers/block-service/blockServiceAPI.d.ts

@@ -14,15 +14,16 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
  */
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     private sourceAri;
+    private sourceDocumentId;
     product: SyncBlockProduct;
-    constructor(sourceAri: string, product: SyncBlockProduct);
+    constructor(sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string);
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     generateResourceId(): ResourceId;
 }
-export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct) => {
+export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string) => {
     fetchProvider: BlockServiceADFFetchProvider;
     writeProvider: BlockServiceADFWriteProvider;
 };

package/dist/types-ts4.5/store-manager/sourceSyncBlockStoreManager.d.ts

@@ -3,12 +3,16 @@ import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResourceId, SyncBlockAttrs } from '../common/types';
 import type { SyncBlockDataProvider } from '../providers/types';
 export type ConfirmationCallback = (syncBlockCount: number) => Promise<boolean>;
+type OnDelete = () => void;
+type OnDeleteCompleted = (success: boolean) => void;
+type DestroyCallback = () => void;
 export type CreationCallback = () => void;
 export declare class SourceSyncBlockStoreManager {
     private dataProvider?;
     private fireAnalyticsEvent?;
     private syncBlockCache;
     private confirmationCallback?;
+    private deletionRetryInfo?;
     private pendingResourceId?;
     private creationCallback?;
     constructor(dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void);
@@ -51,6 +55,18 @@ export declare class SourceSyncBlockStoreManager {
      */
     createBodiedSyncBlockNode(attrs: SyncBlockAttrs): void;
     private setPendingDeletion;
-    deleteSyncBlocksWithConfirmation(syncBlockIds: SyncBlockAttrs[], deleteCallback: () => void): Promise<void>;
+    private delete;
+    isRetryingDeletion(): boolean;
+    retryDeletion(): Promise<void>;
+    clearPendingDeletion(): void;
+    /**
+     *
+     * @param syncBlockIds - The sync block ids to delete
+     * @param onDelete - The callback to delete sync block node from document
+     * @param onDeleteCompleted - The callback for after the deletion is saved to BE (whether successful or not)
+     * @param destroyCallback - The callback to clear any reference stored for deletion (regardless if deletion is completed or abort)
+     */
+    deleteSyncBlocksWithConfirmation(syncBlockIds: SyncBlockAttrs[], onDelete: OnDelete, onDeleteCompleted: OnDeleteCompleted, destroyCallback: DestroyCallback): Promise<void>;
     destroy(): void;
 }
+export {};

package/package.json

@@ -38,7 +38,7 @@
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
-		"@testing-library/react": "^13.4.0",
+		"@testing-library/react": "^16.3.0",
 		"react-dom": "^18.2.0"
 	},
 	"techstack": {
@@ -77,7 +77,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.14.0",
+	"version": "2.15.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",