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

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

@@ -326,10 +326,7 @@ export class ReferenceSyncBlockStoreManager {
    */
   handleGraphQLSubscriptionUpdate(syncBlockInstance) {
     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;
     }
     const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
     const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
@@ -343,8 +340,8 @@ export class ReferenceSyncBlockStoreManager {
       });
       this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     } else {
-      var _syncBlockInstance$er, _syncBlockInstance$er2, _syncBlockInstance$er3, _this$fireAnalyticsEv6;
-      const 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$fireAnalyticsEv6;
+      const 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$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, fetchErrorPayload(errorMessage, syncBlockInstance.resourceId));
     }
   }
@@ -391,12 +388,12 @@ export class ReferenceSyncBlockStoreManager {
     }
     this.graphqlSubscriptions.clear();
   }
-  fetchSyncBlockSourceInfoBySourceAri(sourceAri, hasAccess = true, urlType = 'view') {
+  fetchSyncBlockSourceInfoBySourceAri(sourceAri, hasAccess = true) {
     try {
       if (!this.dataProvider) {
         throw new Error('Data provider not set');
       }
-      const sourceInfo = this.dataProvider.fetchSyncBlockSourceInfo(undefined, sourceAri, undefined, undefined, hasAccess, urlType);
+      const sourceInfo = this.dataProvider.fetchSyncBlockSourceInfo(undefined, sourceAri, undefined, hasAccess);
       return sourceInfo;
     } catch (error) {
       var _this$fireAnalyticsEv7;
@@ -409,7 +406,7 @@ export class ReferenceSyncBlockStoreManager {
   }
   fetchSyncBlockSourceInfo(resourceId) {
     try {
-      var _this$fetchSourceInfo, _existingSyncBlock$da;
+      var _this$fetchSourceInfo;
       if (!resourceId || !this.dataProvider) {
         throw new Error('Data provider or resourceId not set');
       }
@@ -447,12 +444,8 @@ export class ReferenceSyncBlockStoreManager {
         return Promise.resolve(undefined);
       }
       (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 ? void 0 : _this$fetchSourceInfo.start({});
-      const isUnpublished = ((_existingSyncBlock$da = existingSyncBlock.data) === null || _existingSyncBlock$da === void 0 ? void 0 : _existingSyncBlock$da.status) === 'unpublished';
-      const sourceInfoPromise = this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, this.fireAnalyticsEvent, true,
-      // hasAccess
-      'edit',
-      // urlType
-      isUnpublished).then(sourceInfo => {
+      const sourceInfoPromise = this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, true // hasAccess
+      ).then(sourceInfo => {
         if (!sourceInfo) {
           var _this$fetchSourceInfo2, _this$fireAnalyticsEv9;
           (_this$fetchSourceInfo2 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo2 === void 0 ? void 0 : _this$fetchSourceInfo2.failure({
@@ -619,8 +612,8 @@ export class ReferenceSyncBlockStoreManager {
     data.forEach(syncBlockInstance => {
       var _resolvedSyncBlockIns;
       if (!syncBlockInstance.resourceId) {
-        var _syncBlockInstance$er4, _syncBlockInstance$er5, _syncBlockInstance$er6, _this$fireAnalyticsEv11;
-        const 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, _this$fireAnalyticsEv11;
+        const 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';
         (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, fetchErrorPayload(payload));
         return;
       }
@@ -639,13 +632,8 @@ export class ReferenceSyncBlockStoreManager {
         this.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
       }
       if (syncBlockInstance.error) {
-        if (fg('platform_synced_block_patch_3')) {
-          var _this$fireAnalyticsEv12;
-          (_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
-        } else {
-          var _this$fireAnalyticsEv13;
-          (_this$fireAnalyticsEv13 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv13 === void 0 ? void 0 : _this$fireAnalyticsEv13.call(this, fetchErrorPayload(syncBlockInstance.error.type, syncBlockInstance.resourceId));
-        }
+        var _this$fireAnalyticsEv12;
+        (_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, 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) {
@@ -656,8 +644,8 @@ export class ReferenceSyncBlockStoreManager {
       const callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
-        var _this$fireAnalyticsEv14, _syncBlockInstance$da2;
-        (_this$fireAnalyticsEv14 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv14 === void 0 ? void 0 : _this$fireAnalyticsEv14.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
+        var _this$fireAnalyticsEv13, _syncBlockInstance$da2;
+        (_this$fireAnalyticsEv13 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv13 === void 0 ? void 0 : _this$fireAnalyticsEv13.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
       });
       this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });
@@ -698,9 +686,7 @@ export class ReferenceSyncBlockStoreManager {
           callback(syncBlock);
         });
       }
-      if (fg('platform_synced_block_patch_3')) {
-        this.updateSessionCache(resourceId);
-      }
+      this.updateSessionCache(resourceId);
     }
   }
   updateSourceTitleSubscriptions(resourceId, title) {
@@ -871,11 +857,11 @@ export class ReferenceSyncBlockStoreManager {
       }
       return this.subscribeToSyncBlock(resourceId, localId, callback);
     } catch (error) {
-      var _this$fireAnalyticsEv15;
+      var _this$fireAnalyticsEv14;
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv15 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv15 === void 0 ? void 0 : _this$fireAnalyticsEv15.call(this, fetchErrorPayload(error.message));
+      (_this$fireAnalyticsEv14 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv14 === void 0 ? void 0 : _this$fireAnalyticsEv14.call(this, fetchErrorPayload(error.message));
       return () => {};
     }
   }
@@ -898,12 +884,12 @@ export class ReferenceSyncBlockStoreManager {
       return this._providerFactoryManager.getProviderFactory(resourceId);
     }
     if (!this.dataProvider) {
-      var _this$fireAnalyticsEv16;
+      var _this$fireAnalyticsEv15;
       const error = new Error('Data provider not set');
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv16 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv16 === void 0 ? void 0 : _this$fireAnalyticsEv16.call(this, fetchErrorPayload(error.message));
+      (_this$fireAnalyticsEv15 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv15 === void 0 ? void 0 : _this$fireAnalyticsEv15.call(this, fetchErrorPayload(error.message));
       return undefined;
     }
     const {
@@ -933,11 +919,11 @@ export class ReferenceSyncBlockStoreManager {
       try {
         this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
       } catch (error) {
-        var _this$fireAnalyticsEv17;
+        var _this$fireAnalyticsEv16;
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv17 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv17 === void 0 ? void 0 : _this$fireAnalyticsEv17.call(this, fetchErrorPayload(error.message, resourceId));
+        (_this$fireAnalyticsEv16 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv16 === void 0 ? void 0 : _this$fireAnalyticsEv16.call(this, fetchErrorPayload(error.message, resourceId));
       }
     }
     return providerFactory;
@@ -996,8 +982,8 @@ export class ReferenceSyncBlockStoreManager {
       return;
     }
     if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
-      var _this$fireAnalyticsEv18;
-      (_this$fireAnalyticsEv18 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv18 === void 0 ? void 0 : _this$fireAnalyticsEv18.call(this, fetchErrorPayload('Sync block source ari or product not found'));
+      var _this$fireAnalyticsEv17;
+      (_this$fireAnalyticsEv17 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv17 === void 0 ? void 0 : _this$fireAnalyticsEv17.call(this, fetchErrorPayload('Sync block source ari or product not found'));
       return;
     }
     const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo((_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceAri, (_syncBlock$data3 = syncBlock.data) === null || _syncBlock$data3 === void 0 ? void 0 : _syncBlock$data3.product);
@@ -1102,15 +1088,15 @@ export class ReferenceSyncBlockStoreManager {
       (_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 ? void 0 : _this$saveExperience.start();
       const updateResult = await this.dataProvider.updateReferenceData(blocks);
       if (!updateResult.success) {
-        var _this$saveExperience2, _this$fireAnalyticsEv19;
+        var _this$saveExperience2, _this$fireAnalyticsEv18;
         success = false;
         (_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 ? void 0 : _this$saveExperience2.failure({
           reason: updateResult.error || 'Failed to update reference synced blocks on the document'
         });
-        (_this$fireAnalyticsEv19 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv19 === void 0 ? void 0 : _this$fireAnalyticsEv19.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
+        (_this$fireAnalyticsEv18 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv18 === void 0 ? void 0 : _this$fireAnalyticsEv18.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
       }
     } catch (error) {
-      var _this$saveExperience3, _this$fireAnalyticsEv20;
+      var _this$saveExperience3, _this$fireAnalyticsEv19;
       success = false;
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
@@ -1118,7 +1104,7 @@ export class ReferenceSyncBlockStoreManager {
       (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 ? void 0 : _this$saveExperience3.failure({
         reason: error.message
       });
-      (_this$fireAnalyticsEv20 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv20 === void 0 ? void 0 : _this$fireAnalyticsEv20.call(this, updateReferenceErrorPayload(error.message));
+      (_this$fireAnalyticsEv19 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv19 === void 0 ? void 0 : _this$fireAnalyticsEv19.call(this, updateReferenceErrorPayload(error.message));
     } finally {
       if (!success) {
         // set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE

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

@@ -382,7 +382,7 @@ export class SourceSyncBlockStoreManager {
         throw new Error('Data provider not set');
       }
       (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 ? void 0 : _this$fetchSourceInfo.start();
-      return this.dataProvider.fetchSyncBlockSourceInfo(localId, undefined, undefined, this.fireAnalyticsEvent).then(sourceInfo => {
+      return this.dataProvider.fetchSyncBlockSourceInfo(localId, undefined, undefined).then(sourceInfo => {
         if (!sourceInfo) {
           var _this$fetchSourceInfo2;
           (_this$fetchSourceInfo2 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo2 === void 0 ? void 0 : _this$fetchSourceInfo2.failure({

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

@@ -1,7 +1,5 @@
 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';
@@ -61,7 +59,7 @@ export class SyncBlockStoreManager {
       const sourceInfoPromises = response.references.map(async reference => {
         var _this$fetchSourceInfo, _this$dataProvider, _this$fetchSourceInfo3;
         (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 ? void 0 : _this$fetchSourceInfo.start();
-        const sourceInfo = await ((_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'));
+        const sourceInfo = await ((_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.fetchSyncBlockSourceInfo(reference.blockInstanceId || '', reference.documentAri, getProductFromSourceAri(reference.documentAri), reference.hasAccess));
         if (!sourceInfo) {
           var _this$fetchSourceInfo2;
           (_this$fetchSourceInfo2 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo2 === void 0 ? void 0 : _this$fetchSourceInfo2.failure({
@@ -130,14 +128,7 @@ export class SyncBlockStoreManager {
 const createSyncBlockStoreManager = dataProvider => {
   return new SyncBlockStoreManager(dataProvider);
 };
-const useMemoizedSyncBlockStoreManagerBase = (dataProvider, fireAnalyticsEvent) => {
-  const syncBlockStoreManager = useMemo(() => {
-    return createSyncBlockStoreManager(dataProvider);
-  }, [dataProvider]);
-  syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
-  return syncBlockStoreManager;
-};
-const useMemoizedSyncBlockStoreManagerPatched = (dataProvider, fireAnalyticsEvent) => {
+export const useMemoizedSyncBlockStoreManager = (dataProvider, fireAnalyticsEvent) => {
   const syncBlockStoreManager = useMemo(() => {
     return createSyncBlockStoreManager(dataProvider);
   }, [dataProvider]);
@@ -147,5 +138,4 @@ const useMemoizedSyncBlockStoreManagerPatched = (dataProvider, fireAnalyticsEven
     syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
   }
   return syncBlockStoreManager;
-};
-export const useMemoizedSyncBlockStoreManager = conditionalHooksFactory(() => fg('platform_synced_block_patch_4'), useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);
+};

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

@@ -128,8 +128,8 @@ export class SyncBlockSubscriptionManager {
       });
       this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
     } else {
-      var _syncBlockInstance$er, _syncBlockInstance$er2, _syncBlockInstance$er3, _this$deps$getFireAna4;
-      const 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$getFireAna4;
+      const 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$getFireAna4 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna4 === void 0 ? void 0 : _this$deps$getFireAna4(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId));
     }
   }

package/dist/es2019/utils/errorHandling.js

@@ -1,5 +1,4 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const stringifyError = error => {
   try {
     return JSON.stringify(error);
@@ -43,7 +42,7 @@ export const fetchSuccessPayload = (resourceId, blockInstanceId, sourceProduct)
   }
 });
 export const createSuccessPayload = resourceId => {
-  return fg('platform_synced_block_patch_3') ? {
+  return {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.BODIED_SYNCED_BLOCK,
@@ -51,14 +50,6 @@ export const createSuccessPayload = resourceId => {
     attributes: {
       resourceId
     }
-  } : {
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-    actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
-    eventType: EVENT_TYPE.OPERATIONAL,
-    attributes: {
-      resourceId
-    }
   };
 };
 export const createSuccessPayloadNew = resourceId => ({

package/dist/es2019/utils/resolveSyncBlockInstance.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { SyncBlockError } from '../common/types';
 /**
@@ -13,7 +12,7 @@ import { SyncBlockError } from '../common/types';
  * @returns A merged SyncBlockInstance object.
  */
 export const 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;
@@ -34,31 +33,31 @@ export const resolveSyncBlockInstance = (oldResult, newResult) => {
       ...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: 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
     }
   };
 };
 const 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;
       const {
         type: pageType
       } = 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
       });
       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 {}
   }
-  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/es2019/utils/retry.js

@@ -1,23 +1,5 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { functionWithCondition } from '@atlaskit/platform-feature-flags-react';
 const MAX_RETRY_DELAY = 30000;
-const parseRetryAfterBase = retryAfter => {
-  let newDelay;
-
-  // retryAfter can either be in seconds or HTTP date
-  const parsedRetryAfter = parseInt(retryAfter);
-  if (!isNaN(parsedRetryAfter)) {
-    newDelay = parsedRetryAfter * 1000;
-  } else {
-    const retryDate = new Date(retryAfter);
-    const delayFromDate = retryDate.getTime() - Date.now();
-    if (delayFromDate > 0) {
-      newDelay = delayFromDate;
-    }
-  }
-  return newDelay;
-};
-const parseRetryAfterPatched = retryAfter => {
+const parseRetryAfter = retryAfter => {
   // retryAfter can either be in seconds or HTTP date
   const parsedRetryAfter = parseInt(retryAfter, 10);
   if (!isNaN(parsedRetryAfter) && parsedRetryAfter > 0) {
@@ -33,7 +15,6 @@ const parseRetryAfterPatched = retryAfter => {
   }
   return undefined;
 };
-const parseRetryAfter = functionWithCondition(() => fg('platform_synced_block_patch_4'), parseRetryAfterPatched, parseRetryAfterBase);
 export const fetchWithRetry = async (url, options, retriesRemaining = 3, delay = 1000) => {
   var _ref;
   const response = await fetch(url, options);
@@ -43,7 +24,7 @@ export const fetchWithRetry = async (url, options, retriesRemaining = 3, delay =
   }
   const retryAfter = response.headers.get('Retry-After');
   const parsedDelay = (_ref = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref !== void 0 ? _ref : delay;
-  const retryDelay = fg('platform_synced_block_patch_4') ? Math.min(parsedDelay, MAX_RETRY_DELAY) : parsedDelay;
+  const retryDelay = Math.min(parsedDelay, MAX_RETRY_DELAY);
   await new Promise(resolve => setTimeout(resolve, retryDelay));
   return fetchWithRetry(url, options, retriesRemaining - 1, delay * 2);
 };

package/dist/esm/clients/block-service/blockService.js

@@ -8,7 +8,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 export var isBlockContentResponse = function isBlockContentResponse(response) {
   var content = response.content;
@@ -65,7 +64,7 @@ export var getReferenceSyncedBlocks = /*#__PURE__*/function () {
             query: buildGetDocumentReferenceBlocksQuery(documentAri),
             operationName: GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetDocumentReferenceBlocks") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetDocumentReferenceBlocks");
           _context.next = 4;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -124,7 +123,7 @@ var GET_BLOCK_REFERENCES_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_REFERENCES';
 var GET_BLOCK_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_BLOCK';
 var BATCH_UPDATE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_BATCH_UPDATE_BLOCKS';
 var buildGetDocumentReferenceBlocksQuery = function buildGetDocumentReferenceBlocksQuery(documentAri) {
-  return "query ".concat(GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME, " {\n\tblockService_getDocumentReferenceBlocks(documentAri: ").concat(fg('platform_synced_block_patch_4') ? JSON.stringify(documentAri) : "\"".concat(documentAri, "\""), ") {\n\t\tblocks {\n\t\t\tblockAri\n\t\t\tblockInstanceId\n\t\t\tcontent\n\t\t\tcontentUpdatedAt\n\t\t\tcreatedAt\n\t\t\tcreatedBy\n\t\t\tproduct\n\t\t\tsourceAri\n\t\t\tstatus\n\t\t\tversion\n\t\t}\n\t\terrors {\n\t\t\tblockAri\n\t\t\tcode\n\t\t\treason\n\t\t}\n\t}\n}");
+  return "query ".concat(GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME, " {\n\tblockService_getDocumentReferenceBlocks(documentAri: ").concat(JSON.stringify(documentAri), ") {\n\t\tblocks {\n\t\t\tblockAri\n\t\t\tblockInstanceId\n\t\t\tcontent\n\t\t\tcontentUpdatedAt\n\t\t\tcreatedAt\n\t\t\tcreatedBy\n\t\t\tproduct\n\t\t\tsourceAri\n\t\t\tstatus\n\t\t\tversion\n\t\t}\n\t\terrors {\n\t\t\tblockAri\n\t\t\tcode\n\t\t\treason\n\t\t}\n\t}\n}");
 };
 var buildGetBlockQuery = function buildGetBlockQuery(blockAri) {
   return "query ".concat(GET_BLOCK_OPERATION_NAME, " {\n\tblockService_getBlock(blockAri: ").concat(JSON.stringify(blockAri), ") {\n\t\tblockAri\n\t\tblockInstanceId\n\t\tcontent\n\t\tcontentUpdatedAt\n\t\tcreatedAt\n\t\tcreatedBy\n\t\tdeletionReason\n\t\tproduct\n\t\tsourceAri\n\t\tstatus\n\t\tversion\n\t}\n}");
@@ -231,7 +230,7 @@ export var getSyncedBlockContent = /*#__PURE__*/function () {
             query: buildGetBlockQuery(blockAri),
             operationName: GET_BLOCK_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetBlock") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetBlock");
           _context2.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -299,7 +298,7 @@ export var batchRetrieveSyncedBlocks = /*#__PURE__*/function () {
             query: buildBatchRetrieveBlocksQuery(blockAris),
             operationName: BATCH_RETRIEVE_BLOCKS_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockBatchRetrieveBlocks") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockBatchRetrieveBlocks");
           _context3.next = 6;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -349,7 +348,7 @@ export var batchRetrieveSyncedBlocks = /*#__PURE__*/function () {
 }();
 export var deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref6) {
-    var _result$data3, _result$data4;
+    var _result$data3;
     var blockAri, deleteReason, bodyData, url, response, result, isDeleted;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
@@ -359,7 +358,7 @@ export var deleteSyncedBlock = /*#__PURE__*/function () {
             query: buildDeleteBlockMutation(blockAri, deleteReason),
             operationName: DELETE_BLOCK_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockDeleteBlock") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockDeleteBlock");
           _context4.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -386,7 +385,7 @@ export var deleteSyncedBlock = /*#__PURE__*/function () {
             return e.message;
           }).join(', '));
         case 13:
-          isDeleted = fg('platform_synced_block_patch_4') ? (_result$data3 = result.data) === null || _result$data3 === void 0 || (_result$data3 = _result$data3.blockService_deleteBlock) === null || _result$data3 === void 0 ? void 0 : _result$data3.deleted : (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.blockService_deleteBlock.deleted;
+          isDeleted = (_result$data3 = result.data) === null || _result$data3 === void 0 || (_result$data3 = _result$data3.blockService_deleteBlock) === null || _result$data3 === void 0 ? void 0 : _result$data3.deleted;
           if (isDeleted) {
             _context4.next = 16;
             break;
@@ -413,7 +412,7 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
             query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
             operationName: UPDATE_BLOCK_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockUpdateBlock") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockUpdateBlock");
           _context5.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -451,7 +450,7 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
 }();
 export var createSyncedBlock = /*#__PURE__*/function () {
   var _ref1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref0) {
-    var _result$data5;
+    var _result$data4;
     var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, bodyData, url, response, result;
     return _regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
@@ -461,7 +460,7 @@ export var createSyncedBlock = /*#__PURE__*/function () {
             query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
             operationName: CREATE_BLOCK_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockCreateBlock") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockCreateBlock");
           _context6.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -488,7 +487,7 @@ export var createSyncedBlock = /*#__PURE__*/function () {
             return e.message;
           }).join(', '));
         case 13:
-          if ((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_createBlock) {
+          if ((_result$data4 = result.data) !== null && _result$data4 !== void 0 && _result$data4.blockService_createBlock) {
             _context6.next = 15;
             break;
           }
@@ -507,7 +506,7 @@ export var createSyncedBlock = /*#__PURE__*/function () {
 }();
 export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
   var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref10) {
-    var documentAri, blocks, _ref10$noContent, noContent, bodyData, url, response, result, _result$data6;
+    var documentAri, blocks, _ref10$noContent, noContent, bodyData, url, response, result, _result$data5;
     return _regeneratorRuntime.wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -516,7 +515,7 @@ export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
             query: buildUpdateDocumentReferencesMutation(documentAri, blocks, noContent),
             operationName: UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockUpdateDocumentReferences") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockUpdateDocumentReferences");
           _context7.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -548,7 +547,7 @@ export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
             _context7.next = 17;
             break;
           }
-          if ((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_updateDocumentReferences) {
+          if ((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_updateDocumentReferences) {
             _context7.next = 16;
             break;
           }
@@ -567,7 +566,7 @@ export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
 }();
 export var getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
   var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref12) {
-    var _result$data7;
+    var _result$data6;
     var blockAri, bodyData, url, response, result, graphqlResponse;
     return _regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
@@ -577,7 +576,7 @@ export var getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
             query: buildGetBlockReferencesQuery(blockAri),
             operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetReferences") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetReferences");
           _context8.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -604,7 +603,7 @@ export var getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
             return e.message;
           }).join(', '));
         case 13:
-          if ((_result$data7 = result.data) !== null && _result$data7 !== void 0 && _result$data7.blockService_getReferences) {
+          if ((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_getReferences) {
             _context8.next = 15;
             break;
           }
@@ -651,7 +650,7 @@ export var getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
  */
 export var updateSyncedBlocks = /*#__PURE__*/function () {
   var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref14) {
-    var _result$data8;
+    var _result$data7;
     var blocks, bodyData, url, response, result, graphqlResponse;
     return _regeneratorRuntime.wrap(function _callee9$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
@@ -661,7 +660,7 @@ export var updateSyncedBlocks = /*#__PURE__*/function () {
             query: buildBatchUpdateBlocksMutation(blocks),
             operationName: BATCH_UPDATE_BLOCKS_OPERATION_NAME
           };
-          url = fg('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockBatchUpdateBlocks") : GRAPHQL_ENDPOINT;
+          url = "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockBatchUpdateBlocks");
           _context9.next = 5;
           return fetchWithRetry(url, {
             method: 'POST',
@@ -688,7 +687,7 @@ export var updateSyncedBlocks = /*#__PURE__*/function () {
             return e.message;
           }).join(', '));
         case 13:
-          if ((_result$data8 = result.data) !== null && _result$data8 !== void 0 && _result$data8.blockService_batchUpdateBlocks) {
+          if ((_result$data7 = result.data) !== null && _result$data7 !== void 0 && _result$data7.blockService_batchUpdateBlocks) {
             _context9.next = 15;
             break;
           }

package/dist/esm/clients/confluence/fetchMediaToken.js

@@ -4,7 +4,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 var COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -90,7 +89,7 @@ export var fetchMediaToken = /*#__PURE__*/function () {
           logException(_context2.t0, {
             location: 'editor-synced-block-provider/fetchMediaToken'
           });
-          errorMsg = fg('platform_synced_block_patch_4') ? _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0) : String(_context2.t0);
+          errorMsg = _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0);
           throw new Error("Failed to get content media session: ".concat(errorMsg));
         case 18:
         case "end":