@atlaskit/editor-synced-block-provider 3.14.0 → 3.14.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.14.2
+
+### Patch Changes
+
+- [`28434cbe03f1e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/28434cbe03f1e) -
+  [ux] [EDITOR-2851]
+  - Implement unsync feature for source sync block
+  - Update deletion confirmation modal and reference block UI after source deletion
+
+- Updated dependencies
+
+## 3.14.1
+
+### Patch Changes
+
+- [`838e5da4cc27d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/838e5da4cc27d) -
+  Refactor SyncBlockLabel and BlockServiceAPI provider
+
 ## 3.14.0
 
 ### Minor 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; })(); }
@@ -225,24 +226,25 @@ var batchRetrieveSyncedBlocks = exports.batchRetrieveSyncedBlocks = /*#__PURE__*
 }();
 var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(_ref6) {
-    var blockAri, response;
+    var blockAri, deleteReason, url, response;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          blockAri = _ref6.blockAri;
-          _context4.next = 3;
-          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          blockAri = _ref6.blockAri, deleteReason = _ref6.deleteReason;
+          url = deleteReason && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding') ? "".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri), "?deletionReason=").concat(encodeURIComponent(deleteReason)) : "".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri));
+          _context4.next = 4;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'DELETE',
             headers: COMMON_HEADERS
           });
-        case 3:
+        case 4:
           response = _context4.sent;
           if (response.ok) {
-            _context4.next = 6;
+            _context4.next = 7;
             break;
           }
           throw new BlockError(response.status);
-        case 6:
+        case 7:
         case "end":
           return _context4.stop();
       }

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.subscribeToBlockUpdates = void 0;
 var _graphqlWs = require("graphql-ws");
+var _utils = require("../../utils/utils");
 var GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
 var blockServiceClient = null;
 var getBlockServiceClient = function getBlockServiceClient() {
@@ -60,6 +61,7 @@ var parseSubscriptionPayload = function parseSubscriptionPayload(payload) {
       blockAri: payload.blockAri,
       blockInstanceId: payload.blockInstanceId,
       content: JSON.parse(payload.content),
+      contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(payload.contentUpdatedAt),
       createdAt: createdAt,
       createdBy: payload.createdBy,
       product: payload.product,

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -90,7 +90,9 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           setFetchState({
             syncBlockInstance: {
               resourceId: resourceId || '',
-              error: _types.SyncBlockError.Errored
+              error: {
+                type: _types.SyncBlockError.Errored
+              }
             },
             isLoading: false
           });

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

@@ -12,13 +12,13 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ari = require("../../clients/block-service/ari");
 var _blockService = require("../../clients/block-service/blockService");
 var _blockSubscription = require("../../clients/block-service/blockSubscription");
 var _types = require("../../common/types");
 var _errorHandling = require("../../utils/errorHandling");
 var _resourceId2 = require("../../utils/resourceId");
+var _utils = require("../../utils/utils");
 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; }
@@ -104,24 +104,16 @@ var convertToSyncBlockData = exports.convertToSyncBlockData = function convertTo
       // BE returns microseconds, convert to milliseconds
       // BE should fix this in the future
       createdAt = new Date(data.createdAt / 1000).toISOString();
-    } catch (e) {
+    } catch (_unused) {
       // fallback to undefined
       // as we don't want to block the whole process due to invalid date
       createdAt = undefined;
     }
   }
-  var contentUpdatedAt;
-  if (typeof data.contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-    try {
-      contentUpdatedAt = new Date(data.contentUpdatedAt).toISOString();
-    } catch (e) {
-      contentUpdatedAt = undefined;
-    }
-  }
   return {
     blockInstanceId: data.blockInstanceId,
     content: JSON.parse(data.content),
-    contentUpdatedAt: contentUpdatedAt,
+    contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(data.contentUpdatedAt),
     createdAt: createdAt,
     createdBy: data.createdBy,
     product: data.product,
@@ -161,7 +153,9 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
               if (!resourceId) {
                 // could not extract resourceId from blockAri, return InvalidContent error
                 return {
-                  error: _types.SyncBlockError.InvalidContent,
+                  error: {
+                    type: _types.SyncBlockError.InvalidContent
+                  },
                   resourceId: blockContentResponse.blockAri
                 };
               }
@@ -169,17 +163,21 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
                 data: convertToSyncBlockData(blockContentResponse, resourceId),
                 resourceId: resourceId
               };
-            } catch (_unused) {
+            } catch (_unused2) {
               // JSON parsing error, return InvalidContent error
               return {
-                error: _types.SyncBlockError.InvalidContent,
+                error: {
+                  type: _types.SyncBlockError.InvalidContent
+                },
                 resourceId: blockContentResponse.blockAri
               };
             }
           });
           errorInstances = (errors || []).map(function (errorBlock) {
             return {
-              error: _types.SyncBlockError.Errored,
+              error: {
+                type: _types.SyncBlockError.Errored
+              },
               resourceId: errorBlock.blockAri
             };
           });
@@ -212,7 +210,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     key: "fetchData",
     value: function () {
       var _fetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceId) {
-        var blockAri, blockContentResponse, value, syncedBlockData, contentUpdatedAt;
+        var blockAri, blockContentResponse, value, syncedBlockData;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -234,53 +232,54 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context2.abrupt("return", {
-                error: _types.SyncBlockError.NotFound,
+                error: {
+                  type: _types.SyncBlockError.NotFound,
+                  reason: blockContentResponse.deletionReason
+                },
                 resourceId: resourceId
               });
             case 8:
               // Parse the synced block content from the response's content
               syncedBlockData = JSON.parse(value);
-              if (typeof blockContentResponse.contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-                try {
-                  contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-                } catch (e) {
-                  contentUpdatedAt = undefined;
-                }
-              }
               return _context2.abrupt("return", {
                 data: {
                   content: syncedBlockData,
                   resourceId: blockAri,
                   blockInstanceId: blockContentResponse.blockInstanceId,
                   // this was the node's localId, but has become the resourceId.
-                  contentUpdatedAt: contentUpdatedAt,
+                  contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(blockContentResponse.contentUpdatedAt),
                   sourceAri: blockContentResponse.sourceAri,
                   product: blockContentResponse.product,
-                  status: blockContentResponse.status
+                  status: blockContentResponse.status,
+                  deletionReason: blockContentResponse.deletionReason
                 },
                 resourceId: resourceId
               });
-            case 13:
-              _context2.prev = 13;
+            case 12:
+              _context2.prev = 12;
               _context2.t0 = _context2["catch"](1);
               if (!(_context2.t0 instanceof _blockService.BlockError)) {
-                _context2.next = 17;
+                _context2.next = 16;
                 break;
               }
               return _context2.abrupt("return", {
-                error: mapBlockError(_context2.t0),
+                error: {
+                  type: mapBlockError(_context2.t0)
+                },
                 resourceId: resourceId
               });
-            case 17:
+            case 16:
               return _context2.abrupt("return", {
-                error: _types.SyncBlockError.Errored,
+                error: {
+                  type: _types.SyncBlockError.Errored
+                },
                 resourceId: resourceId
               });
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[1, 13]]);
+        }, _callee2, this, [[1, 12]]);
       }));
       function fetchData(_x2) {
         return _fetchData.apply(this, arguments);
@@ -373,7 +372,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     value: (function () {
       var _batchFetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(blockNodeIdentifiers) {
         var _this2 = this;
-        var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, value, syncedBlockData, contentUpdatedAt, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
+        var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, value, syncedBlockData, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -396,7 +395,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               }
               return _context4.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
                 return {
-                  error: _types.SyncBlockError.Errored,
+                  error: {
+                    type: _types.SyncBlockError.Errored
+                  },
                   resourceId: blockNodeIdentifier.resourceId
                 };
               }));
@@ -438,36 +439,34 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               results.push({
-                error: _types.SyncBlockError.NotFound,
+                error: {
+                  type: _types.SyncBlockError.NotFound,
+                  reason: blockContentResponse.deletionReason
+                },
                 resourceId: resourceId
               });
               return _context4.abrupt("continue", 25);
             case 24:
               try {
                 syncedBlockData = JSON.parse(value);
-                contentUpdatedAt = void 0;
-                if (typeof blockContentResponse.contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-                  try {
-                    contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-                  } catch (e) {
-                    contentUpdatedAt = undefined;
-                  }
-                }
                 results.push({
                   data: {
                     content: syncedBlockData,
                     resourceId: blockContentResponse.blockAri,
-                    contentUpdatedAt: contentUpdatedAt,
+                    contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(blockContentResponse.contentUpdatedAt),
                     blockInstanceId: blockContentResponse.blockInstanceId,
                     sourceAri: blockContentResponse.sourceAri,
                     product: blockContentResponse.product,
-                    status: blockContentResponse.status
+                    status: blockContentResponse.status,
+                    deletionReason: blockContentResponse.deletionReason
                   },
                   resourceId: resourceId
                 });
-              } catch (_unused2) {
+              } catch (_unused3) {
                 results.push({
-                  error: _types.SyncBlockError.Errored,
+                  error: {
+                    type: _types.SyncBlockError.Errored
+                  },
                   resourceId: resourceId
                 });
               }
@@ -509,7 +508,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 44:
               processedResourceIds.add(_resourceId);
               results.push({
-                error: mapErrorResponseCode(errorResponse.code),
+                error: {
+                  type: mapErrorResponseCode(errorResponse.code)
+                },
                 resourceId: _resourceId
               });
             case 46:
@@ -534,7 +535,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   blockNodeIdentifier = _step3.value;
                   if (!processedResourceIds.has(blockNodeIdentifier.resourceId)) {
                     results.push({
-                      error: _types.SyncBlockError.NotFound,
+                      error: {
+                        type: _types.SyncBlockError.NotFound
+                      },
                       resourceId: blockNodeIdentifier.resourceId
                     });
                   }
@@ -550,7 +553,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               _context4.t2 = _context4["catch"](5);
               return _context4.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
                 return {
-                  error: _context4.t2 instanceof _blockService.BlockError ? mapBlockError(_context4.t2) : _types.SyncBlockError.Errored,
+                  error: {
+                    type: _context4.t2 instanceof _blockService.BlockError ? mapBlockError(_context4.t2) : _types.SyncBlockError.Errored
+                  },
                   resourceId: blockNodeIdentifier.resourceId
                 };
               }));
@@ -590,6 +595,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             sourceAri: parsedData.sourceAri,
             product: parsedData.product,
             createdAt: parsedData.createdAt,
+            contentUpdatedAt: parsedData.contentUpdatedAt,
             createdBy: parsedData.createdBy,
             status: parsedData.status
           },
@@ -749,7 +755,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "deleteData",
     value: function () {
-      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(resourceId) {
+      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(resourceId, deleteReason) {
         var blockAri;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -773,7 +779,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               _context7.prev = 3;
               _context7.next = 6;
               return (0, _blockService.deleteSyncedBlock)({
-                blockAri: blockAri
+                blockAri: blockAri,
+                deleteReason: deleteReason
               });
             case 6:
               return _context7.abrupt("return", {
@@ -814,7 +821,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[3, 9]]);
       }));
-      function deleteData(_x7) {
+      function deleteData(_x7, _x8) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;
@@ -887,7 +894,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee8, this, [[2, 8]]);
       }));
-      function updateReferenceData(_x8, _x9) {
+      function updateReferenceData(_x9, _x0) {
         return _updateReferenceData.apply(this, arguments);
       }
       return updateReferenceData;

package/dist/cjs/providers/syncBlockProvider.js

@@ -121,7 +121,9 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                   return data;
                 }, function () {
                   return {
-                    error: _types.SyncBlockError.Errored,
+                    error: {
+                      type: _types.SyncBlockError.Errored
+                    },
                     resourceId: blockIdentifier.resourceId
                   };
                 });
@@ -141,7 +143,9 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                   return data;
                 }, function () {
                   return {
-                    error: _types.SyncBlockError.Errored,
+                    error: {
+                      type: _types.SyncBlockError.Errored
+                    },
                     resourceId: blockIdentifier.resourceId
                   };
                 });
@@ -246,7 +250,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
   }, {
     key: "deleteNodesData",
     value: (function () {
-      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resourceIds) {
+      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resourceIds, deletionReason) {
         var _this4 = this;
         var results;
         return _regenerator.default.wrap(function _callee3$(_context3) {
@@ -263,7 +267,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                 if (!_this4.writeProvider) {
                   return Promise.reject('Write provider not set');
                 }
-                return _this4.writeProvider.deleteData(resourceId);
+                return _this4.writeProvider.deleteData(resourceId, deletionReason);
               }));
             case 4:
               results = _context3.sent;
@@ -284,7 +288,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           }
         }, _callee3, this);
       }));
-      function deleteNodesData(_x4) {
+      function deleteNodesData(_x4, _x5) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;
@@ -382,7 +386,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           }
         }, _callee4, this);
       }));
-      function fetchSyncBlockSourceInfo(_x5, _x6, _x7, _x8) {
+      function fetchSyncBlockSourceInfo(_x6, _x7, _x8, _x9) {
         return _fetchSyncBlockSourceInfo.apply(this, arguments);
       }
       return fetchSyncBlockSourceInfo;

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

@@ -499,7 +499,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: (function () {
       var _fetchSyncBlocksData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockNodes) {
         var _this5 = this;
-        var nodesToFetch, _this$fetchExperience, data, resolvedData, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4;
+        var nodesToFetch, _this$fetchExperience, data, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4;
         return _regenerator.default.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -512,11 +512,12 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               // Don't fetch for not_found error since the source is already deleted
               nodesToFetch = [];
               syncBlockNodes.forEach(function (node) {
+                var _existingSyncBlock$er;
                 if (_this5.syncBlockFetchDataRequests.get(node.attrs.resourceId)) {
                   return;
                 }
                 var existingSyncBlock = _this5.getFromCache(node.attrs.resourceId);
-                if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === _types.SyncBlockError.NotFound) {
+                if ((existingSyncBlock === null || existingSyncBlock === void 0 || (_existingSyncBlock$er = existingSyncBlock.error) === null || _existingSyncBlock$er === void 0 ? void 0 : _existingSyncBlock$er.type) === _types.SyncBlockError.NotFound) {
                   return;
                 }
                 nodesToFetch.push(node);
@@ -547,23 +548,21 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               });
             case 12:
               data = _context3.sent;
-              resolvedData = [];
               hasUnexpectedError = false;
               hasExpectedError = false;
               data.forEach(function (syncBlockInstance) {
                 if (!syncBlockInstance.resourceId) {
-                  var _this5$fireAnalyticsE;
-                  (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error || 'Returned sync block instance does not have resource id'));
+                  var _this5$fireAnalyticsE, _syncBlockInstance$er;
+                  (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, (0, _errorHandling.fetchErrorPayload)(((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.type) || 'Returned sync block instance does not have resource id'));
                   return;
                 }
                 var existingSyncBlock = _this5.getFromCache(syncBlockInstance.resourceId);
                 var resolvedSyncBlockInstance = existingSyncBlock ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this5.updateCache(resolvedSyncBlockInstance);
-                resolvedData.push(resolvedSyncBlockInstance);
                 if (syncBlockInstance.error) {
                   var _this5$fireAnalyticsE2;
-                  (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error, syncBlockInstance.resourceId));
-                  if (syncBlockInstance.error === _types.SyncBlockError.NotFound || syncBlockInstance.error === _types.SyncBlockError.Forbidden) {
+                  (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error.type, syncBlockInstance.resourceId));
+                  if (syncBlockInstance.error.type === _types.SyncBlockError.NotFound || syncBlockInstance.error.type === _types.SyncBlockError.Forbidden) {
                     hasExpectedError = true;
                   } else if (syncBlockInstance.error) {
                     hasUnexpectedError = true;
@@ -588,7 +587,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                   (_this$fetchExperience4 = this.fetchExperience) === null || _this$fetchExperience4 === void 0 || _this$fetchExperience4.success();
                 }
               }
-            case 18:
+            case 17:
             case "end":
               return _context3.stop();
           }