@atlaskit/editor-synced-block-provider 2.12.1 → 2.12.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.12.3
+
+### Patch Changes
+
+- [`707c3960baedb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/707c3960baedb) -
+  EDITOR-1923 retry api requests on rate limited for sync block provider
+- Updated dependencies
+
+## 2.12.2
+
+### Patch Changes
+
+- [`fd932d0fad4a5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fd932d0fad4a5) -
+  [ux] EDITOR-3693 separate sync block creation and update into different provider calls
+- [`1f90e6ac4a228`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f90e6ac4a228) -
+  [ux] EDITOR-3662 fix sync block error merging logic to retain old information on error
+
 ## 2.12.1
 
 ### Patch Changes

package/dist/cjs/clients/block-service/blockService.js

@@ -13,6 +13,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _retry = require("../../utils/retry");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var isBlockContentResponse = exports.isBlockContentResponse = function isBlockContentResponse(response) {
@@ -69,7 +70,7 @@ var getReferenceSyncedBlocks = exports.getReferenceSyncedBlocks = /*#__PURE__*/f
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/document/reference/").concat(encodeURIComponent(documentAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/document/reference/").concat(encodeURIComponent(documentAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -119,7 +120,7 @@ var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/functio
         case 0:
           blockAri = _ref2.blockAri;
           _context2.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -153,7 +154,7 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref4.blockAri;
           _context3.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'DELETE',
             headers: COMMON_HEADERS
           });
@@ -182,7 +183,7 @@ var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref6.blockAri, content = _ref6.content;
           _context4.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'PUT',
             headers: COMMON_HEADERS,
             body: JSON.stringify({
@@ -214,7 +215,7 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref8.blockAri, blockInstanceId = _ref8.blockInstanceId, sourceAri = _ref8.sourceAri, product = _ref8.product, content = _ref8.content;
           _context5.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block"), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block"), {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify({

package/dist/cjs/clients/confluence/contentProperty.js

@@ -8,6 +8,7 @@ exports.updateContentProperty = exports.getContentProperty = exports.deleteConte
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _retry = require("../../utils/retry");
 var _ari = require("./ari");
 var _utils = require("./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; }
@@ -95,7 +96,7 @@ var getContentProperty = exports.getContentProperty = /*#__PURE__*/function () {
             }
           };
           _context.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
@@ -204,7 +205,7 @@ var createContentProperty = exports.createContentProperty = /*#__PURE__*/functio
             }
           };
           _context3.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
@@ -254,7 +255,7 @@ var deleteContentProperty = exports.deleteContentProperty = /*#__PURE__*/functio
             }
           };
           _context4.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)

package/dist/cjs/clients/confluence/sourceInfo.js

@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _errorHandling = require("../../utils/errorHandling");
+var _retry = require("../../utils/retry");
 var _ari = require("./ari");
 var _utils = require("./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; }
@@ -43,7 +44,7 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
             }
           };
           _context.next = 3;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)

package/dist/cjs/common/types.js

@@ -8,6 +8,11 @@ var SyncBlockError = exports.SyncBlockError = /*#__PURE__*/function (SyncBlockEr
   SyncBlockError["Errored"] = "errored";
   SyncBlockError["NotFound"] = "not_found";
   SyncBlockError["Forbidden"] = "forbidden";
+  SyncBlockError["InvalidRequest"] = "invalid_request";
+  SyncBlockError["RateLimited"] = "rate_limited";
+  SyncBlockError["Conflict"] = "conflict";
+  // attempt to create block that already exists
+  SyncBlockError["ServerError"] = "server_error";
   SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
   return SyncBlockError;
 }({});

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

@@ -17,10 +17,21 @@ var _types = require("../../common/types");
 var _errorHandling = require("../../utils/errorHandling");
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
+    case 400:
+    case 401:
+      return _types.SyncBlockError.InvalidRequest;
     case 403:
       return _types.SyncBlockError.Forbidden;
     case 404:
       return _types.SyncBlockError.NotFound;
+    case 409:
+      return _types.SyncBlockError.Conflict;
+    case 429:
+      return _types.SyncBlockError.RateLimited;
+    case 500:
+    case 503:
+    case 504:
+      return _types.SyncBlockError.ServerError;
   }
   return _types.SyncBlockError.Errored;
 };
@@ -210,88 +221,121 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               _context3.prev = 7;
               _context3.t0 = _context3["catch"](1);
               if (!(_context3.t0 instanceof _blockService.BlockError)) {
-                _context3.next = 16;
+                _context3.next = 11;
                 break;
               }
-              if (!(_context3.t0.status === 404)) {
-                _context3.next = 15;
-                break;
-              }
-              _context3.next = 13;
-              return (0, _blockService.createSyncedBlock)({
-                blockAri: resourceId,
-                blockInstanceId: data.blockInstanceId,
-                sourceAri: this.sourceAri,
-                product: this.product,
-                content: JSON.stringify(data.content)
-              });
-            case 13:
-              _context3.next = 16;
-              break;
-            case 15:
               return _context3.abrupt("return", {
                 error: mapBlockError(_context3.t0),
                 resourceId: resourceId
               });
-            case 16:
+            case 11:
               return _context3.abrupt("return", {
                 error: (0, _errorHandling.stringifyError)(_context3.t0),
                 resourceId: resourceId
               });
-            case 17:
+            case 12:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 7]]);
+        }, _callee3, null, [[1, 7]]);
       }));
       function writeData(_x3) {
         return _writeData.apply(this, arguments);
       }
       return writeData;
-    }() // soft deletes the source synced block
+    }()
   }, {
-    key: "deleteData",
+    key: "createData",
     value: function () {
-      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(resourceId) {
+      var _createData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(data) {
+        var resourceId;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.prev = 0;
-              _context4.next = 3;
+              resourceId = data.resourceId;
+              _context4.prev = 1;
+              _context4.next = 4;
+              return (0, _blockService.createSyncedBlock)({
+                blockAri: resourceId,
+                blockInstanceId: data.blockInstanceId,
+                sourceAri: this.sourceAri,
+                product: this.product,
+                content: JSON.stringify(data.content)
+              });
+            case 4:
+              return _context4.abrupt("return", {
+                resourceId: resourceId
+              });
+            case 7:
+              _context4.prev = 7;
+              _context4.t0 = _context4["catch"](1);
+              if (!(_context4.t0 instanceof _blockService.BlockError)) {
+                _context4.next = 11;
+                break;
+              }
+              return _context4.abrupt("return", {
+                error: mapBlockError(_context4.t0),
+                resourceId: resourceId
+              });
+            case 11:
+              return _context4.abrupt("return", {
+                error: (0, _errorHandling.stringifyError)(_context4.t0),
+                resourceId: resourceId
+              });
+            case 12:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[1, 7]]);
+      }));
+      function createData(_x4) {
+        return _createData.apply(this, arguments);
+      }
+      return createData;
+    }() // soft deletes the source synced block
+  }, {
+    key: "deleteData",
+    value: function () {
+      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(resourceId) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
+              _context5.next = 3;
               return (0, _blockService.deleteSyncedBlock)({
                 blockAri: resourceId
               });
             case 3:
-              return _context4.abrupt("return", {
+              return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: true,
                 error: undefined
               });
             case 6:
-              _context4.prev = 6;
-              _context4.t0 = _context4["catch"](0);
-              if (!(_context4.t0 instanceof _blockService.BlockError)) {
-                _context4.next = 10;
+              _context5.prev = 6;
+              _context5.t0 = _context5["catch"](0);
+              if (!(_context5.t0 instanceof _blockService.BlockError)) {
+                _context5.next = 10;
                 break;
               }
-              return _context4.abrupt("return", {
+              return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
-                error: mapBlockError(_context4.t0)
+                error: mapBlockError(_context5.t0)
               });
             case 10:
-              return _context4.abrupt("return", {
+              return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
-                error: (0, _errorHandling.stringifyError)(_context4.t0)
+                error: (0, _errorHandling.stringifyError)(_context5.t0)
               });
             case 11:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, null, [[0, 6]]);
+        }, _callee5, null, [[0, 6]]);
       }));
-      function deleteData(_x4) {
+      function deleteData(_x5) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;

package/dist/cjs/providers/confluence/confluenceContentAPI.js

@@ -260,37 +260,23 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 resourceId: resourceId
               });
             case 23:
-              if (updateResult) {
-                _context3.next = 27;
-                break;
-              }
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncBlockDataWithSourceDocumentAri, pageType).then(function () {
-                return {
-                  resourceId: resourceId
-                };
-              }, function (error) {
-                return {
-                  error: error
-                };
-              }));
-            case 27:
               return _context3.abrupt("return", {
                 error: "Failed to update ".concat(pageType, " content property")
               });
-            case 28:
-              _context3.next = 33;
+            case 24:
+              _context3.next = 29;
               break;
-            case 30:
-              _context3.prev = 30;
+            case 26:
+              _context3.prev = 26;
               _context3.t1 = _context3["catch"](9);
               return _context3.abrupt("return", {
                 error: "Failed to write ".concat(pageType)
               });
-            case 33:
+            case 29:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 5], [9, 30]]);
+        }, _callee3, this, [[1, 5], [9, 26]]);
       }));
       function writeData(_x6) {
         return _writeData.apply(this, arguments);
@@ -298,28 +284,80 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
       return writeData;
     }()
   }, {
-    key: "deleteData",
+    key: "createData",
     value: function () {
-      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(resourceId) {
-        var deletePayload, deleteResult, match, _match2, pageId, pageType, localId, key, options, _stringifyError;
+      var _createData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(syncBlockData) {
+        var match, resourceId, _match2, pageId, pageType, localId, key, sourceAri, syncBlockDataWithSourceDocumentAri;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.prev = 0;
+              resourceId = syncBlockData.resourceId;
+              _context4.prev = 1;
               match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId);
-              _context4.next = 7;
+              _context4.next = 8;
               break;
-            case 4:
-              _context4.prev = 4;
-              _context4.t0 = _context4["catch"](0);
+            case 5:
+              _context4.prev = 5;
+              _context4.t0 = _context4["catch"](1);
+              return _context4.abrupt("return", {
+                error: (0, _errorHandling.stringifyError)(_context4.t0)
+              });
+            case 8:
+              _match2 = match, pageId = _match2.id, pageType = _match2.type;
+              _context4.prev = 9;
+              localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
+              key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              sourceAri = (0, _ari.getConfluencePageAri)(pageId, this.config.cloudId, pageType);
+              syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, syncBlockData), {}, {
+                product: 'confluence-page',
+                sourceAri: sourceAri
+              });
+              _context4.next = 16;
+              return this.createNewContentProperty(pageId, key, syncBlockDataWithSourceDocumentAri, pageType);
+            case 16:
               return _context4.abrupt("return", {
+                resourceId: resourceId
+              });
+            case 19:
+              _context4.prev = 19;
+              _context4.t1 = _context4["catch"](9);
+              return _context4.abrupt("return", Promise.resolve({
+                error: (0, _errorHandling.stringifyError)(_context4.t1)
+              }));
+            case 22:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[1, 5], [9, 19]]);
+      }));
+      function createData(_x7) {
+        return _createData.apply(this, arguments);
+      }
+      return createData;
+    }()
+  }, {
+    key: "deleteData",
+    value: function () {
+      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(resourceId) {
+        var deletePayload, deleteResult, match, _match3, pageId, pageType, localId, key, options, _stringifyError;
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
+              match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId);
+              _context5.next = 7;
+              break;
+            case 4:
+              _context5.prev = 4;
+              _context5.t0 = _context5["catch"](0);
+              return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
-                error: (0, _errorHandling.stringifyError)(_context4.t0)
+                error: (0, _errorHandling.stringifyError)(_context5.t0)
               });
             case 7:
-              _match2 = match, pageId = _match2.id, pageType = _match2.type;
-              _context4.prev = 8;
+              _match3 = match, pageId = _match3.id, pageType = _match3.type;
+              _context5.prev = 8;
               localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               options = {
@@ -328,34 +366,34 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 cloudId: this.config.cloudId,
                 pageType: pageType
               };
-              _context4.next = 14;
+              _context5.next = 14;
               return (0, _contentProperty3.deleteContentProperty)(options);
             case 14:
-              deletePayload = _context4.sent;
+              deletePayload = _context5.sent;
               deleteResult = (0, _utils.isBlogPageType)(pageType) ? deletePayload.data.confluence.deleteBlogPostProperty : deletePayload.data.confluence.deletePageProperty;
-              _context4.next = 21;
+              _context5.next = 21;
               break;
             case 18:
-              _context4.prev = 18;
-              _context4.t1 = _context4["catch"](8);
-              return _context4.abrupt("return", {
+              _context5.prev = 18;
+              _context5.t1 = _context5["catch"](8);
+              return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
-                error: (_stringifyError = (0, _errorHandling.stringifyError)(_context4.t1)) !== null && _stringifyError !== void 0 ? _stringifyError : "Fail to delete ".concat(pageType, " content property")
+                error: (_stringifyError = (0, _errorHandling.stringifyError)(_context5.t1)) !== null && _stringifyError !== void 0 ? _stringifyError : "Fail to delete ".concat(pageType, " content property")
               });
             case 21:
-              return _context4.abrupt("return", {
+              return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: deleteResult.success,
                 error: deleteResult.errors.join()
               });
             case 22:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[0, 4], [8, 18]]);
+        }, _callee5, this, [[0, 4], [8, 18]]);
       }));
-      function deleteData(_x7) {
+      function deleteData(_x8) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;

package/dist/cjs/providers/syncBlockProvider.js

@@ -150,7 +150,19 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
         return _writeNodesData.apply(this, arguments);
       }
       return writeNodesData;
-    }()
+    }())
+  }, {
+    key: "createNodeData",
+    value: function createNodeData(data) {
+      return this.writeProvider.createData(data).then(function (result) {
+        return result;
+      }, function (error) {
+        return {
+          error: error
+        };
+      });
+    }
+
     /**
      * Delete the data from the write provider
      *
@@ -158,7 +170,6 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
      *
      * @returns Array of {resourceId?: string, error?: string}.
      */
-    )
   }, {
     key: "deleteNodesData",
     value: (function () {

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

@@ -233,17 +233,15 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                   (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error || 'Returned sync block instance does not have resource id'));
                   return;
                 }
+                var existingSyncBlock = _this2.getFromCache(syncBlockInstance.resourceId);
+                var resolvedSyncBlockInstance = existingSyncBlock ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
+                _this2.updateCache(resolvedSyncBlockInstance);
+                resolvedData.push(resolvedSyncBlockInstance);
                 if (syncBlockInstance.error) {
                   var _this2$fireAnalyticsE2;
                   (_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, (0, _errorHandling.fetchErrorPayload)(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);
-                resolvedData.push(resolvedSyncBlockInstance);
                 _this2.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
               });
               return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));

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

@@ -240,21 +240,19 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         }
         var resourceId = attrs.resourceId,
           blockInstanceId = attrs.localId;
-        this.dataProvider.writeNodesData([(0, _utils.createBodiedSyncBlockNode)(blockInstanceId, resourceId)], [{
+        this.dataProvider.createNodeData({
           content: [],
           blockInstanceId: blockInstanceId,
           resourceId: resourceId
-        }]).then(function (results) {
-          results.forEach(function (result) {
-            var resourceId = result.resourceId;
-            if (resourceId) {
-              _this4.commitPendingCreation(true);
-            } else {
-              var _this4$fireAnalyticsE;
-              _this4.commitPendingCreation(false);
-              (_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, (0, _errorHandling.createErrorPayload)(result.error || 'Failed to create bodied sync block'));
-            }
-          });
+        }).then(function (result) {
+          var resourceId = result.resourceId;
+          if (resourceId) {
+            _this4.commitPendingCreation(true);
+          } else {
+            var _this4$fireAnalyticsE;
+            _this4.commitPendingCreation(false);
+            (_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, (0, _errorHandling.createErrorPayload)(result.error || 'Failed to create bodied sync block'));
+          }
         }).catch(function (error) {
           var _this4$fireAnalyticsE2;
           _this4.commitPendingCreation(false);

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveSyncBlockInstance = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _types = require("../common/types");
 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; }
 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) { (0, _defineProperty2.default)(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; }
 /**
@@ -20,13 +21,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resolveSyncBlockInstance(oldResult, newResult) {
   var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2;
-  // if the old result has no data, we simple return the new result
+  // if the old result has no data, we simply return the new result
   if (!oldResult.data) {
     return newResult;
   } else if (!newResult.data) {
-    // if the new result has no data, we simply return the old result
-    // TODO: EDITOR-2533 - handle this case based on the error type and whether we should keep old data or not
-    return oldResult;
+    // return the old result if there was an error, e.g. network error, but not if not found or forbidden
+    if (newResult.error === _types.SyncBlockError.NotFound || newResult.error === _types.SyncBlockError.Forbidden) {
+      return newResult;
+    } else {
+      return oldResult;
+    }
   }
 
   // otherwise, we merge the two results, preserving the sourceURL and sourceTitle from the old result if it exists