@atlaskit/editor-synced-block-provider 3.31.2 → 3.31.3

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

@@ -12,7 +12,6 @@ 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");
@@ -301,22 +300,13 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
               resourceId: resourceId
             });
           } catch (_unused3) {
-            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
-              });
-            }
+            results.push({
+              error: {
+                type: _types.SyncBlockError.Errored,
+                reason: "parsing JSON content response failed for resourceId: ".concat(resourceId, " localId: ").concat(blockAri)
+              },
+              resourceId: resourceId
+            });
           }
         case 25:
           _context2.next = 14;
@@ -356,11 +346,9 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
         case 44:
           processedResourceIds.add(_resourceId);
           results.push({
-            error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+            error: {
               type: mapErrorResponseCode(errorResponse.code),
               reason: errorResponse.reason
-            } : {
-              type: mapErrorResponseCode(errorResponse.code)
             },
             resourceId: _resourceId
           });
@@ -406,7 +394,7 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
             return {
               error: {
                 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
+                reason: _context2.t2.message
               },
               resourceId: blockNodeIdentifier.resourceId
             };
@@ -656,21 +644,17 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context5.abrupt("return", {
-                error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+                error: {
                   type: mapBlockError(_context5.t0),
                   reason: _context5.t0.message
-                } : {
-                  type: mapBlockError(_context5.t0)
                 },
                 resourceId: resourceId
               });
             case 16:
               return _context5.abrupt("return", {
-                error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+                error: {
                   type: _types.SyncBlockError.Errored,
                   reason: _context5.t0.message
-                } : {
-                  type: _types.SyncBlockError.Errored
                 },
                 resourceId: resourceId
               });

package/dist/cjs/providers/syncBlockProvider.js

@@ -15,8 +15,6 @@ 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 _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _ari = require("../clients/block-service/ari");
 var _ari2 = require("../clients/confluence/ari");
 var _sourceInfo2 = require("../clients/confluence/sourceInfo");
@@ -119,11 +117,9 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
                   return data;
                 }, function (error) {
                   return {
-                    error: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+                    error: {
                       type: _types.SyncBlockError.Errored,
                       reason: error
-                    } : {
-                      type: _types.SyncBlockError.Errored
                     },
                     resourceId: blockIdentifier.resourceId
                   };
@@ -171,7 +167,7 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
               }
               return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
             case 2:
-              if (!(this.writeProvider.writeDataBatch && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4'))) {
+              if (!this.writeProvider.writeDataBatch) {
                 _context2.next = 12;
                 break;
               }
@@ -316,11 +312,9 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
   }, {
     key: "fetchSyncBlockSourceInfo",
     value: (function () {
-      var _fetchSyncBlockSourceInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(localId, sourceAri, sourceProduct, fireAnalyticsEvent) {
+      var _fetchSyncBlockSourceInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(localId, sourceAri, sourceProduct) {
         var _this$writeProvider, _this$writeProvider3;
         var hasAccess,
-          urlType,
-          isUnpublished,
           ari,
           product,
           _this$writeProvider2,
@@ -330,59 +324,57 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              hasAccess = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : true;
-              urlType = _args4.length > 5 && _args4[5] !== undefined ? _args4[5] : 'edit';
-              isUnpublished = _args4.length > 6 ? _args4[6] : undefined;
+              hasAccess = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : true;
               ari = sourceAri !== null && sourceAri !== void 0 ? sourceAri : (_this$writeProvider = this.writeProvider) === null || _this$writeProvider === void 0 ? void 0 : _this$writeProvider.parentAri;
               product = sourceProduct !== null && sourceProduct !== void 0 ? sourceProduct : (0, _ari.getProductFromSourceAri)(ari);
               if (!(!ari || !product)) {
-                _context4.next = 7;
+                _context4.next = 5;
                 break;
               }
               return _context4.abrupt("return", Promise.reject(new Error('Source ari or source product is undefined')));
-            case 7:
+            case 5:
               _context4.t0 = product;
-              _context4.next = _context4.t0 === 'confluence-page' ? 10 : _context4.t0 === 'jira-work-item' ? 16 : 22;
+              _context4.next = _context4.t0 === 'confluence-page' ? 8 : _context4.t0 === 'jira-work-item' ? 14 : 20;
               break;
+            case 8:
+              _context4.next = 10;
+              return (0, _sourceInfo2.fetchConfluencePageInfo)(ari, hasAccess, localId);
             case 10:
-              _context4.next = 12;
-              return (0, _sourceInfo2.fetchConfluencePageInfo)(ari, hasAccess, urlType, localId, isUnpublished);
-            case 12:
               _sourceInfo = _context4.sent;
               if (_sourceInfo) {
-                _context4.next = 15;
+                _context4.next = 13;
                 break;
               }
               return _context4.abrupt("return", Promise.resolve(undefined));
-            case 15:
+            case 13:
               return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
                 onSameDocument: ((_this$writeProvider2 = this.writeProvider) === null || _this$writeProvider2 === void 0 ? void 0 : _this$writeProvider2.parentAri) === ari,
                 productType: product
               }));
-            case 16:
-              _context4.next = 18;
+            case 14:
+              _context4.next = 16;
               return (0, _sourceInfo3.fetchJiraWorkItemInfo)(ari, hasAccess);
-            case 18:
+            case 16:
               sourceInfo = _context4.sent;
               if (sourceInfo) {
-                _context4.next = 21;
+                _context4.next = 19;
                 break;
               }
               return _context4.abrupt("return", Promise.resolve(undefined));
-            case 21:
+            case 19:
               return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
                 onSameDocument: ((_this$writeProvider3 = this.writeProvider) === null || _this$writeProvider3 === void 0 ? void 0 : _this$writeProvider3.parentAri) === ari,
                 productType: product
               }));
-            case 22:
+            case 20:
               return _context4.abrupt("return", Promise.reject(new Error("".concat(product, " source product not supported"))));
-            case 23:
+            case 21:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function fetchSyncBlockSourceInfo(_x6, _x7, _x8, _x9) {
+      function fetchSyncBlockSourceInfo(_x6, _x7, _x8) {
         return _fetchSyncBlockSourceInfo.apply(this, arguments);
       }
       return fetchSyncBlockSourceInfo;
@@ -484,7 +476,7 @@ var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
     writeProvider = _ref.writeProvider;
   return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
-var useMemoizedSyncedBlockProviderBase = function useMemoizedSyncedBlockProviderBase(_ref2) {
+var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
   var fetchProvider = _ref2.fetchProvider,
     writeProvider = _ref2.writeProvider,
     providerOptions = _ref2.providerOptions,
@@ -495,24 +487,6 @@ var useMemoizedSyncedBlockProviderBase = function useMemoizedSyncedBlockProvider
       writeProvider: writeProvider
     });
   }, [fetchProvider, writeProvider]);
-  syncBlockProvider.setProviderOptions(providerOptions);
-  var ssrData = getSSRData ? getSSRData() : undefined;
-  if (ssrData) {
-    syncBlockProvider.setSSRData(ssrData);
-  }
-  return syncBlockProvider;
-};
-var useMemoizedSyncedBlockProviderPatched = function useMemoizedSyncedBlockProviderPatched(_ref3) {
-  var fetchProvider = _ref3.fetchProvider,
-    writeProvider = _ref3.writeProvider,
-    providerOptions = _ref3.providerOptions,
-    getSSRData = _ref3.getSSRData;
-  var syncBlockProvider = (0, _react.useMemo)(function () {
-    return createSyncedBlockProvider({
-      fetchProvider: fetchProvider,
-      writeProvider: writeProvider
-    });
-  }, [fetchProvider, writeProvider]);
   var prevProviderOptionsRef = (0, _react.useRef)(undefined);
   if (providerOptions !== prevProviderOptionsRef.current) {
     prevProviderOptionsRef.current = providerOptions;
@@ -527,7 +501,4 @@ var useMemoizedSyncedBlockProviderPatched = function useMemoizedSyncedBlockProvi
     }
   }
   return syncBlockProvider;
-};
-var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
-  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
-}, useMemoizedSyncedBlockProviderPatched, useMemoizedSyncedBlockProviderBase);
+};

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

@@ -465,10 +465,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function handleGraphQLSubscriptionUpdate(syncBlockInstance) {
       var _this5 = this;
       if (!syncBlockInstance.resourceId) {
-        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_4')) {
-          return;
-        }
-        throw new Error('Sync block instance provided to graphql subscription update missing resource id');
+        return;
       }
       var existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
       var resolvedSyncBlockInstance = existingSyncBlock ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
@@ -482,8 +479,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         });
         this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       } else {
-        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;
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$fireAnalyticsEv3;
+        var errorMessage = ((_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);
         (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, (0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId));
       }
     }
@@ -558,12 +555,11 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     key: "fetchSyncBlockSourceInfoBySourceAri",
     value: function fetchSyncBlockSourceInfoBySourceAri(sourceAri) {
       var hasAccess = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      var urlType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'view';
       try {
         if (!this.dataProvider) {
           throw new Error('Data provider not set');
         }
-        var sourceInfo = this.dataProvider.fetchSyncBlockSourceInfo(undefined, sourceAri, undefined, undefined, hasAccess, urlType);
+        var sourceInfo = this.dataProvider.fetchSyncBlockSourceInfo(undefined, sourceAri, undefined, hasAccess);
         return sourceInfo;
       } catch (error) {
         var _this$fireAnalyticsEv4;
@@ -579,7 +575,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function fetchSyncBlockSourceInfo(resourceId) {
       var _this6 = this;
       try {
-        var _this$fetchSourceInfo, _existingSyncBlock$da;
+        var _this$fetchSourceInfo;
         if (!resourceId || !this.dataProvider) {
           throw new Error('Data provider or resourceId not set');
         }
@@ -616,12 +612,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           return Promise.resolve(undefined);
         }
         (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 || _this$fetchSourceInfo.start({});
-        var isUnpublished = ((_existingSyncBlock$da = existingSyncBlock.data) === null || _existingSyncBlock$da === void 0 ? void 0 : _existingSyncBlock$da.status) === 'unpublished';
-        var sourceInfoPromise = this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, this.fireAnalyticsEvent, true,
-        // hasAccess
-        'edit',
-        // urlType
-        isUnpublished).then(function (sourceInfo) {
+        var sourceInfoPromise = this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, true // hasAccess
+        ).then(function (sourceInfo) {
           if (!sourceInfo) {
             var _this6$fetchSourceInf, _this6$fireAnalyticsE;
             (_this6$fetchSourceInf = _this6.fetchSourceInfoExperience) === null || _this6$fetchSourceInf === void 0 || _this6$fetchSourceInf.failure({
@@ -835,8 +827,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       data.forEach(function (syncBlockInstance) {
         var _resolvedSyncBlockIns;
         if (!syncBlockInstance.resourceId) {
-          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';
+          var _syncBlockInstance$er3, _syncBlockInstance$er4, _this9$fireAnalyticsE;
+          var payload = ((_syncBlockInstance$er3 = syncBlockInstance.error) === null || _syncBlockInstance$er3 === void 0 ? void 0 : _syncBlockInstance$er3.reason) || ((_syncBlockInstance$er4 = syncBlockInstance.error) === null || _syncBlockInstance$er4 === void 0 ? void 0 : _syncBlockInstance$er4.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;
         }
@@ -855,13 +847,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           _this9.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
         }
         if (syncBlockInstance.error) {
-          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));
-          }
+          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));
           if (syncBlockInstance.error.type === _types.SyncBlockError.NotFound || syncBlockInstance.error.type === _types.SyncBlockError.Forbidden) {
             hasExpectedError = true;
           } else if (syncBlockInstance.error) {
@@ -872,8 +859,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         var callbacks = _this9.subscriptions.get(syncBlockInstance.resourceId);
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
-          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));
+          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));
         });
         _this9.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       });
@@ -913,9 +900,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
             callback(syncBlock);
           });
         }
-        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-          this.updateSessionCache(resourceId);
-        }
+        this.updateSessionCache(resourceId);
       }
     }
   }, {

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

@@ -529,7 +529,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           throw new Error('Data provider not set');
         }
         (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 || _this$fetchSourceInfo.start();
-        return this.dataProvider.fetchSyncBlockSourceInfo(localId, undefined, undefined, this.fireAnalyticsEvent).then(function (sourceInfo) {
+        return this.dataProvider.fetchSyncBlockSourceInfo(localId, undefined, undefined).then(function (sourceInfo) {
           if (!sourceInfo) {
             var _this6$fetchSourceInf;
             (_this6$fetchSourceInf = _this6.fetchSourceInfoExperience) === null || _this6$fetchSourceInf === void 0 || _this6$fetchSourceInf.failure({

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

@@ -12,8 +12,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = require("react");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _ari = require("../clients/block-service/ari");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
@@ -97,7 +95,7 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
                       case 0:
                         (_this$fetchSourceInfo = _this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 || _this$fetchSourceInfo.start();
                         _context.next = 3;
-                        return (_this$dataProvider = _this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.fetchSyncBlockSourceInfo(reference.blockInstanceId || '', reference.documentAri, (0, _ari.getProductFromSourceAri)(reference.documentAri), _this.fireAnalyticsEvent, reference.hasAccess, 'view');
+                        return (_this$dataProvider = _this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.fetchSyncBlockSourceInfo(reference.blockInstanceId || '', reference.documentAri, (0, _ari.getProductFromSourceAri)(reference.documentAri), reference.hasAccess);
                       case 3:
                         sourceInfo = _context.sent;
                         if (sourceInfo) {
@@ -202,14 +200,7 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
 var createSyncBlockStoreManager = function createSyncBlockStoreManager(dataProvider) {
   return new SyncBlockStoreManager(dataProvider);
 };
-var useMemoizedSyncBlockStoreManagerBase = function useMemoizedSyncBlockStoreManagerBase(dataProvider, fireAnalyticsEvent) {
-  var syncBlockStoreManager = (0, _react.useMemo)(function () {
-    return createSyncBlockStoreManager(dataProvider);
-  }, [dataProvider]);
-  syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
-  return syncBlockStoreManager;
-};
-var useMemoizedSyncBlockStoreManagerPatched = function useMemoizedSyncBlockStoreManagerPatched(dataProvider, fireAnalyticsEvent) {
+var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
   var syncBlockStoreManager = (0, _react.useMemo)(function () {
     return createSyncBlockStoreManager(dataProvider);
   }, [dataProvider]);
@@ -219,7 +210,4 @@ var useMemoizedSyncBlockStoreManagerPatched = function useMemoizedSyncBlockStore
     syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
   }
   return syncBlockStoreManager;
-};
-var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
-  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
-}, useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);
+};

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

@@ -189,8 +189,8 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _syncBlockInstance$er3, _this$deps$getFireAna;
-        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;
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna;
+        var errorMessage = ((_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);
         (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId));
       }
     }

package/dist/cjs/utils/errorHandling.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateSuccessPayload = exports.updateReferenceErrorPayload = exports.updateErrorPayload = exports.updateCacheErrorPayload = exports.stringifyError = exports.getSourceInfoErrorPayload = exports.getErrorPayload = exports.fetchSuccessPayload = exports.fetchReferencesErrorPayload = exports.fetchErrorPayload = exports.deleteSuccessPayload = exports.deleteErrorPayload = exports.createSuccessPayloadNew = exports.createSuccessPayload = exports.createErrorPayload = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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 stringifyError = exports.stringifyError = function stringifyError(error) {
@@ -71,7 +70,7 @@ var fetchSuccessPayload = exports.fetchSuccessPayload = function fetchSuccessPay
   };
 };
 var createSuccessPayload = exports.createSuccessPayload = function createSuccessPayload(resourceId) {
-  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+  return {
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.BODIED_SYNCED_BLOCK,
@@ -79,14 +78,6 @@ var createSuccessPayload = exports.createSuccessPayload = function createSuccess
     attributes: {
       resourceId: resourceId
     }
-  } : {
-    action: _analytics.ACTION.INSERTED,
-    actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
-    eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-    attributes: {
-      resourceId: resourceId
-    }
   };
 };
 var createSuccessPayloadNew = exports.createSuccessPayloadNew = function createSuccessPayloadNew(resourceId) {

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveSyncBlockInstance = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ari = require("../clients/confluence/ari");
 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; }
@@ -23,7 +22,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @returns A merged SyncBlockInstance object.
  */
 var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resolveSyncBlockInstance(oldResult, newResult) {
-  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3, _newResult$data4, _oldResult$data4;
+  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3;
   // if the old result has no data, we simply return the new result
   if (!oldResult.data) {
     return newResult;
@@ -42,30 +41,30 @@ var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resol
     data: _objectSpread(_objectSpread({}, newResult.data), {}, {
       sourceURL: ((_newResult$data = newResult.data) === null || _newResult$data === void 0 ? void 0 : _newResult$data.sourceURL) || ((_oldResult$data = oldResult.data) === null || _oldResult$data === void 0 ? void 0 : _oldResult$data.sourceURL) || undefined,
       sourceTitle: ((_newResult$data2 = newResult.data) === null || _newResult$data2 === void 0 ? void 0 : _newResult$data2.sourceTitle) || ((_oldResult$data2 = oldResult.data) === null || _oldResult$data2 === void 0 ? void 0 : _oldResult$data2.sourceTitle) || undefined,
-      sourceSubType: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? mergeSubType(oldResult, newResult) : ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.sourceSubType) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.sourceSubType) || undefined,
-      onSameDocument: ((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.onSameDocument) || ((_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.onSameDocument) || undefined
+      sourceSubType: mergeSubType(oldResult, newResult),
+      onSameDocument: ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.onSameDocument) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.onSameDocument) || undefined
     })
   });
 };
 var mergeSubType = function mergeSubType(oldResult, newResult) {
-  var _newResult$data5, _newResult$data6, _oldResult$data5;
+  var _newResult$data4, _newResult$data5, _oldResult$data4;
   // for classic pages, subType is 'null'
-  if (((_newResult$data5 = newResult.data) === null || _newResult$data5 === void 0 ? void 0 : _newResult$data5.sourceSubType) !== undefined) {
+  if (((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.sourceSubType) !== undefined) {
     return newResult.data.sourceSubType;
   }
-  if ((_newResult$data6 = newResult.data) !== null && _newResult$data6 !== void 0 && _newResult$data6.sourceAri) {
+  if ((_newResult$data5 = newResult.data) !== null && _newResult$data5 !== void 0 && _newResult$data5.sourceAri) {
     // for blogposts, subType is always undefined
     try {
-      var _newResult$data7;
+      var _newResult$data6;
       var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
-          ari: (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceAri
+          ari: (_newResult$data6 = newResult.data) === null || _newResult$data6 === void 0 ? void 0 : _newResult$data6.sourceAri
         }),
         pageType = _getPageIdAndTypeFrom.type;
       if (pageType === 'blogpost') {
-        var _newResult$data8;
-        return (_newResult$data8 = newResult.data) === null || _newResult$data8 === void 0 ? void 0 : _newResult$data8.sourceSubType;
+        var _newResult$data7;
+        return (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceSubType;
       }
     } catch (_unused) {}
   }
-  return (_oldResult$data5 = oldResult.data) === null || _oldResult$data5 === void 0 ? void 0 : _oldResult$data5.sourceSubType;
+  return (_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.sourceSubType;
 };

package/dist/cjs/utils/retry.js

@@ -7,26 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchWithRetry = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var MAX_RETRY_DELAY = 30000;
-var parseRetryAfterBase = function parseRetryAfterBase(retryAfter) {
-  var newDelay;
-
-  // retryAfter can either be in seconds or HTTP date
-  var parsedRetryAfter = parseInt(retryAfter);
-  if (!isNaN(parsedRetryAfter)) {
-    newDelay = parsedRetryAfter * 1000;
-  } else {
-    var retryDate = new Date(retryAfter);
-    var delayFromDate = retryDate.getTime() - Date.now();
-    if (delayFromDate > 0) {
-      newDelay = delayFromDate;
-    }
-  }
-  return newDelay;
-};
-var parseRetryAfterPatched = function parseRetryAfterPatched(retryAfter) {
+var parseRetryAfter = function parseRetryAfter(retryAfter) {
   // retryAfter can either be in seconds or HTTP date
   var parsedRetryAfter = parseInt(retryAfter, 10);
   if (!isNaN(parsedRetryAfter) && parsedRetryAfter > 0) {
@@ -42,9 +24,6 @@ var parseRetryAfterPatched = function parseRetryAfterPatched(retryAfter) {
   }
   return undefined;
 };
-var parseRetryAfter = (0, _platformFeatureFlagsReact.functionWithCondition)(function () {
-  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
-}, parseRetryAfterPatched, parseRetryAfterBase);
 var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, options) {
     var _ref2;
@@ -74,7 +53,7 @@ var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
         case 8:
           retryAfter = response.headers.get('Retry-After');
           parsedDelay = (_ref2 = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref2 !== void 0 ? _ref2 : delay;
-          retryDelay = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? Math.min(parsedDelay, MAX_RETRY_DELAY) : parsedDelay;
+          retryDelay = Math.min(parsedDelay, MAX_RETRY_DELAY);
           _context.next = 13;
           return new Promise(function (resolve) {
             return setTimeout(resolve, retryDelay);