@atlaskit/editor-synced-block-provider 3.28.0 → 3.29.0

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

@@ -9,7 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _errorHandling = require("../../utils/errorHandling");
 var _retry = require("../../utils/retry");
 var _ari = require("./ari");
@@ -128,7 +127,7 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
  */
 var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId) {
-    var _pageData$_links, _pageData$_links2, _pageData$_links3, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, webui, title, subType, status, url;
+    var _pageData$_links, _pageData$_links2, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, title, subType, url;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -155,15 +154,11 @@ var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
           pageData = _context3.sent;
           base = (_pageData$_links = pageData._links) === null || _pageData$_links === void 0 ? void 0 : _pageData$_links.base;
           edituiv2 = (_pageData$_links2 = pageData._links) === null || _pageData$_links2 === void 0 ? void 0 : _pageData$_links2.edituiv2;
-          webui = (_pageData$_links3 = pageData._links) === null || _pageData$_links3 === void 0 ? void 0 : _pageData$_links3.webui;
           title = pageData.title;
           subType = pageData.subtype;
-          status = pageData.status;
-          if (base && edituiv2 && ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
+          if (base && edituiv2) {
             url = "".concat(base).concat(edituiv2);
             url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
-          } else if (base && webui && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-            url = "".concat(base).concat(webui);
           }
           return _context3.abrupt("return", {
             title: title,
@@ -171,18 +166,18 @@ var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           });
-        case 20:
-          _context3.prev = 20;
+        case 18:
+          _context3.prev = 18;
           _context3.t0 = _context3["catch"](0);
           (0, _monitoring.logException)(_context3.t0, {
-            location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
+            location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
           });
           return _context3.abrupt("return", Promise.resolve(undefined));
-        case 24:
+        case 22:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 20]]);
+    }, _callee3, null, [[0, 18]]);
   }));
   return function fetchCompleteConfluencePageInfo(_x3, _x4) {
     return _ref3.apply(this, arguments);
@@ -247,38 +242,25 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          if (!(isUnpublished && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1'))) {
-            _context5.next = 5;
-            break;
-          }
-          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-            _context5.next = 5;
+          if (!isUnpublished) {
+            _context5.next = 4;
             break;
           }
-          _context5.next = 4;
+          _context5.next = 3;
           return fetchCompleteConfluencePageInfo(pageAri, localId);
-        case 4:
+        case 3:
           return _context5.abrupt("return", _context5.sent);
-        case 5:
+        case 4:
           if (!hasAccess) {
-            _context5.next = 22;
+            _context5.next = 17;
             break;
           }
           _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom3.type;
-          if (!(pageType === 'page' && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2'))) {
-            _context5.next = 11;
-            break;
-          }
-          _context5.next = 10;
-          return fetchCompleteConfluencePageInfo(pageAri, localId);
-        case 10:
-          return _context5.abrupt("return", _context5.sent);
-        case 11:
-          _context5.next = 13;
+          _context5.next = 8;
           return getConfluenceSourceInfo(pageAri);
-        case 13:
+        case 8:
           response = _context5.sent;
           contentData = (_response$data2 = response.data) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.content) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.nodes) === null || _response$data2 === void 0 ? void 0 : _response$data2[0];
           _ref7 = contentData || {}, title = _ref7.title, subType = _ref7.subType;
@@ -299,12 +281,12 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
             sourceAri: pageAri,
             subType: subType
           }));
-        case 22:
-          _context5.next = 24;
+        case 17:
+          _context5.next = 19;
           return resolveNoAccessPageInfo(pageAri);
-        case 24:
+        case 19:
           return _context5.abrupt("return", _context5.sent);
-        case 25:
+        case 20:
         case "end":
           return _context5.stop();
       }

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");
@@ -243,7 +242,6 @@ var _batchFetchData = exports.batchFetchData = /*#__PURE__*/function () {
           _context2.prev = 5;
           _context2.next = 8;
           return (0, _blockService.batchRetrieveSyncedBlocks)({
-            documentAri: parentAri,
             blockIdentifiers: blockIdentifiers
           });
         case 8:
@@ -437,8 +435,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               _context3.prev = 1;
               _context3.next = 4;
               return (0, _blockService.getSyncedBlockContent)({
-                blockAri: blockAri,
-                documentAri: this.parentAri
+                blockAri: blockAri
               });
             case 4:
               blockContentResponse = _context3.sent;
@@ -640,15 +637,13 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
       parentAri = _ref5.parentAri,
       parentId = _ref5.parentId,
       product = _ref5.product,
-      getVersion = _ref5.getVersion,
-      isParentUnpublished = _ref5.isParentUnpublished;
+      getVersion = _ref5.getVersion;
     (0, _classCallCheck2.default)(this, BlockServiceADFWriteProvider);
     this.cloudId = cloudId;
     this.parentAri = parentAri;
     this.parentId = parentId;
     this.product = product;
     this.getVersion = getVersion;
-    this.isParentUnpublished = isParentUnpublished;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -733,7 +728,6 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "createData",
     value: function () {
       var _createData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(data) {
-        var _this$isParentUnpubli;
         var resourceId, blockAri, stepVersion, status;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -767,7 +761,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               _context7.t0 = undefined;
             case 11:
               stepVersion = _context7.t0;
-              status = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? 'unpublished' : (_this$isParentUnpubli = this.isParentUnpublished) !== null && _this$isParentUnpubli !== void 0 && _this$isParentUnpubli.call(this) ? 'unpublished' : data.status || 'active';
+              status = 'unpublished';
               _context7.prev = 13;
               _context7.next = 16;
               return (0, _blockService.createSyncedBlock)({
@@ -964,8 +958,7 @@ var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(_re
     parentAri = _ref6.parentAri,
     parentId = _ref6.parentId,
     product = _ref6.product,
-    getVersion = _ref6.getVersion,
-    isParentUnpublished = _ref6.isParentUnpublished;
+    getVersion = _ref6.getVersion;
   return {
     fetchProvider: new BlockServiceADFFetchProvider({
       cloudId: cloudId,
@@ -976,8 +969,7 @@ var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(_re
       parentAri: parentAri,
       parentId: parentId,
       product: product,
-      getVersion: getVersion,
-      isParentUnpublished: isParentUnpublished
+      getVersion: getVersion
     })
   };
 };
@@ -986,18 +978,16 @@ var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProv
     parentAri = _ref7.parentAri,
     parentId = _ref7.parentId,
     product = _ref7.product,
-    getVersion = _ref7.getVersion,
-    isParentUnpublished = _ref7.isParentUnpublished;
+    getVersion = _ref7.getVersion;
   return (0, _react.useMemo)(function () {
     return createBlockServiceAPIProviders({
       cloudId: cloudId,
       parentAri: parentAri,
       parentId: parentId,
       product: product,
-      getVersion: getVersion,
-      isParentUnpublished: isParentUnpublished
+      getVersion: getVersion
     });
-  }, [cloudId, parentAri, parentId, product, getVersion, isParentUnpublished]);
+  }, [cloudId, parentAri, parentId, product, getVersion]);
 };
 var createBlockServiceFetchOnlyAPIProvider = function createBlockServiceFetchOnlyAPIProvider(_ref8) {
   var cloudId = _ref8.cloudId,

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

@@ -13,7 +13,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -72,12 +71,10 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         });
       });
     }));
-    this.syncBlockCache = new Map();
     this.subscriptions = new Map();
     this.titleSubscriptions = new Map();
     this.dataProvider = dataProvider;
     this.syncBlockFetchDataRequests = new Map();
-    this.syncBlockSourceInfoRequestsOld = new Map();
     this.syncBlockSourceInfoRequests = new Map();
     this.providerFactories = new Map();
     this.pendingCacheDeletions = new Map();
@@ -220,16 +217,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "getInitialSyncBlockData",
     value: function getInitialSyncBlockData(resourceId) {
-      var _this$dataProvider2;
+      var _this$dataProvider;
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
-      if ((0, _coreUtils.isSSR)() || (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-        var _this$dataProvider;
-        // In SSR, prefer data from data provider cache
-        // should not take from store manager cache as it may be in incomplete state
-        // will be unified to the same cache later.
-        return (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 || (_this$dataProvider = _this$dataProvider.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.data;
-      }
-      return this.getFromCache(resourceId) || ((_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);
+      return (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 || (_this$dataProvider = _this$dataProvider.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.data;
     }
 
     /**
@@ -334,13 +324,13 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "setupGraphQLSubscription",
     value: function setupGraphQLSubscription(resourceId) {
-      var _this$dataProvider3,
+      var _this$dataProvider2,
         _this4 = this;
       // Don't set up duplicate subscriptions
       if (this.graphqlSubscriptions.has(resourceId)) {
         return;
       }
-      if (!((_this$dataProvider3 = this.dataProvider) !== null && _this$dataProvider3 !== void 0 && _this$dataProvider3.subscribeToBlockUpdates)) {
+      if (!((_this$dataProvider2 = this.dataProvider) !== null && _this$dataProvider2 !== void 0 && _this$dataProvider2.subscribeToBlockUpdates)) {
         return;
       }
       var unsubscribe = this.dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
@@ -502,9 +492,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           return Promise.resolve(undefined);
         }
         (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 || _this$fetchSourceInfo.start({});
-
-        // Only use unpublished endpoint if feature flag is enabled
-        var isUnpublished = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') && ((_existingSyncBlock$da = existingSyncBlock.data) === null || _existingSyncBlock$da === void 0 ? void 0 : _existingSyncBlock$da.status) === 'unpublished';
+        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',
@@ -785,16 +773,11 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function updateCache(syncBlock) {
       var resourceId = syncBlock.resourceId;
       if (resourceId) {
-        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-          var _this$dataProvider4;
-          // Use the cache in dataProvider
-          (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || _this$dataProvider4.updateCache((0, _defineProperty2.default)({}, resourceId, syncBlock), {
-            strategy: 'merge',
-            source: 'network'
-          });
-        } else {
-          this.syncBlockCache.set(resourceId, syncBlock);
-        }
+        var _this$dataProvider3;
+        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache((0, _defineProperty2.default)({}, resourceId, syncBlock), {
+          strategy: 'merge',
+          source: 'network'
+        });
         var callbacks = this.subscriptions.get(resourceId);
         if (callbacks) {
           Object.values(callbacks).forEach(function (callback) {
@@ -816,25 +799,15 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "getFromCache",
     value: function getFromCache(resourceId) {
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-        var _this$dataProvider5;
-        // Use the cache in dataProvider
-        var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
-        return (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || (_this$dataProvider5 = _this$dataProvider5.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider5 === void 0 ? void 0 : _this$dataProvider5.data;
-      }
-      return this.syncBlockCache.get(resourceId);
+      var _this$dataProvider4;
+      var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
+      return (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || (_this$dataProvider4 = _this$dataProvider4.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider4 === void 0 ? void 0 : _this$dataProvider4.data;
     }
   }, {
     key: "deleteFromCache",
     value: function deleteFromCache(resourceId) {
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-        var _this$dataProvider6;
-        // For dataProvider cache, we update with empty/deleted state
-        // The cache is managed per-node basis via resetCache if needed
-        // For now, we don't explicitly delete from dataProvider cache
-        // as the cache is meant to persist for cache-first-then-network strategy
-        (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 || _this$dataProvider6.removeFromCache([resourceId]);
-      }
+      var _this$dataProvider5;
+      (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || _this$dataProvider5.removeFromCache([resourceId]);
       this.providerFactories.delete(resourceId);
     }
   }, {
@@ -856,9 +829,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "subscribeToSyncBlock",
     value: function subscribeToSyncBlock(resourceId, localId, callback) {
-      var _this$dataProvider7,
-        _this$dataProvider8,
-        _this$dataProvider9,
+      var _this$dataProvider6,
         _this0 = this;
       // Cancel any pending cache deletion for this resourceId.
       // This handles the case where a block is moved - the old component unmounts
@@ -885,23 +856,11 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       var syncBlockNode = (0, _utils.createSyncBlockNode)(localId, resourceId);
 
       // call the callback immediately if we have cached data
-      var cachedData = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? // When feature flag is enabled, use dataProvider cache only
-      (_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 : (0, _coreUtils.isSSR)() // in SSR, prefer data provider cache
-      ? ((_this$dataProvider8 = this.dataProvider) === null || _this$dataProvider8 === void 0 || (_this$dataProvider8 = _this$dataProvider8.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider8 === void 0 ? void 0 : _this$dataProvider8.data) || this.getFromCache(resourceId) : this.getFromCache(resourceId) || ((_this$dataProvider9 = this.dataProvider) === null || _this$dataProvider9 === void 0 || (_this$dataProvider9 = _this$dataProvider9.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider9 === void 0 ? void 0 : _this$dataProvider9.data);
+      var cachedData = (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 || (_this$dataProvider6 = _this$dataProvider6.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider6 === void 0 ? void 0 : _this$dataProvider6.data;
       if (cachedData) {
         callback(cachedData);
       } else {
-        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-          this.debouncedBatchedFetchSyncBlocks(resourceId);
-        } else {
-          this.fetchSyncBlocksData([syncBlockNode]).catch(function (error) {
-            var _this0$fireAnalyticsE;
-            (0, _monitoring.logException)(error, {
-              location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-            });
-            (_this0$fireAnalyticsE = _this0.fireAnalyticsEvent) === null || _this0$fireAnalyticsE === void 0 || _this0$fireAnalyticsE.call(_this0, (0, _errorHandling.fetchErrorPayload)(error.message, resourceId));
-          });
-        }
+        this.debouncedBatchedFetchSyncBlocks(resourceId);
       }
 
       // Set up GraphQL subscription if real-time subscriptions are enabled
@@ -1351,7 +1310,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
+      var _this$dataProvider7, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
       // Cancel any queued flush to prevent it from running after destroy
       if (this.queuedFlushTimeout) {
         clearTimeout(this.queuedFlushTimeout);
@@ -1360,20 +1319,13 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
 
       // Clean up all GraphQL subscriptions first
       this.cleanupAllGraphQLSubscriptions();
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-        var _this$dataProvider0;
-        // Reset cache in dataProvider
-        (_this$dataProvider0 = this.dataProvider) === null || _this$dataProvider0 === void 0 || _this$dataProvider0.resetCache();
-      } else {
-        this.syncBlockCache.clear();
-      }
+      (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 || _this$dataProvider7.resetCache();
       this.scheduledBatchFetch.cancel();
       this.pendingFetchRequests.clear();
       this.dataProvider = undefined;
       this.subscriptions.clear();
       this.titleSubscriptions.clear();
       this.syncBlockFetchDataRequests.clear();
-      this.syncBlockSourceInfoRequestsOld.clear();
       this.syncBlockSourceInfoRequests.clear();
       this.providerFactories.clear();
       this.isRefreshingSubscriptions = false;

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

@@ -11,7 +11,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 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 _experienceTracking = require("../utils/experienceTracking");
@@ -106,7 +105,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                 // - are waiting to be deleted to avoid nodes being re-created
                 // - haven't been updated since we last flushed
                 // - are still pending BE creation
-                if (!syncBlockData.pendingDeletion && syncBlockData.isDirty && !(_this2.isPendingCreation(syncBlockData.resourceId) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1'))) {
+                if (!syncBlockData.pendingDeletion && syncBlockData.isDirty && !_this2.isPendingCreation(syncBlockData.resourceId)) {
                   bodiedSyncBlockNodes.push({
                     type: 'bodiedSyncBlock',
                     attrs: {
@@ -120,10 +119,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                   // is still making changes, the new changes might not be saved if they all happen
                   // exactly at a time when the writeNodesData is being executed asynchronously.
                   syncBlockData.isDirty = false;
-                  // When flushing, set status to 'active' so the block is published (when feature gate is on)
-                  var dataToFlush = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? _objectSpread(_objectSpread({}, syncBlockData), {}, {
+                  // When flushing, set status to 'active' so the block is published
+                  var dataToFlush = _objectSpread(_objectSpread({}, syncBlockData), {}, {
                     status: 'active'
-                  }) : syncBlockData;
+                  });
                   bodiedSyncBlockData.push(dataToFlush);
                 }
               });
@@ -197,28 +196,13 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         return _flush.apply(this, arguments);
       }
       return flush;
-    }() // Remove this method and pendingResourceId when cleaning up platform_synced_block_patch_1
-    )
-  }, {
-    key: "registerPendingCreation",
-    value: function registerPendingCreation(resourceId) {
-      this.pendingResourceId = resourceId;
-    }
+    }())
   }, {
     key: "isPendingCreation",
     value: function isPendingCreation(resourceId) {
       return this.creationCompletionCallbacks.has(resourceId);
     }
 
-    /**
-     * Register callback function (which inserts node, handles focus etc) to be used later when creation to backend succeed
-     */
-  }, {
-    key: "registerCreationCallback",
-    value: function registerCreationCallback(callback) {
-      this.creationCallback = callback;
-    }
-
     /**
      *  Fires callback to insert node (if creation is successful) and clears pending creation data
      * @param success
@@ -226,47 +210,23 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "commitPendingCreation",
     value: function commitPendingCreation(success, resourceId) {
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-        var onCompletion = this.creationCompletionCallbacks.get(resourceId);
-        if (onCompletion) {
-          this.creationCompletionCallbacks.delete(resourceId);
-          onCompletion(success);
-        } else {
-          var _this$fireAnalyticsEv3;
-          (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, (0, _errorHandling.createErrorPayload)('creation complete callback missing', resourceId));
-        }
-        if (success) {
-          var _this$fireAnalyticsEv4;
-          (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, (0, _errorHandling.createSuccessPayload)(resourceId || ''));
-        } else {
-          var _this$fireAnalyticsEv5;
-          // Delete the node from cache if fail to create so it's not flushed to BE
-          this.syncBlockCache.delete(resourceId || '');
-          (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 || _this$fireAnalyticsEv5.call(this, (0, _errorHandling.createErrorPayload)('Fail to create bodied sync block', resourceId));
-        }
+      var onCompletion = this.creationCompletionCallbacks.get(resourceId);
+      if (onCompletion) {
+        this.creationCompletionCallbacks.delete(resourceId);
+        onCompletion(success);
       } else {
-        if (success && this.creationCallback) {
-          var _this$fireAnalyticsEv6;
-          this.creationCallback();
-          (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 || _this$fireAnalyticsEv6.call(this, (0, _errorHandling.createSuccessPayload)(this.pendingResourceId || ''));
-        } else if (success && !this.creationCallback) {
-          var _this$fireAnalyticsEv7;
-          (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 || _this$fireAnalyticsEv7.call(this, (0, _errorHandling.createErrorPayload)('creation callback missing', this.pendingResourceId));
-        }
-        this.pendingResourceId = undefined;
+        var _this$fireAnalyticsEv3;
+        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, (0, _errorHandling.createErrorPayload)('creation complete callback missing', resourceId));
+      }
+      if (success) {
+        var _this$fireAnalyticsEv4;
+        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, (0, _errorHandling.createSuccessPayload)(resourceId || ''));
+      } else {
+        var _this$fireAnalyticsEv5;
+        // Delete the node from cache if fail to create so it's not flushed to BE
+        this.syncBlockCache.delete(resourceId || '');
+        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 || _this$fireAnalyticsEv5.call(this, (0, _errorHandling.createErrorPayload)('Fail to create bodied sync block', resourceId));
       }
-      this.creationCallback = undefined;
-    }
-
-    /**
-     *
-     * @returns true if waiting for the result of saving new bodiedSyncBlock to backend
-     * Remove this method when cleaning up platform_synced_block_patch_1
-     */
-  }, {
-    key: "hasPendingCreation",
-    value: function hasPendingCreation() {
-      return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? this.creationCompletionCallbacks.size > 0 : !!this.pendingResourceId;
     }
   }, {
     key: "registerConfirmationCallback",
@@ -316,9 +276,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         if (!this.dataProvider) {
           throw new Error('Data provider not set');
         }
-        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-          this.creationCompletionCallbacks.set(resourceId, onCompletion);
-        }
+        this.creationCompletionCallbacks.set(resourceId, onCompletion);
         (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 || _this$createExperienc.start({});
         this.dataProvider.createNodeData({
           content: [],
@@ -326,18 +284,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           resourceId: resourceId
         }).then(function (result) {
           var resourceId = result.resourceId || '';
-          if (resourceId && (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') || !result.error)) {
+          if (resourceId && !result.error) {
             var _this4$createExperien;
             _this4.commitPendingCreation(true, resourceId);
             (_this4$createExperien = _this4.createExperience) === null || _this4$createExperien === void 0 || _this4$createExperien.success();
-
-            // Update the sync block data with the node data if it is provided
-            // to avoid any race conditions where the data could be missed during a render operation
-            if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-              if (nodeData) {
-                _this4.updateSyncBlockData(nodeData);
-              }
-            }
           } else {
             var _this4$createExperien2, _this4$fireAnalyticsE;
             _this4.commitPendingCreation(false, resourceId);
@@ -357,18 +307,15 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           });
           (_this4$fireAnalyticsE2 = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE2 === void 0 || _this4$fireAnalyticsE2.call(_this4, (0, _errorHandling.createErrorPayload)(error.message, resourceId));
         });
-        if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
-          this.registerPendingCreation(resourceId);
-        }
       } catch (error) {
-        var _this$fireAnalyticsEv8;
-        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? this.isPendingCreation(resourceId) : this.hasPendingCreation()) {
+        var _this$fireAnalyticsEv6;
+        if (this.isPendingCreation(resourceId)) {
           this.commitPendingCreation(false, resourceId);
         }
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, (0, _errorHandling.createErrorPayload)(error.message));
+        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 || _this$fireAnalyticsEv6.call(this, (0, _errorHandling.createErrorPayload)(error.message));
       }
     }
   }, {
@@ -579,11 +526,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           return sourceInfo;
         });
       } catch (error) {
-        var _this$fireAnalyticsEv9;
+        var _this$fireAnalyticsEv7;
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 || _this$fireAnalyticsEv9.call(this, (0, _errorHandling.getSourceInfoErrorPayload)(error.message));
+        (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 || _this$fireAnalyticsEv7.call(this, (0, _errorHandling.getSourceInfoErrorPayload)(error.message));
         return Promise.resolve(undefined);
       }
     }
@@ -596,11 +543,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         }
         return this.dataProvider.fetchReferences(resourceId, true);
       } catch (error) {
-        var _this$fireAnalyticsEv0;
+        var _this$fireAnalyticsEv8;
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 || _this$fireAnalyticsEv0.call(this, (0, _errorHandling.fetchReferencesErrorPayload)(error.message));
+        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, (0, _errorHandling.fetchReferencesErrorPayload)(error.message));
         return Promise.resolve({
           error: _types.SyncBlockError.Errored
         });
@@ -612,9 +559,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       var _this$saveExperience4, _this$createExperienc2, _this$deleteExperienc4, _this$fetchSourceInfo2;
       this.syncBlockCache.clear();
       this.confirmationCallback = undefined;
-      this.pendingResourceId = undefined;
       this.creationCompletionCallbacks.clear();
-      this.creationCallback = undefined;
       this.dataProvider = undefined;
       (_this$saveExperience4 = this.saveExperience) === null || _this$saveExperience4 === void 0 || _this$saveExperience4.abort({
         reason: 'editorDestroyed'

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

@@ -12,7 +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 _ari = require("../clients/block-service/ari");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
@@ -34,7 +33,7 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
     this.sourceSyncBlockStoreManager = new _sourceSyncBlockStoreManager.SourceSyncBlockStoreManager(dataProvider);
     this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider);
     this.dataProvider = dataProvider;
-    this.referenceSyncBlockStoreManager.setRealTimeSubscriptionsEnabled((0, _platformFeatureFlags.fg)('platform_synced_block_patch_1'));
+    this.referenceSyncBlockStoreManager.setRealTimeSubscriptionsEnabled(true);
   }
   return (0, _createClass2.default)(SyncBlockStoreManager, [{
     key: "fetchReferencesSourceInfo",