@atlaskit/editor-synced-block-provider 2.7.1 → 2.7.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.7.3
+
+### Patch Changes
+
+- [`2ccc83663f44b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2ccc83663f44b) -
+  [EDITOR-2744] Fix deleting source sync block re-creates the node in live page
+- Updated dependencies
+
+## 2.7.2
+
+### Patch Changes
+
+- [`7bb84f91500cf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7bb84f91500cf) -
+  [ux] EDITOR-2442 update warning modal on source sync block deletion
+
 ## 2.7.1
 
 ### Patch Changes

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _types = require("../common/types");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
 var _utils = require("../utils/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -146,7 +147,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function () {
       var _fetchSyncBlocksData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockNodes) {
         var _this2 = this;
-        var data, resolvedData;
+        var nodesToFetch, blocksWithNotFoundError, data, resolvedData;
         return _regenerator.default.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -156,22 +157,37 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               }
               throw new Error('Data provider not set');
             case 2:
-              _context3.next = 4;
-              return this.dataProvider.fetchNodesData(syncBlockNodes);
-            case 4:
+              // Don't fetch for not_found error since the source is already deleted
+              nodesToFetch = [], blocksWithNotFoundError = [];
+              syncBlockNodes.forEach(function (node) {
+                var existingSyncBlock = _this2.getFromCache(node.attrs.resourceId);
+                if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === _types.SyncBlockError.NotFound) {
+                  blocksWithNotFoundError.push(existingSyncBlock);
+                } else {
+                  nodesToFetch.push(node);
+                }
+              });
+              _context3.next = 6;
+              return this.dataProvider.fetchNodesData(nodesToFetch);
+            case 6:
               data = _context3.sent;
               if (data) {
-                _context3.next = 7;
+                _context3.next = 9;
                 break;
               }
               throw new Error('Failed to fetch sync block node data');
-            case 7:
+            case 9:
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
                 var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
                 if (!syncBlockInstance.resourceId) {
                   return;
                 }
+                if (syncBlockInstance.error) {
+                  _this2.updateCache(syncBlockInstance);
+                  resolvedData.push(syncBlockInstance);
+                  return;
+                }
                 var existingSyncBlock = _this2.getFromCache(syncBlockInstance.resourceId);
                 var resolvedSyncBlockInstance = existingSyncBlock ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this2.updateCache(resolvedSyncBlockInstance);
@@ -182,8 +198,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                   _this2.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
                 }
               });
-              return _context3.abrupt("return", resolvedData);
-            case 10:
+              return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
+            case 12:
             case "end":
               return _context3.stop();
           }

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

@@ -9,13 +9,22 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _rebaseTransaction2 = require("../common/rebase-transaction");
 var _ari = require("../utils/ari");
 var _utils = require("../utils/utils");
+// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   function SourceSyncBlockStoreManager(dataProvider) {
+    var _this = this;
     (0, _classCallCheck2.default)(this, SourceSyncBlockStoreManager);
+    (0, _defineProperty2.default)(this, "setPendingDeletion", function (Ids, value) {
+      var syncBlock = _this.syncBlockCache.get(Ids.resourceId);
+      if (syncBlock) {
+        syncBlock.pendingDeletion = value;
+      }
+    });
     this.dataProvider = dataProvider;
     this.syncBlockCache = new Map();
   }
@@ -34,7 +43,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         throw new Error('Local ID or resource ID is not set');
       }
       var syncBlockData = (0, _utils.convertSyncBlockPMNodeToSyncBlockData)(syncBlockNode);
-      this.syncBlockCache.set(localId, syncBlockData);
+      this.syncBlockCache.set(resourceId, syncBlockData);
       return true;
     }
 
@@ -61,14 +70,17 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               bodiedSyncBlockNodes = [];
               bodiedSyncBlockData = [];
               Array.from(this.syncBlockCache.values()).forEach(function (syncBlockData) {
-                bodiedSyncBlockNodes.push({
-                  type: 'bodiedSyncBlock',
-                  attrs: {
-                    localId: syncBlockData.blockInstanceId,
-                    resourceId: syncBlockData.resourceId
-                  }
-                });
-                bodiedSyncBlockData.push(syncBlockData);
+                // Don't flush nodes that are waiting to be deleted to avoid nodes being re-created
+                if (!syncBlockData.pendingDeletion) {
+                  bodiedSyncBlockNodes.push({
+                    type: 'bodiedSyncBlock',
+                    attrs: {
+                      localId: syncBlockData.blockInstanceId,
+                      resourceId: syncBlockData.resourceId
+                    }
+                  });
+                  bodiedSyncBlockData.push(syncBlockData);
+                }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
                 _context.next = 8;
@@ -135,10 +147,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "registerConfirmationCallback",
     value: function registerConfirmationCallback(callback) {
-      var _this = this;
+      var _this2 = this;
       this.confirmationCallback = callback;
       return function () {
-        _this.confirmationCallback = undefined;
+        _this2.confirmationCallback = undefined;
       };
     }
   }, {
@@ -150,6 +162,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     key: "generateBodiedSyncBlockAttrs",
     value: function generateBodiedSyncBlockAttrs() {
       var _this$dataProvider;
+      // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var localId = (0, _uuid.default)();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
       if (!sourceId) {
@@ -166,7 +179,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "createBodiedSyncBlockNode",
     value: function createBodiedSyncBlockNode(attrs) {
-      var _this2 = this;
+      var _this3 = this;
       try {
         if (!this.dataProvider) {
           throw new Error('Data provider not set');
@@ -181,14 +194,14 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           results.forEach(function (result) {
             var resourceId = result.resourceId;
             if (resourceId) {
-              _this2.commitPendingCreation(true);
+              _this3.commitPendingCreation(true);
             } else {
-              _this2.commitPendingCreation(false);
+              _this3.commitPendingCreation(false);
               // TODO: EDITOR-1921 - add error analytics
             }
           });
         }).catch(function (_reason) {
-          _this2.commitPendingCreation(false);
+          _this3.commitPendingCreation(false);
           // TODO: EDITOR-1921 - add error analytics
         });
         this.registerPendingCreation(resourceId);
@@ -203,22 +216,22 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     key: "deleteSyncBlocksWithConfirmation",
     value: function () {
       var _deleteSyncBlocksWithConfirmation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(tr, syncBlockIds) {
-        var _this3 = this;
-        var confirmed, _this$editorView, results;
+        var _this4 = this;
+        var confirmed, _this$editorView, results, callback;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!this.confirmationCallback) {
-                _context2.next = 19;
+                _context2.next = 22;
                 break;
               }
               this.confirmationTransaction = tr;
               _context2.next = 4;
-              return this.confirmationCallback();
+              return this.confirmationCallback(syncBlockIds.length);
             case 4:
               confirmed = _context2.sent;
               if (!confirmed) {
-                _context2.next = 18;
+                _context2.next = 21;
                 break;
               }
               (_this$editorView = this.editorView) === null || _this$editorView === void 0 || _this$editorView.dispatch(this.confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true));
@@ -229,32 +242,44 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               }
               throw new Error('Data provider not set');
             case 10:
-              _context2.next = 12;
+              syncBlockIds.forEach(function (Ids) {
+                _this4.setPendingDeletion(Ids, true);
+              });
+              _context2.next = 13;
               return this.dataProvider.deleteNodesData(syncBlockIds.map(function (attrs) {
                 return attrs.resourceId;
               }));
-            case 12:
+            case 13:
               results = _context2.sent;
-              results.forEach(function (result) {
-                if (result.success) {
-                  // Only delete when it's deleted successfully in backend
-                  _this3.syncBlockCache.delete(result.resourceId);
-                } else {
-                  // TODO: EDITOR-1921 - add error analytics with result.error
-                }
-              });
-              _context2.next = 18;
+              if (results.every(function (result) {
+                return result.success;
+              })) {
+                callback = function callback(Ids) {
+                  return _this4.syncBlockCache.delete(Ids.resourceId);
+                };
+              } else {
+                callback = function callback(Ids) {
+                  _this4.setPendingDeletion(Ids, false);
+                };
+                // TODO: EDITOR-1921 - add error analytics
+              }
+              syncBlockIds.forEach(callback);
+              _context2.next = 21;
               break;
-            case 16:
-              _context2.prev = 16;
-              _context2.t0 = _context2["catch"](7);
             case 18:
+              _context2.prev = 18;
+              _context2.t0 = _context2["catch"](7);
+              syncBlockIds.forEach(function (Ids) {
+                _this4.setPendingDeletion(Ids, false);
+              });
+              // TODO: EDITOR-1921 - add error analytics
+            case 21:
               this.confirmationTransaction = undefined;
-            case 19:
+            case 22:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[7, 16]]);
+        }, _callee2, this, [[7, 18]]);
       }));
       function deleteSyncBlocksWithConfirmation(_x, _x2) {
         return _deleteSyncBlocksWithConfirmation.apply(this, arguments);

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

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { SyncBlockError } from '../common/types';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { createSyncBlockNode } from '../utils/utils';
 export class ReferenceSyncBlockStoreManager {
@@ -67,7 +68,19 @@ export class ReferenceSyncBlockStoreManager {
     if (!this.dataProvider) {
       throw new Error('Data provider not set');
     }
-    const data = await this.dataProvider.fetchNodesData(syncBlockNodes);
+
+    // Don't fetch for not_found error since the source is already deleted
+    const nodesToFetch = [],
+      blocksWithNotFoundError = [];
+    syncBlockNodes.forEach(node => {
+      const existingSyncBlock = this.getFromCache(node.attrs.resourceId);
+      if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === SyncBlockError.NotFound) {
+        blocksWithNotFoundError.push(existingSyncBlock);
+      } else {
+        nodesToFetch.push(node);
+      }
+    });
+    const data = await this.dataProvider.fetchNodesData(nodesToFetch);
     if (!data) {
       throw new Error('Failed to fetch sync block node data');
     }
@@ -77,6 +90,11 @@ export class ReferenceSyncBlockStoreManager {
       if (!syncBlockInstance.resourceId) {
         return;
       }
+      if (syncBlockInstance.error) {
+        this.updateCache(syncBlockInstance);
+        resolvedData.push(syncBlockInstance);
+        return;
+      }
       const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
       const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
       this.updateCache(resolvedSyncBlockInstance);
@@ -87,7 +105,7 @@ export class ReferenceSyncBlockStoreManager {
         this.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       }
     });
-    return resolvedData;
+    return [...resolvedData, ...blocksWithNotFoundError];
   }
   updateCache(syncBlock) {
     const {

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

@@ -1,9 +1,17 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
 import { rebaseTransaction } from '../common/rebase-transaction';
 import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { convertSyncBlockPMNodeToSyncBlockData, createBodiedSyncBlockNode } from '../utils/utils';
 export class SourceSyncBlockStoreManager {
   constructor(dataProvider) {
+    _defineProperty(this, "setPendingDeletion", (Ids, value) => {
+      const syncBlock = this.syncBlockCache.get(Ids.resourceId);
+      if (syncBlock) {
+        syncBlock.pendingDeletion = value;
+      }
+    });
     this.dataProvider = dataProvider;
     this.syncBlockCache = new Map();
   }
@@ -21,7 +29,7 @@ export class SourceSyncBlockStoreManager {
       throw new Error('Local ID or resource ID is not set');
     }
     const syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
-    this.syncBlockCache.set(localId, syncBlockData);
+    this.syncBlockCache.set(resourceId, syncBlockData);
     return true;
   }
 
@@ -38,14 +46,17 @@ export class SourceSyncBlockStoreManager {
       const bodiedSyncBlockNodes = [];
       const bodiedSyncBlockData = [];
       Array.from(this.syncBlockCache.values()).forEach(syncBlockData => {
-        bodiedSyncBlockNodes.push({
-          type: 'bodiedSyncBlock',
-          attrs: {
-            localId: syncBlockData.blockInstanceId,
-            resourceId: syncBlockData.resourceId
-          }
-        });
-        bodiedSyncBlockData.push(syncBlockData);
+        // Don't flush nodes that are waiting to be deleted to avoid nodes being re-created
+        if (!syncBlockData.pendingDeletion) {
+          bodiedSyncBlockNodes.push({
+            type: 'bodiedSyncBlock',
+            attrs: {
+              localId: syncBlockData.blockInstanceId,
+              resourceId: syncBlockData.resourceId
+            }
+          });
+          bodiedSyncBlockData.push(syncBlockData);
+        }
       });
       if (bodiedSyncBlockNodes.length === 0) {
         return Promise.resolve(true);
@@ -92,6 +103,7 @@ export class SourceSyncBlockStoreManager {
   }
   generateBodiedSyncBlockAttrs() {
     var _this$dataProvider;
+    // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     const localId = uuid();
     const sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
     if (!sourceId) {
@@ -143,7 +155,7 @@ export class SourceSyncBlockStoreManager {
   async deleteSyncBlocksWithConfirmation(tr, syncBlockIds) {
     if (this.confirmationCallback) {
       this.confirmationTransaction = tr;
-      const confirmed = await this.confirmationCallback();
+      const confirmed = await this.confirmationCallback(syncBlockIds.length);
       if (confirmed) {
         var _this$editorView;
         (_this$editorView = this.editorView) === null || _this$editorView === void 0 ? void 0 : _this$editorView.dispatch(this.confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true));
@@ -151,16 +163,24 @@ export class SourceSyncBlockStoreManager {
           if (!this.dataProvider) {
             throw new Error('Data provider not set');
           }
-          const results = await this.dataProvider.deleteNodesData(syncBlockIds.map(attrs => attrs.resourceId));
-          results.forEach(result => {
-            if (result.success) {
-              // Only delete when it's deleted successfully in backend
-              this.syncBlockCache.delete(result.resourceId);
-            } else {
-              // TODO: EDITOR-1921 - add error analytics with result.error
-            }
+          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);
+            };
+            // TODO: EDITOR-1921 - add error analytics
+          }
+          syncBlockIds.forEach(callback);
         } catch (_error) {
+          syncBlockIds.forEach(Ids => {
+            this.setPendingDeletion(Ids, false);
+          });
           // TODO: EDITOR-1921 - add error analytics
         }
       }

package/dist/es2019/utils/sourceInfo.js

@@ -1,7 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
-import { getPageIdAndTypeFromAri } from "./ari";
-import { isBlogPageType } from "./utils";
+import { getPageIdAndTypeFromAri } from './ari';
+import { isBlogPageType } from './utils';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'

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

@@ -9,6 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { SyncBlockError } from '../common/types';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { createSyncBlockNode } from '../utils/utils';
 export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
@@ -139,7 +140,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function () {
       var _fetchSyncBlocksData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syncBlockNodes) {
         var _this2 = this;
-        var data, resolvedData;
+        var nodesToFetch, blocksWithNotFoundError, data, resolvedData;
         return _regeneratorRuntime.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -149,22 +150,37 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
               }
               throw new Error('Data provider not set');
             case 2:
-              _context3.next = 4;
-              return this.dataProvider.fetchNodesData(syncBlockNodes);
-            case 4:
+              // Don't fetch for not_found error since the source is already deleted
+              nodesToFetch = [], blocksWithNotFoundError = [];
+              syncBlockNodes.forEach(function (node) {
+                var existingSyncBlock = _this2.getFromCache(node.attrs.resourceId);
+                if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === SyncBlockError.NotFound) {
+                  blocksWithNotFoundError.push(existingSyncBlock);
+                } else {
+                  nodesToFetch.push(node);
+                }
+              });
+              _context3.next = 6;
+              return this.dataProvider.fetchNodesData(nodesToFetch);
+            case 6:
               data = _context3.sent;
               if (data) {
-                _context3.next = 7;
+                _context3.next = 9;
                 break;
               }
               throw new Error('Failed to fetch sync block node data');
-            case 7:
+            case 9:
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
                 var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
                 if (!syncBlockInstance.resourceId) {
                   return;
                 }
+                if (syncBlockInstance.error) {
+                  _this2.updateCache(syncBlockInstance);
+                  resolvedData.push(syncBlockInstance);
+                  return;
+                }
                 var existingSyncBlock = _this2.getFromCache(syncBlockInstance.resourceId);
                 var resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this2.updateCache(resolvedSyncBlockInstance);
@@ -175,8 +191,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                   _this2.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
                 }
               });
-              return _context3.abrupt("return", resolvedData);
-            case 10:
+              return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
+            case 12:
             case "end":
               return _context3.stop();
           }

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

@@ -1,14 +1,23 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
 import { rebaseTransaction as _rebaseTransaction } from '../common/rebase-transaction';
 import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { convertSyncBlockPMNodeToSyncBlockData, createBodiedSyncBlockNode as _createBodiedSyncBlockNode } from '../utils/utils';
 export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   function SourceSyncBlockStoreManager(dataProvider) {
+    var _this = this;
     _classCallCheck(this, SourceSyncBlockStoreManager);
+    _defineProperty(this, "setPendingDeletion", function (Ids, value) {
+      var syncBlock = _this.syncBlockCache.get(Ids.resourceId);
+      if (syncBlock) {
+        syncBlock.pendingDeletion = value;
+      }
+    });
     this.dataProvider = dataProvider;
     this.syncBlockCache = new Map();
   }
@@ -27,7 +36,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         throw new Error('Local ID or resource ID is not set');
       }
       var syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
-      this.syncBlockCache.set(localId, syncBlockData);
+      this.syncBlockCache.set(resourceId, syncBlockData);
       return true;
     }
 
@@ -54,14 +63,17 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               bodiedSyncBlockNodes = [];
               bodiedSyncBlockData = [];
               Array.from(this.syncBlockCache.values()).forEach(function (syncBlockData) {
-                bodiedSyncBlockNodes.push({
-                  type: 'bodiedSyncBlock',
-                  attrs: {
-                    localId: syncBlockData.blockInstanceId,
-                    resourceId: syncBlockData.resourceId
-                  }
-                });
-                bodiedSyncBlockData.push(syncBlockData);
+                // Don't flush nodes that are waiting to be deleted to avoid nodes being re-created
+                if (!syncBlockData.pendingDeletion) {
+                  bodiedSyncBlockNodes.push({
+                    type: 'bodiedSyncBlock',
+                    attrs: {
+                      localId: syncBlockData.blockInstanceId,
+                      resourceId: syncBlockData.resourceId
+                    }
+                  });
+                  bodiedSyncBlockData.push(syncBlockData);
+                }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
                 _context.next = 8;
@@ -128,10 +140,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "registerConfirmationCallback",
     value: function registerConfirmationCallback(callback) {
-      var _this = this;
+      var _this2 = this;
       this.confirmationCallback = callback;
       return function () {
-        _this.confirmationCallback = undefined;
+        _this2.confirmationCallback = undefined;
       };
     }
   }, {
@@ -143,6 +155,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     key: "generateBodiedSyncBlockAttrs",
     value: function generateBodiedSyncBlockAttrs() {
       var _this$dataProvider;
+      // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var localId = uuid();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
       if (!sourceId) {
@@ -159,7 +172,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "createBodiedSyncBlockNode",
     value: function createBodiedSyncBlockNode(attrs) {
-      var _this2 = this;
+      var _this3 = this;
       try {
         if (!this.dataProvider) {
           throw new Error('Data provider not set');
@@ -174,14 +187,14 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           results.forEach(function (result) {
             var resourceId = result.resourceId;
             if (resourceId) {
-              _this2.commitPendingCreation(true);
+              _this3.commitPendingCreation(true);
             } else {
-              _this2.commitPendingCreation(false);
+              _this3.commitPendingCreation(false);
               // TODO: EDITOR-1921 - add error analytics
             }
           });
         }).catch(function (_reason) {
-          _this2.commitPendingCreation(false);
+          _this3.commitPendingCreation(false);
           // TODO: EDITOR-1921 - add error analytics
         });
         this.registerPendingCreation(resourceId);
@@ -196,22 +209,22 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     key: "deleteSyncBlocksWithConfirmation",
     value: function () {
       var _deleteSyncBlocksWithConfirmation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(tr, syncBlockIds) {
-        var _this3 = this;
-        var confirmed, _this$editorView, results;
+        var _this4 = this;
+        var confirmed, _this$editorView, results, callback;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!this.confirmationCallback) {
-                _context2.next = 19;
+                _context2.next = 22;
                 break;
               }
               this.confirmationTransaction = tr;
               _context2.next = 4;
-              return this.confirmationCallback();
+              return this.confirmationCallback(syncBlockIds.length);
             case 4:
               confirmed = _context2.sent;
               if (!confirmed) {
-                _context2.next = 18;
+                _context2.next = 21;
                 break;
               }
               (_this$editorView = this.editorView) === null || _this$editorView === void 0 || _this$editorView.dispatch(this.confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true));
@@ -222,32 +235,44 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               }
               throw new Error('Data provider not set');
             case 10:
-              _context2.next = 12;
+              syncBlockIds.forEach(function (Ids) {
+                _this4.setPendingDeletion(Ids, true);
+              });
+              _context2.next = 13;
               return this.dataProvider.deleteNodesData(syncBlockIds.map(function (attrs) {
                 return attrs.resourceId;
               }));
-            case 12:
+            case 13:
               results = _context2.sent;
-              results.forEach(function (result) {
-                if (result.success) {
-                  // Only delete when it's deleted successfully in backend
-                  _this3.syncBlockCache.delete(result.resourceId);
-                } else {
-                  // TODO: EDITOR-1921 - add error analytics with result.error
-                }
-              });
-              _context2.next = 18;
+              if (results.every(function (result) {
+                return result.success;
+              })) {
+                callback = function callback(Ids) {
+                  return _this4.syncBlockCache.delete(Ids.resourceId);
+                };
+              } else {
+                callback = function callback(Ids) {
+                  _this4.setPendingDeletion(Ids, false);
+                };
+                // TODO: EDITOR-1921 - add error analytics
+              }
+              syncBlockIds.forEach(callback);
+              _context2.next = 21;
               break;
-            case 16:
-              _context2.prev = 16;
-              _context2.t0 = _context2["catch"](7);
             case 18:
+              _context2.prev = 18;
+              _context2.t0 = _context2["catch"](7);
+              syncBlockIds.forEach(function (Ids) {
+                _this4.setPendingDeletion(Ids, false);
+              });
+              // TODO: EDITOR-1921 - add error analytics
+            case 21:
               this.confirmationTransaction = undefined;
-            case 19:
+            case 22:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[7, 16]]);
+        }, _callee2, this, [[7, 18]]);
       }));
       function deleteSyncBlocksWithConfirmation(_x, _x2) {
         return _deleteSyncBlocksWithConfirmation.apply(this, arguments);

package/dist/esm/utils/sourceInfo.js

@@ -5,8 +5,8 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /* eslint-disable require-unicode-regexp  */
 
-import { getPageIdAndTypeFromAri } from "./ari";
-import { isBlogPageType } from "./utils";
+import { getPageIdAndTypeFromAri } from './ari';
+import { isBlogPageType } from './utils';
 var COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'

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

@@ -1,5 +1,5 @@
 import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { ResourceId, SyncBlockNode } from '../common/types';
+import { type ResourceId, type SyncBlockNode } from '../common/types';
 import type { SyncBlockInstance, SubscriptionCallback, SyncBlockDataProvider, TitleSubscriptionCallback } from '../providers/types';
 export declare class ReferenceSyncBlockStoreManager {
     private dataProvider?;

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

@@ -3,7 +3,7 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ResourceId, SyncBlockAttrs } from '../common/types';
 import type { SyncBlockDataProvider } from '../providers/types';
-export type ConfirmationCallback = () => Promise<boolean>;
+export type ConfirmationCallback = (syncBlockCount: number) => Promise<boolean>;
 export type CreationCallback = () => void;
 export declare class SourceSyncBlockStoreManager {
     private dataProvider?;
@@ -38,6 +38,7 @@ export declare class SourceSyncBlockStoreManager {
     requireConfirmationBeforeDelete(): boolean;
     generateBodiedSyncBlockAttrs(): SyncBlockAttrs;
     createBodiedSyncBlockNode(attrs: SyncBlockAttrs): void;
+    private setPendingDeletion;
     deleteSyncBlocksWithConfirmation(tr: Transaction, syncBlockIds: SyncBlockAttrs[]): Promise<void>;
     rebaseTransaction(incomingTr: Transaction, state: EditorState): void;
 }

package/dist/types/utils/sourceInfo.d.ts

@@ -1,2 +1,2 @@
-import type { SyncBlockSourceInfo } from "../providers/types";
+import type { SyncBlockSourceInfo } from '../providers/types';
 export declare const fetchSourceInfo: (ari: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;

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

@@ -1,5 +1,5 @@
 import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { ResourceId, SyncBlockNode } from '../common/types';
+import { type ResourceId, type SyncBlockNode } from '../common/types';
 import type { SyncBlockInstance, SubscriptionCallback, SyncBlockDataProvider, TitleSubscriptionCallback } from '../providers/types';
 export declare class ReferenceSyncBlockStoreManager {
     private dataProvider?;

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

@@ -3,7 +3,7 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ResourceId, SyncBlockAttrs } from '../common/types';
 import type { SyncBlockDataProvider } from '../providers/types';
-export type ConfirmationCallback = () => Promise<boolean>;
+export type ConfirmationCallback = (syncBlockCount: number) => Promise<boolean>;
 export type CreationCallback = () => void;
 export declare class SourceSyncBlockStoreManager {
     private dataProvider?;
@@ -38,6 +38,7 @@ export declare class SourceSyncBlockStoreManager {
     requireConfirmationBeforeDelete(): boolean;
     generateBodiedSyncBlockAttrs(): SyncBlockAttrs;
     createBodiedSyncBlockNode(attrs: SyncBlockAttrs): void;
+    private setPendingDeletion;
     deleteSyncBlocksWithConfirmation(tr: Transaction, syncBlockIds: SyncBlockAttrs[]): Promise<void>;
     rebaseTransaction(incomingTr: Transaction, state: EditorState): void;
 }

package/dist/types-ts4.5/utils/sourceInfo.d.ts

@@ -1,2 +1,2 @@
-import type { SyncBlockSourceInfo } from "../providers/types";
+import type { SyncBlockSourceInfo } from '../providers/types';
 export declare const fetchSourceInfo: (ari: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;

package/package.json

@@ -31,7 +31,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/node-data-provider": "^7.5.0",
 		"@atlaskit/primitives": "^16.1.0",
-		"@atlaskit/tokens": "^7.1.0",
+		"@atlaskit/tokens": "^8.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
 		"uuid": "^3.1.0"
@@ -82,7 +82,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.7.1",
+	"version": "2.7.3",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",