@atlaskit/editor-synced-block-provider 3.30.1 → 3.30.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.30.3
+
+### Patch Changes
+
+- [`5ddfc9ed0352f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5ddfc9ed0352f) -
+  Switched from browser session storage to in memory session storage
+- Updated dependencies
+
+## 3.30.2
+
+### Patch Changes
+
+- [`e794387202d1b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e794387202d1b) -
+  EDITOR-4824 add additional error logging for sync blocks
+- Updated dependencies
+
 ## 3.30.1
 
 ### Patch Changes

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -12,11 +12,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../common/types");
+var _errorHandling = require("../utils/errorHandling");
 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; }
 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; }
-var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, _fireAnalyticsEvent) {
+var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, fireAnalyticsEvent) {
   // Initialize both states from a single cache lookup to avoid race conditions.
   // When a block is moved/remounted, the old component's cleanup may clear the cache
   // before or after the new component mounts. By doing a single lookup, we ensure
@@ -77,9 +79,13 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           (0, _monitoring.logException)(_context.t0, {
             location: 'editor-synced-block-provider/useFetchSyncBlockData'
           });
-          manager === null || manager === void 0 || (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 || (_manager$referenceMan2 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan2 === void 0 || _manager$referenceMan2.failure({
-            reason: _context.t0.message
-          });
+          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+            fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.fetchErrorPayload)(_context.t0.message));
+          } else {
+            manager === null || manager === void 0 || (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 || (_manager$referenceMan2 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan2 === void 0 || _manager$referenceMan2.failure({
+              reason: _context.t0.message
+            });
+          }
 
           // Set error state if fetching fails
           setFetchState({
@@ -103,7 +109,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           return _context.stop();
       }
     }, _callee, null, [[2, 11]]);
-  })), [isLoading, localId, manager.referenceManager, resourceId]);
+  })), [isLoading, localId, manager.referenceManager, resourceId, fireAnalyticsEvent]);
   (0, _react.useEffect)(function () {
     if ((0, _coreUtils.isSSR)()) {
       // in SSR, we don't need to subscribe to updates,

package/dist/cjs/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "SyncBlockError", {
     return _types.SyncBlockError;
   }
 });
+Object.defineProperty(exports, "SyncBlockInMemorySessionCache", {
+  enumerable: true,
+  get: function get() {
+    return _syncBlockInMemorySessionCache.SyncBlockInMemorySessionCache;
+  }
+});
 Object.defineProperty(exports, "SyncBlockStoreManager", {
   enumerable: true,
   get: function get() {
@@ -189,6 +195,12 @@ Object.defineProperty(exports, "resolveSyncBlockInstance", {
     return _resolveSyncBlockInstance.resolveSyncBlockInstance;
   }
 });
+Object.defineProperty(exports, "syncBlockInMemorySessionCache", {
+  enumerable: true,
+  get: function get() {
+    return _syncBlockInMemorySessionCache.syncBlockInMemorySessionCache;
+  }
+});
 Object.defineProperty(exports, "useFetchSyncBlockData", {
   enumerable: true,
   get: function get() {
@@ -245,6 +257,7 @@ var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
 var _sourceInfo = require("./clients/confluence/sourceInfo");
 var _syncBlockProvider = require("./providers/syncBlockProvider");
 var _referenceSyncBlockStoreManager = require("./store-manager/referenceSyncBlockStoreManager");
+var _syncBlockInMemorySessionCache = require("./store-manager/syncBlockInMemorySessionCache");
 var _syncBlockStoreManager = require("./store-manager/syncBlockStoreManager");
 var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
 var _resourceId = require("./utils/resourceId");

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

@@ -12,6 +12,7 @@ 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");
@@ -300,12 +301,22 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
               resourceId: resourceId
             });
           } catch (_unused3) {
-            results.push({
-              error: {
-                type: _types.SyncBlockError.Errored
-              },
-              resourceId: resourceId
-            });
+            if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+              results.push({
+                error: {
+                  type: _types.SyncBlockError.Errored,
+                  reason: "parsing JSON content response failed for resourceId: ".concat(resourceId, " localId: ").concat(blockAri)
+                },
+                resourceId: resourceId
+              });
+            } else {
+              results.push({
+                error: {
+                  type: _types.SyncBlockError.Errored
+                },
+                resourceId: resourceId
+              });
+            }
           }
         case 25:
           _context2.next = 14;
@@ -345,7 +356,10 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
         case 44:
           processedResourceIds.add(_resourceId);
           results.push({
-            error: {
+            error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+              type: mapErrorResponseCode(errorResponse.code),
+              reason: errorResponse.reason
+            } : {
               type: mapErrorResponseCode(errorResponse.code)
             },
             resourceId: _resourceId
@@ -391,7 +405,8 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
           return _context2.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
             return {
               error: {
-                type: _context2.t2 instanceof _blockService.BlockError ? mapBlockError(_context2.t2) : _types.SyncBlockError.Errored
+                type: _context2.t2 instanceof _blockService.BlockError ? mapBlockError(_context2.t2) : _types.SyncBlockError.Errored,
+                reason: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? _context2.t2.message : undefined
               },
               resourceId: blockNodeIdentifier.resourceId
             };
@@ -477,14 +492,20 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context3.abrupt("return", {
-                error: {
+                error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+                  type: mapBlockError(_context3.t0),
+                  reason: _context3.t0.message
+                } : {
                   type: mapBlockError(_context3.t0)
                 },
                 resourceId: resourceId
               });
             case 16:
               return _context3.abrupt("return", {
-                error: {
+                error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+                  type: _types.SyncBlockError.Errored,
+                  reason: _context3.t0.message
+                } : {
                   type: _types.SyncBlockError.Errored
                 },
                 resourceId: resourceId

package/dist/cjs/providers/syncBlockProvider.js

@@ -14,6 +14,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ari = require("../clients/block-service/ari");
 var _ari2 = require("../clients/confluence/ari");
 var _sourceInfo2 = require("../clients/confluence/sourceInfo");
@@ -114,9 +115,12 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
               return _context.abrupt("return", Promise.allSettled(blockIdentifiers.map(function (blockIdentifier) {
                 return _this2.fetchProvider.fetchData(blockIdentifier.resourceId).then(function (data) {
                   return data;
-                }, function () {
+                }, function (error) {
                   return {
-                    error: {
+                    error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+                      type: _types.SyncBlockError.Errored,
+                      reason: error
+                    } : {
                       type: _types.SyncBlockError.Errored
                     },
                     resourceId: blockIdentifier.resourceId

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

@@ -22,12 +22,13 @@ var _experienceTracking = require("../utils/experienceTracking");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
 var _resourceId = require("../utils/resourceId");
 var _utils = require("../utils/utils");
+var _syncBlockInMemorySessionCache = require("./syncBlockInMemorySessionCache");
 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; }
 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; }
-var SESSION_STORAGE_KEY_PREFIX = 'sync-block-data-';
+var CACHE_KEY_PREFIX = 'sync-block-data-';
 
 // A store manager responsible for the lifecycle and state management of reference sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
@@ -85,8 +86,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     this.subscriptionChangeListeners = new Set();
     this.newlyAddedSyncBlocks = new Set();
 
-    // The provider might have SSR data cache already set, so we need to update the cache in session storage
-    this.setSSRDataInSessionStorage((_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getNodeDataCacheKeys());
+    // The provider might have SSR data cache already set, so we need to update the cache in session memory storage
+    this.setSSRDataInSessionCache((_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getNodeDataCacheKeys());
   }
 
   /**
@@ -225,52 +226,32 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function getInitialSyncBlockData(resourceId) {
       var _this$dataProvider2;
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
-      var data = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
-      if (data) {
-        return data;
+      var providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
+      if (providerData) {
+        return providerData;
       }
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-        var sessionData = this.getSyncBlockDataFromSessionStorage(resourceId);
-        if (sessionData) {
-          return sessionData;
-        }
-      }
-      return undefined;
+      return this.getFromSessionCache(resourceId);
     }
   }, {
-    key: "updateCacheInSessionStorage",
-    value: function updateCacheInSessionStorage(resourceId) {
-      try {
-        var latestData = this.getFromCache(resourceId);
-        if (latestData) {
-          sessionStorage.setItem("".concat(SESSION_STORAGE_KEY_PREFIX).concat(resourceId), JSON.stringify(latestData));
-        }
-      } catch (error) {
-        (0, _monitoring.logException)(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/updateCacheInSessionStorage'
-        });
+    key: "updateSessionCache",
+    value: function updateSessionCache(resourceId) {
+      var latestData = this.getFromCache(resourceId);
+      if (latestData) {
+        _syncBlockInMemorySessionCache.syncBlockInMemorySessionCache.setItem("".concat(CACHE_KEY_PREFIX).concat(resourceId), JSON.stringify(latestData));
       }
     }
   }, {
-    key: "getSyncBlockDataFromSessionStorage",
-    value: function getSyncBlockDataFromSessionStorage(resourceId) {
-      var sessionData = null;
-      try {
-        sessionData = sessionStorage.getItem("".concat(SESSION_STORAGE_KEY_PREFIX).concat(resourceId));
-      } catch (error) {
-        (0, _monitoring.logException)(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getSyncBlockDataFromSessionStorage'
-        });
-        return undefined;
-      }
-      if (!sessionData) {
-        return undefined;
-      }
+    key: "getFromSessionCache",
+    value: function getFromSessionCache(resourceId) {
       try {
-        return JSON.parse(sessionData);
+        var raw = _syncBlockInMemorySessionCache.syncBlockInMemorySessionCache.getItem("".concat(CACHE_KEY_PREFIX).concat(resourceId));
+        if (!raw) {
+          return undefined;
+        }
+        return JSON.parse(raw);
       } catch (error) {
         (0, _monitoring.logException)(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getSyncBlockDataFromSessionStorage'
+          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
         });
         return undefined;
       }
@@ -425,8 +406,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         });
         this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       } else {
-        var _this$fireAnalyticsEv3, _syncBlockInstance$er;
-        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, (0, _errorHandling.fetchErrorPayload)((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.type, syncBlockInstance.resourceId));
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _syncBlockInstance$er3, _this$fireAnalyticsEv3;
+        var errorMessage = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type) : (_syncBlockInstance$er3 = syncBlockInstance.error) === null || _syncBlockInstance$er3 === void 0 ? void 0 : _syncBlockInstance$er3.type;
+        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, (0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId));
       }
     }
 
@@ -765,8 +747,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       data.forEach(function (syncBlockInstance) {
         var _resolvedSyncBlockIns;
         if (!syncBlockInstance.resourceId) {
-          var _this9$fireAnalyticsE, _syncBlockInstance$er2;
-          (_this9$fireAnalyticsE = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE === void 0 || _this9$fireAnalyticsE.call(_this9, (0, _errorHandling.fetchErrorPayload)(((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type) || 'Returned sync block instance does not have resource id'));
+          var _syncBlockInstance$er4, _syncBlockInstance$er5, _syncBlockInstance$er6, _this9$fireAnalyticsE;
+          var payload = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? ((_syncBlockInstance$er4 = syncBlockInstance.error) === null || _syncBlockInstance$er4 === void 0 ? void 0 : _syncBlockInstance$er4.reason) || ((_syncBlockInstance$er5 = syncBlockInstance.error) === null || _syncBlockInstance$er5 === void 0 ? void 0 : _syncBlockInstance$er5.type) || 'Returned sync block instance does not have resource id' : ((_syncBlockInstance$er6 = syncBlockInstance.error) === null || _syncBlockInstance$er6 === void 0 ? void 0 : _syncBlockInstance$er6.type) || 'Returned sync block instance does not have resource id';
+          (_this9$fireAnalyticsE = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE === void 0 || _this9$fireAnalyticsE.call(_this9, (0, _errorHandling.fetchErrorPayload)(payload));
           return;
         }
         var existingSyncBlock = _this9.getFromCache(syncBlockInstance.resourceId);
@@ -784,8 +767,13 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           _this9.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
         }
         if (syncBlockInstance.error) {
-          var _this9$fireAnalyticsE2;
-          (_this9$fireAnalyticsE2 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE2 === void 0 || _this9$fireAnalyticsE2.call(_this9, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error.type, syncBlockInstance.resourceId));
+          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+            var _this9$fireAnalyticsE2;
+            (_this9$fireAnalyticsE2 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE2 === void 0 || _this9$fireAnalyticsE2.call(_this9, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
+          } else {
+            var _this9$fireAnalyticsE3;
+            (_this9$fireAnalyticsE3 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE3 === void 0 || _this9$fireAnalyticsE3.call(_this9, (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) {
@@ -796,8 +784,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           var callbacks = _this9.subscriptions.get(syncBlockInstance.resourceId);
           var localIds = callbacks ? Object.keys(callbacks) : [];
           localIds.forEach(function (localId) {
-            var _this9$fireAnalyticsE3, _syncBlockInstance$da2;
-            (_this9$fireAnalyticsE3 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE3 === void 0 || _this9$fireAnalyticsE3.call(_this9, (0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
+            var _this9$fireAnalyticsE4, _syncBlockInstance$da2;
+            (_this9$fireAnalyticsE4 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE4 === void 0 || _this9$fireAnalyticsE4.call(_this9, (0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
           });
         }
         _this9.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
@@ -839,7 +827,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           });
         }
         if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-          this.updateCacheInSessionStorage(resourceId);
+          this.updateSessionCache(resourceId);
         }
       }
     }
@@ -884,14 +872,14 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       }
     }
   }, {
-    key: "setSSRDataInSessionStorage",
-    value: function setSSRDataInSessionStorage(resourceIds) {
+    key: "setSSRDataInSessionCache",
+    value: function setSSRDataInSessionCache(resourceIds) {
       var _this0 = this;
       if (!resourceIds || resourceIds.length === 0) {
         return;
       }
       resourceIds.forEach(function (resourceId) {
-        _this0.updateCacheInSessionStorage(resourceId);
+        _this0.updateSessionCache(resourceId);
       });
     }
   }, {
@@ -922,8 +910,6 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         this.notifySubscriptionChangeListeners();
       }
       var syncBlockNode = (0, _utils.createSyncBlockNode)(localId, resourceId);
-
-      // call the callback immediately if we have cached data
       var cachedData = (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 || (_this$dataProvider7 = _this$dataProvider7.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider7 === void 0 ? void 0 : _this$dataProvider7.data;
       if (cachedData) {
         callback(cachedData);

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

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.syncBlockInMemorySessionCache = exports.SyncBlockInMemorySessionCache = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+/**
+ * In-memory session cache for sync block data with size-based LRU eviction.
+ *
+ * Backed by a plain Map so that potentially private ADF content is never
+ * written to any browser-persistent storage (sessionStorage, localStorage,
+ * IndexedDB). The module-level singleton survives SPA transitions (no full
+ * page reload) and is naturally cleared on hard navigation or tab close.
+ *
+ * Uses JavaScript Map's insertion-order guarantee to implement LRU:
+ * on every read or write the accessed entry is moved to the end of the
+ * iteration order; when total cached size exceeds `maxSize`, the oldest
+ * (least-recently-used) entries are evicted first.
+ */
+var SyncBlockInMemorySessionCache = exports.SyncBlockInMemorySessionCache = /*#__PURE__*/function () {
+  function SyncBlockInMemorySessionCache() {
+    var maxSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 5 * 1024 * 1024;
+    (0, _classCallCheck2.default)(this, SyncBlockInMemorySessionCache);
+    (0, _defineProperty2.default)(this, "store", new Map());
+    (0, _defineProperty2.default)(this, "currentSize", 0);
+    this.maxSize = maxSize;
+  }
+  return (0, _createClass2.default)(SyncBlockInMemorySessionCache, [{
+    key: "getItem",
+    value: function getItem(key) {
+      var value = this.store.get(key);
+      if (value === undefined) {
+        return null;
+      }
+      this.store.delete(key);
+      this.store.set(key, value);
+      return value;
+    }
+  }, {
+    key: "setItem",
+    value: function setItem(key, value) {
+      var existing = this.store.get(key);
+      if (existing !== undefined) {
+        this.currentSize -= existing.length;
+        this.store.delete(key);
+      }
+      this.store.set(key, value);
+      this.currentSize += value.length;
+      while (this.currentSize > this.maxSize && this.store.size > 1) {
+        var oldestKey = this.store.keys().next().value;
+        if (oldestKey !== undefined) {
+          var oldestValue = this.store.get(oldestKey);
+          if (oldestValue !== undefined) {
+            this.currentSize -= oldestValue.length;
+          }
+          this.store.delete(oldestKey);
+        }
+      }
+    }
+  }, {
+    key: "removeItem",
+    value: function removeItem(key) {
+      var value = this.store.get(key);
+      if (value !== undefined) {
+        this.currentSize -= value.length;
+        this.store.delete(key);
+      }
+    }
+  }]);
+}();
+var syncBlockInMemorySessionCache = exports.syncBlockInMemorySessionCache = new SyncBlockInMemorySessionCache();

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -1,9 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
+import { fetchErrorPayload } from '../utils/errorHandling';
 import { createSyncBlockNode } from '../utils/utils';
-export const useFetchSyncBlockData = (manager, resourceId, localId, _fireAnalyticsEvent) => {
+export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalyticsEvent) => {
   // Initialize both states from a single cache lookup to avoid race conditions.
   // When a block is moved/remounted, the old component's cleanup may clear the cache
   // before or after the new component mounts. By doing a single lookup, we ensure
@@ -42,13 +44,17 @@ export const useFetchSyncBlockData = (manager, resourceId, localId, _fireAnalyti
       // Fetch sync block data, the `subscribeToSyncBlock` will update the state once data is fetched
       await manager.referenceManager.fetchSyncBlocksData([syncBlockNode]);
     } catch (error) {
-      var _manager$referenceMan2, _manager$referenceMan3;
       logException(error, {
         location: 'editor-synced-block-provider/useFetchSyncBlockData'
       });
-      manager === null || manager === void 0 ? void 0 : (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 ? void 0 : (_manager$referenceMan3 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan3 === void 0 ? void 0 : _manager$referenceMan3.failure({
-        reason: error.message
-      });
+      if (fg('platform_synced_block_patch_3')) {
+        fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message));
+      } else {
+        var _manager$referenceMan2, _manager$referenceMan3;
+        manager === null || manager === void 0 ? void 0 : (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 ? void 0 : (_manager$referenceMan3 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan3 === void 0 ? void 0 : _manager$referenceMan3.failure({
+          reason: error.message
+        });
+      }
 
       // Set error state if fetching fails
       setFetchState({
@@ -66,7 +72,7 @@ export const useFetchSyncBlockData = (manager, resourceId, localId, _fireAnalyti
       ...prev,
       isLoading: false
     }));
-  }, [isLoading, localId, manager.referenceManager, resourceId]);
+  }, [isLoading, localId, manager.referenceManager, resourceId, fireAnalyticsEvent]);
   useEffect(() => {
     if (isSSR()) {
       // in SSR, we don't need to subscribe to updates,

package/dist/es2019/index.js

@@ -21,6 +21,7 @@ export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 // store managers
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
+export { SyncBlockInMemorySessionCache, syncBlockInMemorySessionCache } from './store-manager/syncBlockInMemorySessionCache';
 export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
 
 // utils

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

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { batchRetrieveSyncedBlocks, BlockError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getReferenceSyncedBlocksByBlockAri, getSyncedBlockContent, updateReferenceSyncedBlockOnDocument, updateSyncedBlock } from '../../clients/block-service/blockService';
 import { subscribeToBlockUpdates as subscribeToBlockUpdatesWS } from '../../clients/block-service/blockSubscription';
@@ -242,12 +243,22 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
             resourceId
           });
         } catch {
-          results.push({
-            error: {
-              type: SyncBlockError.Errored
-            },
-            resourceId
-          });
+          if (fg('platform_synced_block_patch_3')) {
+            results.push({
+              error: {
+                type: SyncBlockError.Errored,
+                reason: `parsing JSON content response failed for resourceId: ${resourceId} localId: ${blockAri}`
+              },
+              resourceId
+            });
+          } else {
+            results.push({
+              error: {
+                type: SyncBlockError.Errored
+              },
+              resourceId
+            });
+          }
         }
       }
     }
@@ -262,7 +273,10 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
         }
         processedResourceIds.add(resourceId);
         results.push({
-          error: {
+          error: fg('platform_synced_block_patch_3') ? {
+            type: mapErrorResponseCode(errorResponse.code),
+            reason: errorResponse.reason
+          } : {
             type: mapErrorResponseCode(errorResponse.code)
           },
           resourceId
@@ -286,7 +300,8 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
     // If batch request fails, return error for all resourceIds
     return blockNodeIdentifiers.map(blockNodeIdentifier => ({
       error: {
-        type: error instanceof BlockError ? mapBlockError(error) : SyncBlockError.Errored
+        type: error instanceof BlockError ? mapBlockError(error) : SyncBlockError.Errored,
+        reason: fg('platform_synced_block_patch_3') ? error.message : undefined
       },
       resourceId: blockNodeIdentifier.resourceId
     }));
@@ -354,14 +369,20 @@ class BlockServiceADFFetchProvider {
     } catch (error) {
       if (error instanceof BlockError) {
         return {
-          error: {
+          error: fg('platform_synced_block_patch_3') ? {
+            type: mapBlockError(error),
+            reason: error.message
+          } : {
             type: mapBlockError(error)
           },
           resourceId
         };
       }
       return {
-        error: {
+        error: fg('platform_synced_block_patch_3') ? {
+          type: SyncBlockError.Errored,
+          reason: error.message
+        } : {
           type: SyncBlockError.Errored
         },
         resourceId

package/dist/es2019/providers/syncBlockProvider.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
@@ -70,9 +71,12 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
       return Promise.allSettled(blockIdentifiers.map(blockIdentifier => {
         return this.fetchProvider.fetchData(blockIdentifier.resourceId).then(data => {
           return data;
-        }, () => {
+        }, error => {
           return {
-            error: {
+            error: fg('platform_synced_block_patch_3') ? {
+              type: SyncBlockError.Errored,
+              reason: error
+            } : {
               type: SyncBlockError.Errored
             },
             resourceId: blockIdentifier.resourceId