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

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

@@ -11,7 +11,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 /* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { generateBlockAri as _generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { batchRetrieveSyncedBlocks, BlockError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getReferenceSyncedBlocksByBlockAri, getSyncedBlockContent, updateReferenceSyncedBlockOnDocument, updateSyncedBlock, updateSyncedBlocks } from '../../clients/block-service/blockService';
 import { subscribeToBlockUpdates as subscribeToBlockUpdatesWS } from '../../clients/block-service/blockSubscription';
@@ -200,10 +199,11 @@ export var extractResourceIdFromBlockAri = function extractResourceIdFromBlockAr
  * @param cloudId - The cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
  * @param parentAri - The ARI of the parent of the block. E.G the ARI of the confluence page, or the ARI of the Jira work item
  * @param blockNodeIdentifiers - Array of block node identifiers to fetch
+ * @param config - Optional batch fetch configuration
  * @returns Array of SyncBlockInstance results
  */
 var _batchFetchData = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(cloudId, parentAri, blockNodeIdentifiers) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(cloudId, parentAri, blockNodeIdentifiers, config) {
     var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, content, deletionReason, sourceAri, blockAri, contentUpdatedAt, blockInstanceId, product, status, syncedBlockData, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -237,7 +237,8 @@ var _batchFetchData = /*#__PURE__*/function () {
           _context2.prev = 5;
           _context2.next = 8;
           return batchRetrieveSyncedBlocks({
-            blockIdentifiers: blockIdentifiers
+            blockIdentifiers: blockIdentifiers,
+            config: config
           });
         case 8:
           response = _context2.sent;
@@ -295,22 +296,13 @@ var _batchFetchData = /*#__PURE__*/function () {
               resourceId: resourceId
             });
           } catch (_unused3) {
-            if (fg('platform_synced_block_patch_3')) {
-              results.push({
-                error: {
-                  type: SyncBlockError.Errored,
-                  reason: "parsing JSON content response failed for resourceId: ".concat(resourceId, " localId: ").concat(blockAri)
-                },
-                resourceId: resourceId
-              });
-            } else {
-              results.push({
-                error: {
-                  type: SyncBlockError.Errored
-                },
-                resourceId: resourceId
-              });
-            }
+            results.push({
+              error: {
+                type: SyncBlockError.Errored,
+                reason: "parsing JSON content response failed for resourceId: ".concat(resourceId, " localId: ").concat(blockAri)
+              },
+              resourceId: resourceId
+            });
           }
         case 25:
           _context2.next = 14;
@@ -350,11 +342,9 @@ var _batchFetchData = /*#__PURE__*/function () {
         case 44:
           processedResourceIds.add(_resourceId);
           results.push({
-            error: fg('platform_synced_block_patch_3') ? {
+            error: {
               type: mapErrorResponseCode(errorResponse.code),
               reason: errorResponse.reason
-            } : {
-              type: mapErrorResponseCode(errorResponse.code)
             },
             resourceId: _resourceId
           });
@@ -400,7 +390,7 @@ var _batchFetchData = /*#__PURE__*/function () {
             return {
               error: {
                 type: _context2.t2 instanceof BlockError ? mapBlockError(_context2.t2) : SyncBlockError.Errored,
-                reason: fg('platform_synced_block_patch_3') ? _context2.t2.message : undefined
+                reason: _context2.t2.message
               },
               resourceId: blockNodeIdentifier.resourceId
             };
@@ -411,7 +401,7 @@ var _batchFetchData = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[5, 61], [12, 29, 32, 35], [37, 50, 53, 56]]);
   }));
-  return function batchFetchData(_x2, _x3, _x4) {
+  return function batchFetchData(_x2, _x3, _x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -576,7 +566,7 @@ export var writeDataBatch = /*#__PURE__*/function () {
       }
     }, _callee3, null, [[2, 31], [13, 22, 25, 28]]);
   }));
-  return function writeDataBatch(_x5, _x6, _x7, _x8, _x9, _x0) {
+  return function writeDataBatch(_x6, _x7, _x8, _x9, _x0, _x1) {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -651,21 +641,17 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context5.abrupt("return", {
-                error: 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: fg('platform_synced_block_patch_3') ? {
+                error: {
                   type: SyncBlockError.Errored,
                   reason: _context5.t0.message
-                } : {
-                  type: SyncBlockError.Errored
                 },
                 resourceId: resourceId
               });
@@ -675,7 +661,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
           }
         }, _callee4, this, [[1, 12]]);
       }));
-      function fetchData(_x1) {
+      function fetchData(_x10) {
         return _fetchData.apply(this, arguments);
       }
       return fetchData;
@@ -740,7 +726,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
           }
         }, _callee5, this, [[0, 11]]);
       }));
-      function fetchReferences(_x10) {
+      function fetchReferences(_x11) {
         return _fetchReferences.apply(this, arguments);
       }
       return fetchReferences;
@@ -748,17 +734,18 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     /**
      * Batch fetches multiple synced blocks by their resource IDs.
      * @param blockNodeIdentifiers - Array of block node identifiers to fetch
+     * @param config - Optional batch fetch configuration
      * @returns Array of SyncBlockInstance results
      */
   }, {
     key: "batchFetchData",
     value: (function () {
-      var _batchFetchData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(blockNodeIdentifiers) {
+      var _batchFetchData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(blockNodeIdentifiers, config) {
         return _regeneratorRuntime.wrap(function _callee6$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return _batchFetchData(this.cloudId, this.parentAri, blockNodeIdentifiers);
+              return _batchFetchData(this.cloudId, this.parentAri, blockNodeIdentifiers, config);
             case 2:
               return _context7.abrupt("return", _context7.sent);
             case 3:
@@ -767,7 +754,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function batchFetchData(_x11) {
+      function batchFetchData(_x12, _x13) {
         return _batchFetchData2.apply(this, arguments);
       }
       return batchFetchData;
@@ -899,7 +886,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[12, 19]]);
       }));
-      function writeData(_x12) {
+      function writeData(_x14) {
         return _writeData.apply(this, arguments);
       }
       return writeData;
@@ -979,7 +966,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee8, this, [[13, 19]]);
       }));
-      function createData(_x13) {
+      function createData(_x15) {
         return _createData.apply(this, arguments);
       }
       return createData;
@@ -1053,7 +1040,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee9, this, [[3, 9]]);
       }));
-      function deleteData(_x14, _x15) {
+      function deleteData(_x16, _x17) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;
@@ -1136,7 +1123,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee0, this, [[2, 8]]);
       }));
-      function updateReferenceData(_x16, _x17) {
+      function updateReferenceData(_x18, _x19) {
         return _updateReferenceData.apply(this, arguments);
       }
       return updateReferenceData;
@@ -1302,7 +1289,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee1, this, [[10, 39], [21, 30, 33, 36]]);
       }));
-      function writeDataBatch(_x18) {
+      function writeDataBatch(_x20) {
         return _writeDataBatch.apply(this, arguments);
       }
       return writeDataBatch;

package/dist/esm/providers/syncBlockProvider.js

@@ -12,8 +12,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { useMemo, useRef } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
@@ -112,11 +110,9 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                   return data;
                 }, function (error) {
                   return {
-                    error: fg('platform_synced_block_patch_3') ? {
+                    error: {
                       type: SyncBlockError.Errored,
                       reason: error
-                    } : {
-                      type: SyncBlockError.Errored
                     },
                     resourceId: blockIdentifier.resourceId
                   };
@@ -164,7 +160,7 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
               }
               return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
             case 2:
-              if (!(this.writeProvider.writeDataBatch && fg('platform_synced_block_patch_4'))) {
+              if (!this.writeProvider.writeDataBatch) {
                 _context2.next = 12;
                 break;
               }
@@ -309,11 +305,9 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }, {
     key: "fetchSyncBlockSourceInfo",
     value: (function () {
-      var _fetchSyncBlockSourceInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(localId, sourceAri, sourceProduct, fireAnalyticsEvent) {
+      var _fetchSyncBlockSourceInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(localId, sourceAri, sourceProduct) {
         var _this$writeProvider, _this$writeProvider3;
         var hasAccess,
-          urlType,
-          isUnpublished,
           ari,
           product,
           _this$writeProvider2,
@@ -323,59 +317,57 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
         return _regeneratorRuntime.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 : 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 fetchConfluencePageInfo(ari, hasAccess, localId);
             case 10:
-              _context4.next = 12;
-              return 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 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;
@@ -477,7 +469,7 @@ var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
     writeProvider = _ref.writeProvider;
   return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
-var useMemoizedSyncedBlockProviderBase = function useMemoizedSyncedBlockProviderBase(_ref2) {
+export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
   var fetchProvider = _ref2.fetchProvider,
     writeProvider = _ref2.writeProvider,
     providerOptions = _ref2.providerOptions,
@@ -488,24 +480,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 = useMemo(function () {
-    return createSyncedBlockProvider({
-      fetchProvider: fetchProvider,
-      writeProvider: writeProvider
-    });
-  }, [fetchProvider, writeProvider]);
   var prevProviderOptionsRef = useRef(undefined);
   if (providerOptions !== prevProviderOptionsRef.current) {
     prevProviderOptionsRef.current = providerOptions;
@@ -520,7 +494,4 @@ var useMemoizedSyncedBlockProviderPatched = function useMemoizedSyncedBlockProvi
     }
   }
   return syncBlockProvider;
-};
-export var useMemoizedSyncedBlockProvider = conditionalHooksFactory(function () {
-  return fg('platform_synced_block_patch_4');
-}, useMemoizedSyncedBlockProviderPatched, useMemoizedSyncedBlockProviderBase);
+};

package/dist/esm/providers/types.js

@@ -13,6 +13,10 @@ import { NodeDataProvider } from '@atlaskit/node-data-provider';
  * This will be used in both data processing and rendering contexts.
  */
 
+/**
+ * Configuration options for batch fetch operations
+ */
+
 export var SyncBlockDataProviderInterface = /*#__PURE__*/function (_NodeDataProvider) {
   function SyncBlockDataProviderInterface() {
     _classCallCheck(this, SyncBlockDataProviderInterface);

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

@@ -458,10 +458,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function handleGraphQLSubscriptionUpdate(syncBlockInstance) {
       var _this5 = this;
       if (!syncBlockInstance.resourceId) {
-        if (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 ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
@@ -475,8 +472,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         });
         this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       } else {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _syncBlockInstance$er3, _this$fireAnalyticsEv3;
-        var errorMessage = 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, fetchErrorPayload(errorMessage, syncBlockInstance.resourceId));
       }
     }
@@ -551,12 +548,11 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     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;
@@ -572,7 +568,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     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');
         }
@@ -609,12 +605,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           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({
@@ -828,8 +820,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       data.forEach(function (syncBlockInstance) {
         var _resolvedSyncBlockIns;
         if (!syncBlockInstance.resourceId) {
-          var _syncBlockInstance$er4, _syncBlockInstance$er5, _syncBlockInstance$er6, _this9$fireAnalyticsE;
-          var payload = 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, fetchErrorPayload(payload));
           return;
         }
@@ -848,13 +840,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           _this9.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
         }
         if (syncBlockInstance.error) {
-          if (fg('platform_synced_block_patch_3')) {
-            var _this9$fireAnalyticsE2;
-            (_this9$fireAnalyticsE2 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE2 === void 0 || _this9$fireAnalyticsE2.call(_this9, 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, fetchErrorPayload(syncBlockInstance.error.type, syncBlockInstance.resourceId));
-          }
+          var _this9$fireAnalyticsE2;
+          (_this9$fireAnalyticsE2 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE2 === void 0 || _this9$fireAnalyticsE2.call(_this9, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
           if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
             hasExpectedError = true;
           } else if (syncBlockInstance.error) {
@@ -865,8 +852,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         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, 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, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
         });
         _this9.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       });
@@ -906,9 +893,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
             callback(syncBlock);
           });
         }
-        if (fg('platform_synced_block_patch_3')) {
-          this.updateSessionCache(resourceId);
-        }
+        this.updateSessionCache(resourceId);
       }
     }
   }, {

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

@@ -522,7 +522,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           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/esm/store-manager/syncBlockStoreManager.js

@@ -7,8 +7,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import { useMemo, useRef } from 'react';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { SyncBlockError } from '../common/types';
 import { fetchReferencesErrorPayload } from '../utils/errorHandling';
@@ -91,7 +89,7 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
                       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, 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, getProductFromSourceAri(reference.documentAri), reference.hasAccess);
                       case 3:
                         sourceInfo = _context.sent;
                         if (sourceInfo) {
@@ -196,14 +194,7 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
 var createSyncBlockStoreManager = function createSyncBlockStoreManager(dataProvider) {
   return new SyncBlockStoreManager(dataProvider);
 };
-var useMemoizedSyncBlockStoreManagerBase = function useMemoizedSyncBlockStoreManagerBase(dataProvider, fireAnalyticsEvent) {
-  var syncBlockStoreManager = useMemo(function () {
-    return createSyncBlockStoreManager(dataProvider);
-  }, [dataProvider]);
-  syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
-  return syncBlockStoreManager;
-};
-var useMemoizedSyncBlockStoreManagerPatched = function useMemoizedSyncBlockStoreManagerPatched(dataProvider, fireAnalyticsEvent) {
+export var useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
   var syncBlockStoreManager = useMemo(function () {
     return createSyncBlockStoreManager(dataProvider);
   }, [dataProvider]);
@@ -213,7 +204,4 @@ var useMemoizedSyncBlockStoreManagerPatched = function useMemoizedSyncBlockStore
     syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
   }
   return syncBlockStoreManager;
-};
-export var useMemoizedSyncBlockStoreManager = conditionalHooksFactory(function () {
-  return fg('platform_synced_block_patch_4');
-}, useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);
+};

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

@@ -182,8 +182,8 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _syncBlockInstance$er3, _this$deps$getFireAna;
-        var errorMessage = 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(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId));
       }
     }

package/dist/esm/utils/errorHandling.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { fg } from '@atlaskit/platform-feature-flags';
 export var stringifyError = function stringifyError(error) {
   try {
     return JSON.stringify(error);
@@ -64,7 +63,7 @@ export var fetchSuccessPayload = function fetchSuccessPayload(resourceId, blockI
   };
 };
 export var createSuccessPayload = function createSuccessPayload(resourceId) {
-  return fg('platform_synced_block_patch_3') ? {
+  return {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.BODIED_SYNCED_BLOCK,
@@ -72,14 +71,6 @@ export var createSuccessPayload = function createSuccessPayload(resourceId) {
     attributes: {
       resourceId: resourceId
     }
-  } : {
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-    actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
-    eventType: EVENT_TYPE.OPERATIONAL,
-    attributes: {
-      resourceId: resourceId
-    }
   };
 };
 export var createSuccessPayloadNew = function createSuccessPayloadNew(resourceId) {