@atlaskit/editor-synced-block-provider 6.6.2 → 6.6.4

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

@@ -9,7 +9,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 _errorHandling = require("../utils/errorHandling");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
 var _utils = require("../utils/utils");
@@ -258,7 +257,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
         });
-        (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.productAttrIfGateOn)(resourceId)));
+        (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
       });
       if (unsubscribe) {
         this.graphqlSubscriptions.set(resourceId, unsubscribe);
@@ -350,15 +349,13 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
           var _this6$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn((0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId,
-          // Prefer cached product when available; fall back to parsing the resourceId.
-          (0, _platformFeatureFlags.fg)('platform_synced_block_patch_11') ? (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId) : undefined));
+          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn((0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
         var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna, _syncBlockInstance$da3, _syncBlockInstance$da4;
         var errorMessage = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type);
-        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId, (0, _platformFeatureFlags.fg)('platform_synced_block_patch_11') ? (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId) : undefined));
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
       }
     }
   }]);

package/dist/cjs/utils/utils.js

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.productAttrIfGateOn = exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
 /* eslint-disable require-unicode-regexp  */
 
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
@@ -75,17 +74,6 @@ var getSourceProductFromResourceIdSafe = exports.getSourceProductFromResourceIdS
     return undefined;
   }
 };
-
-/*
- * Convenience wrapper around `getSourceProductFromResourceIdSafe` that returns
- * `undefined` whenever the `platform_synced_block_patch_11` rollout flag is off.
- * Centralised so that the flag name lives in exactly one place — when the flag is
- * cleaned up, this function should be deleted in its entirety and call-sites should
- * fall back to calling `getSourceProductFromResourceIdSafe` directly.
- */
-var productAttrIfGateOn = exports.productAttrIfGateOn = function productAttrIfGateOn(resourceId) {
-  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_11') ? getSourceProductFromResourceIdSafe(resourceId) : undefined;
-};
 var convertContentUpdatedAt = exports.convertContentUpdatedAt = function convertContentUpdatedAt(contentUpdatedAt) {
   if (typeof contentUpdatedAt === 'number') {
     try {

package/dist/es2019/clients/jira/sourceInfo.js

@@ -1,5 +1,5 @@
 /* eslint-disable require-unicode-regexp  */
-import { fg } from '@atlaskit/platform-feature-flags';
+
 import { fetchWithRetry } from '../../utils/retry';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -15,23 +15,21 @@ const GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
  * @param id - the ID of the work item
  * @returns url of the work item
  */
-// `issueType` is requested unconditionally because GraphQL field selection cannot be
-// gated at the network layer without a separate operation; AGG ignores unknown
-// front-end gating. The runtime mapping into `SyncBlockSourceInfo.issueType` is gated
-// by `platform_synced_block_patch_11` below.
+// `issueType` is requested alongside `summary` and `webUrl` so the
+// SyncedLocationDropdown can render the correct ADS issue-type icon.
 const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!) {
   jira {
-    issueById(id: $id) {
-      id
-      webUrl
-      summary
-      issueType {
-        name
-        avatar {
-          xsmall
-        }
-      }
-    }
+	issueById(id: $id) {
+	id
+	webUrl
+	summary
+	issueType {
+		name
+		avatar {
+		xsmall
+		}
+	}
+	}
   }}`;
 const getJiraWorkItemSourceInfo = async ari => {
   const bodyData = {
@@ -102,44 +100,25 @@ const resolveNoAccessWorkItemInfo = async ari => {
  */
 export const fetchJiraWorkItemInfo = async (workItemAri, hasAccess) => {
   if (hasAccess) {
-    var _response$data, _response$data$jira, _contentData$webUrl, _contentData$summary;
+    var _response$data, _response$data$jira, _contentData$issueTyp, _contentData$issueTyp2, _contentData$issueTyp3;
     const response = await getJiraWorkItemSourceInfo(workItemAri);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$jira = _response$data.jira) === null || _response$data$jira === void 0 ? void 0 : _response$data$jira.issueById;
+    const webUrl = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) === 'string' ? contentData.webUrl : undefined;
+    const summary = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.summary) === 'string' ? contentData.summary : undefined;
 
-    // Defensive narrowing (gated by `platform_synced_block_patch_11`):
-    // AGG may return `null` (not just omit the field) for `webUrl` / `summary` on
-    // partially indexed issues. Without these guards, downstream consumers that
-    // expect `string | undefined` would receive `null` and either crash or render
-    // the literal string "null". The pre-gate path preserves the legacy behaviour
-    // so this can be dialled off independently.
-    if (fg('platform_synced_block_patch_11')) {
-      var _rawIssueType$avatar;
-      const webUrl = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) === 'string' ? contentData.webUrl : undefined;
-      const summary = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.summary) === 'string' ? contentData.summary : undefined;
-
-      // Surface issue-type metadata so consumers can render the correct ADS issue-type
-      // icon. Defensive narrowing mirrors the webUrl/summary treatment above: only
-      // surfaced when `name` is a non-empty string; AGG values like `{ name: null }`
-      // collapse back to `undefined`.
-      const rawIssueType = contentData === null || contentData === void 0 ? void 0 : contentData.issueType;
-      const issueTypeName = typeof (rawIssueType === null || rawIssueType === void 0 ? void 0 : rawIssueType.name) === 'string' && rawIssueType.name.length > 0 ? rawIssueType.name : undefined;
-      const issueType = issueTypeName ? {
-        name: issueTypeName,
-        iconUrl: typeof (rawIssueType === null || rawIssueType === void 0 ? void 0 : (_rawIssueType$avatar = rawIssueType.avatar) === null || _rawIssueType$avatar === void 0 ? void 0 : _rawIssueType$avatar.xsmall) === 'string' ? rawIssueType.avatar.xsmall : undefined
-      } : undefined;
-      return Promise.resolve({
-        url: webUrl,
-        sourceAri: workItemAri,
-        title: summary,
-        issueType
-      });
-    }
-    const webUrl = (_contentData$webUrl = contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) !== null && _contentData$webUrl !== void 0 ? _contentData$webUrl : undefined;
-    const summary = (_contentData$summary = contentData === null || contentData === void 0 ? void 0 : contentData.summary) !== null && _contentData$summary !== void 0 ? _contentData$summary : undefined;
+    // Surface issue-type metadata for the SyncedLocationDropdown's ADS icon.
+    // Defensive narrowing: only surface when `name` is a non-empty string;
+    // AGG values like `{ name: null }` collapse back to `undefined`.
+    const issueTypeName = contentData === null || contentData === void 0 ? void 0 : (_contentData$issueTyp = contentData.issueType) === null || _contentData$issueTyp === void 0 ? void 0 : _contentData$issueTyp.name;
+    const issueType = typeof issueTypeName === 'string' && issueTypeName.length > 0 ? {
+      name: issueTypeName,
+      iconUrl: typeof (contentData === null || contentData === void 0 ? void 0 : (_contentData$issueTyp2 = contentData.issueType) === null || _contentData$issueTyp2 === void 0 ? void 0 : (_contentData$issueTyp3 = _contentData$issueTyp2.avatar) === null || _contentData$issueTyp3 === void 0 ? void 0 : _contentData$issueTyp3.xsmall) === 'string' ? contentData.issueType.avatar.xsmall : undefined
+    } : undefined;
     return Promise.resolve({
       url: webUrl,
       sourceAri: workItemAri,
-      title: summary
+      title: summary,
+      issueType
     });
   } else {
     return await resolveNoAccessWorkItemInfo(workItemAri);

package/dist/es2019/entry-points/utils.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, convertPMNodeToSyncBlockNode, convertContentUpdatedAt, getContentIdAndProductFromResourceId, getSourceProductFromResourceIdSafe, productAttrIfGateOn } from '../utils/utils';
+export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, convertPMNodeToSyncBlockNode, convertContentUpdatedAt, getContentIdAndProductFromResourceId, getSourceProductFromResourceIdSafe } from '../utils/utils';

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -3,7 +3,7 @@ import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload } from '../utils/errorHandling';
-import { createSyncBlockNode, productAttrIfGateOn } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalyticsEvent) => {
   // Initialize both states from a single cache lookup to avoid race conditions.
   // When a block is moved/remounted, the old component's cleanup may clear the cache
@@ -46,7 +46,7 @@ export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalytic
       logException(error, {
         location: 'editor-synced-block-provider/useFetchSyncBlockData'
       });
-      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
 
       // Set error state if fetching fails
       setFetchState({

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

@@ -1,12 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import isEqual from 'lodash/isEqual';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { createSyncBlockNode, getSourceProductFromResourceIdSafe, productAttrIfGateOn } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -237,7 +236,7 @@ export class ReferenceSyncBlockStoreManager {
       // Derive once per call so we don't re-parse on every analytics event below.
       // `product` from cached data is preferred when available; fall back to parsing
       // the resourceId.
-      const sourceProduct = fg('platform_synced_block_patch_11') ? product !== null && product !== void 0 ? product : getSourceProductFromResourceIdSafe(resourceId) : undefined;
+      const sourceProduct = product !== null && product !== void 0 ? product : getSourceProductFromResourceIdSafe(resourceId);
       if (!sourceAri || !product || !blockInstanceId) {
         var _this$fireAnalyticsEv3;
         (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing', resourceId, sourceProduct));
@@ -286,7 +285,7 @@ export class ReferenceSyncBlockStoreManager {
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, getSourceInfoErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, getSourceInfoErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
     }
     return Promise.resolve(undefined);
   }
@@ -434,7 +433,7 @@ export class ReferenceSyncBlockStoreManager {
       }
       if (syncBlockInstance.error) {
         var _this$fireAnalyticsEv9, _syncBlockInstance$da, _syncBlockInstance$da2;
-        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId, fg('platform_synced_block_patch_11') ? (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId) : undefined));
+        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
         if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
           hasExpectedError = true;
         } else if (syncBlockInstance.error) {
@@ -446,9 +445,7 @@ export class ReferenceSyncBlockStoreManager {
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
         var _this$fireAnalyticsEv0, _syncBlockInstance$da3, _syncBlockInstance$da4;
-        (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId,
-        // Prefer cached product when available; fall back to parsing the resourceId.
-        fg('platform_synced_block_patch_11') ? (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId) : undefined));
+        (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
       });
       this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });

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

@@ -1,9 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getCreateSourceExperience, getDeleteSourceExperience, getSaveSourceExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
-import { convertSyncBlockPMNodeToSyncBlockData, productAttrIfGateOn } from '../utils/utils';
+import { convertSyncBlockPMNodeToSyncBlockData, getSourceProductFromResourceIdSafe } from '../utils/utils';
+/** Maximum time (ms) flush() will wait for in-flight block creations before proceeding. */
+const FLUSH_CREATION_AWAIT_TIMEOUT_MS = 1000;
+
 // A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
 // Supports create, flush, and delete operations for source sync blocks.
@@ -12,6 +16,22 @@ import { convertSyncBlockPMNodeToSyncBlockData, productAttrIfGateOn } from '../u
 export class SourceSyncBlockStoreManager {
   constructor(dataProvider, viewMode, isLivePage) {
     _defineProperty(this, "hasReceivedContentChange", false);
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    _defineProperty(this, "pendingCreationPromises", new Map());
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    _defineProperty(this, "creationsTimedOutDuringFlush", new Set());
     _defineProperty(this, "setPendingDeletion", (Ids, value) => {
       if (this.viewMode === 'view') {
         return;
@@ -36,6 +56,16 @@ export class SourceSyncBlockStoreManager {
   registerFlushCompletionCallback(callback) {
     this.flushCompletionCallback = callback;
   }
+
+  /**
+   * Register a callback to be invoked when flush() timed out waiting for a
+   * pending block creation and that creation subsequently completes. The
+   * callback should trigger a deferred flush to persist the content that
+   * was skipped due to the timeout. See EDITOR-7112.
+   */
+  registerPostCreationFlushCallback(callback) {
+    this.postCreationFlushCallback = callback;
+  }
   setFireAnalyticsEvent(fireAnalyticsEvent) {
     this.fireAnalyticsEvent = fireAnalyticsEvent;
     this.createExperience = getCreateSourceExperience(fireAnalyticsEvent);
@@ -94,7 +124,7 @@ export class SourceSyncBlockStoreManager {
       });
       // We can derive the product from `syncBlockNode.attrs.resourceId` even though
       // the variable wasn't destructured (the destructuring step itself may have thrown).
-      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, updateCacheErrorPayload(error.message, syncBlockNode === null || syncBlockNode === void 0 ? void 0 : (_syncBlockNode$attrs = syncBlockNode.attrs) === null || _syncBlockNode$attrs === void 0 ? void 0 : _syncBlockNode$attrs.resourceId, productAttrIfGateOn(syncBlockNode === null || syncBlockNode === void 0 ? void 0 : (_syncBlockNode$attrs2 = syncBlockNode.attrs) === null || _syncBlockNode$attrs2 === void 0 ? void 0 : _syncBlockNode$attrs2.resourceId)));
+      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, updateCacheErrorPayload(error.message, syncBlockNode === null || syncBlockNode === void 0 ? void 0 : (_syncBlockNode$attrs = syncBlockNode.attrs) === null || _syncBlockNode$attrs === void 0 ? void 0 : _syncBlockNode$attrs.resourceId, getSourceProductFromResourceIdSafe(syncBlockNode === null || syncBlockNode === void 0 ? void 0 : (_syncBlockNode$attrs2 = syncBlockNode.attrs) === null || _syncBlockNode$attrs2 === void 0 ? void 0 : _syncBlockNode$attrs2.resourceId)));
       return false;
     }
   }
@@ -110,6 +140,39 @@ export class SourceSyncBlockStoreManager {
       if (this.viewMode === 'view') {
         return true;
       }
+
+      // Wait (up to FLUSH_CREATION_AWAIT_TIMEOUT_MS) for any in-flight
+      // block creations to complete before iterating the cache. Without
+      // this, blocks created from existing content are skipped
+      // (isPendingCreation check below) and if no further edits are made,
+      // no subsequent flush is triggered — causing references to show an
+      // "unpublished" error.
+      // If the timeout expires, any block whose creation is still
+      // in-flight is recorded in `creationsTimedOutDuringFlush` so that
+      // `commitPendingCreation()` can trigger a follow-up flush once that
+      // specific creation completes.
+      // See EDITOR-7112.
+      if (this.pendingCreationPromises.size > 0 && fg('platform_synced_block_patch_12')) {
+        let timedOut = false;
+        let timeoutId;
+        const timeout = new Promise(resolve => {
+          timeoutId = setTimeout(() => {
+            timedOut = true;
+            resolve();
+          }, FLUSH_CREATION_AWAIT_TIMEOUT_MS);
+        });
+        await Promise.race([Promise.all(this.pendingCreationPromises.values()), timeout]);
+        if (timeoutId !== undefined) {
+          clearTimeout(timeoutId);
+        }
+        if (timedOut) {
+          // Record every still-in-flight creation so each late
+          // completion is tracked independently.
+          for (const resourceId of this.pendingCreationPromises.keys()) {
+            this.creationsTimedOutDuringFlush.add(resourceId);
+          }
+        }
+      }
       const bodiedSyncBlockNodes = [];
       const bodiedSyncBlockData = [];
       Array.from(this.syncBlockCache.values()).forEach(syncBlockData => {
@@ -167,7 +230,7 @@ export class SourceSyncBlockStoreManager {
             if (cachedData && result.status) {
               cachedData.status = result.status;
             }
-            (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, updateSuccessPayload(result.resourceId, false, productAttrIfGateOn(result.resourceId)));
+            (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, updateSuccessPayload(result.resourceId, false, getSourceProductFromResourceIdSafe(result.resourceId)));
           }
         });
         return true;
@@ -176,7 +239,7 @@ export class SourceSyncBlockStoreManager {
         (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 ? void 0 : _this$saveExperience3.failure();
         writeResults.filter(result => !result.resourceId || result.error).forEach(result => {
           var _this$fireAnalyticsEv3;
-          (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, productAttrIfGateOn(result.resourceId)));
+          (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
         });
         return false;
       }
@@ -232,23 +295,33 @@ export class SourceSyncBlockStoreManager {
     if (onCompletion) {
       this.creationCompletionCallbacks.delete(resourceId);
       onCompletion(success);
+      // If a previous flush() timed out waiting for this specific
+      // creation, drop it from the tracking set regardless of outcome so
+      // it does not leak. See EDITOR-7112.
+      const wasTimedOut = this.creationsTimedOutDuringFlush.delete(resourceId);
       if (success) {
         // If creation is successful, set hasReceivedContentChange to true
         // to indicate that there are unsaved changes in the cache
         this.hasReceivedContentChange = true;
+        // If flush() timed out waiting for this creation, notify the
+        // plugin so it can trigger a deferred flush. See EDITOR-7112.
+        if (wasTimedOut) {
+          var _this$postCreationFlu;
+          (_this$postCreationFlu = this.postCreationFlushCallback) === null || _this$postCreationFlu === void 0 ? void 0 : _this$postCreationFlu.call(this);
+        }
       }
     } else {
       var _this$fireAnalyticsEv5;
-      (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, createErrorPayload('creation complete callback missing', resourceId, productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, createErrorPayload('creation complete callback missing', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
     }
     if (success) {
       var _this$fireAnalyticsEv6;
-      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, createSuccessPayload(resourceId || '', productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, createSuccessPayload(resourceId || '', getSourceProductFromResourceIdSafe(resourceId)));
     } else {
       var _this$fireAnalyticsEv7;
       // Delete the node from cache if fail to create so it's not flushed to BE
       this.syncBlockCache.delete(resourceId || '');
-      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, createErrorPayload('Fail to create bodied sync block', resourceId, productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, createErrorPayload('Fail to create bodied sync block', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
     }
   }
   registerConfirmationCallback(callback) {
@@ -308,7 +381,7 @@ export class SourceSyncBlockStoreManager {
       }
       this.creationCompletionCallbacks.set(resourceId, onCompletion);
       (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 ? void 0 : _this$createExperienc.start({});
-      this.dataProvider.createNodeData({
+      const creationPromise = this.dataProvider.createNodeData({
         content: [],
         blockInstanceId,
         resourceId
@@ -324,7 +397,7 @@ export class SourceSyncBlockStoreManager {
           (_this$createExperienc3 = this.createExperience) === null || _this$createExperienc3 === void 0 ? void 0 : _this$createExperienc3.failure({
             reason: result.error || 'Failed to create bodied sync block'
           });
-          (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, createErrorPayload(result.error || 'Failed to create bodied sync block', resourceId, productAttrIfGateOn(resourceId)));
+          (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, createErrorPayload(result.error || 'Failed to create bodied sync block', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
         }
       }).catch(error => {
         var _this$createExperienc4, _this$fireAnalyticsEv9;
@@ -335,8 +408,11 @@ export class SourceSyncBlockStoreManager {
         (_this$createExperienc4 = this.createExperience) === null || _this$createExperienc4 === void 0 ? void 0 : _this$createExperienc4.failure({
           reason: error.message
         });
-        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, createErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, createErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+      }).finally(() => {
+        this.pendingCreationPromises.delete(resourceId);
       });
+      this.pendingCreationPromises.set(resourceId, creationPromise);
     } catch (error) {
       var _this$fireAnalyticsEv0;
       if (this.isPendingCreation(resourceId)) {
@@ -345,7 +421,7 @@ export class SourceSyncBlockStoreManager {
       logException(error, {
         location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, createErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, createErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
     }
   }
   async delete(syncBlockIds, onDelete, onDeleteCompleted, reason) {
@@ -373,7 +449,7 @@ export class SourceSyncBlockStoreManager {
         (_this$deleteExperienc2 = this.deleteExperience) === null || _this$deleteExperienc2 === void 0 ? void 0 : _this$deleteExperienc2.success();
         results.forEach(result => {
           var _this$fireAnalyticsEv1;
-          (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 ? void 0 : _this$fireAnalyticsEv1.call(this, deleteSuccessPayload(result.resourceId, productAttrIfGateOn(result.resourceId)));
+          (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 ? void 0 : _this$fireAnalyticsEv1.call(this, deleteSuccessPayload(result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
         });
       } else {
         var _this$deleteExperienc3;
@@ -384,10 +460,10 @@ export class SourceSyncBlockStoreManager {
         results.forEach(result => {
           if (result.success) {
             var _this$fireAnalyticsEv10;
-            (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 ? void 0 : _this$fireAnalyticsEv10.call(this, deleteSuccessPayload(result.resourceId, productAttrIfGateOn(result.resourceId)));
+            (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 ? void 0 : _this$fireAnalyticsEv10.call(this, deleteSuccessPayload(result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
           } else {
             var _this$fireAnalyticsEv11;
-            (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block', result.resourceId, productAttrIfGateOn(result.resourceId)));
+            (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
           }
         });
       }
@@ -397,7 +473,7 @@ export class SourceSyncBlockStoreManager {
       syncBlockIds.forEach(Ids => {
         var _this$fireAnalyticsEv12;
         this.setPendingDeletion(Ids, false);
-        (_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, deleteErrorPayload(error.message, Ids.resourceId, productAttrIfGateOn(Ids.resourceId)));
+        (_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, deleteErrorPayload(error.message, Ids.resourceId, getSourceProductFromResourceIdSafe(Ids.resourceId)));
       });
       logException(error, {
         location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
@@ -572,7 +648,7 @@ export class SourceSyncBlockStoreManager {
       logException(error, {
         location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv14 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv14 === void 0 ? void 0 : _this$fireAnalyticsEv14.call(this, fetchReferencesErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv14 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv14 === void 0 ? void 0 : _this$fireAnalyticsEv14.call(this, fetchReferencesErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       return Promise.resolve({
         error: SyncBlockError.Errored
       });
@@ -584,6 +660,9 @@ export class SourceSyncBlockStoreManager {
     this.confirmationCallback = undefined;
     this.creationCompletionCallbacks.clear();
     this.flushCompletionCallback = undefined;
+    this.postCreationFlushCallback = undefined;
+    this.pendingCreationPromises.clear();
+    this.creationsTimedOutDuringFlush.clear();
     this.dataProvider = undefined;
     (_this$saveExperience4 = this.saveExperience) === null || _this$saveExperience4 === void 0 ? void 0 : _this$saveExperience4.abort({
       reason: 'editorDestroyed'

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import rafSchedule from 'raf-schd';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fetchErrorPayload } from '../utils/errorHandling';
-import { createSyncBlockNode, productAttrIfGateOn } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
  * Handles debounced batch-fetching of sync block data via `raf-schd`.
  * Accumulates resource IDs and flushes them in a single fetch per
@@ -29,7 +29,7 @@ export class SyncBlockBatchFetcher {
         });
         resourceIds.forEach(resId => {
           var _this$deps$getFireAna;
-          (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resId, productAttrIfGateOn(resId)));
+          (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resId, getSourceProductFromResourceIdSafe(resId)));
         });
       });
     });

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

@@ -3,7 +3,7 @@ import { logException } from '@atlaskit/editor-common/monitoring';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { fetchErrorPayload } from '../utils/errorHandling';
 import { parseResourceId } from '../utils/resourceId';
-import { productAttrIfGateOn } from '../utils/utils';
+import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
  * Manages creation and caching of ProviderFactory instances used to
  * render synced block content (media, emoji, smart links, etc.).
@@ -21,7 +21,7 @@ export class SyncBlockProviderFactoryManager {
       logException(error, {
         location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
       });
-      (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       return undefined;
     }
     const {
@@ -55,7 +55,7 @@ export class SyncBlockProviderFactoryManager {
         logException(error, {
           location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
         });
-        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       }
     }
     return providerFactory;
@@ -133,7 +133,7 @@ export class SyncBlockProviderFactoryManager {
     if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
       var _this$deps$getFireAna3, _syncBlock$data$produ;
       (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchErrorPayload('Sync block source ari or product not found', resourceId, // Prefer cached product when available; fall back to parsing resourceId.
-      (_syncBlock$data$produ = syncBlock.data.product) !== null && _syncBlock$data$produ !== void 0 ? _syncBlock$data$produ : productAttrIfGateOn(resourceId)));
+      (_syncBlock$data$produ = syncBlock.data.product) !== null && _syncBlock$data$produ !== void 0 ? _syncBlock$data$produ : getSourceProductFromResourceIdSafe(resourceId)));
       return;
     }
     const parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);

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

@@ -4,7 +4,7 @@ import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { SyncBlockError } from '../common/types';
 import { fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getFetchReferencesExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
-import { productAttrIfGateOn } from '../utils/utils';
+import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 import { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 
@@ -84,7 +84,7 @@ export class SyncBlockStoreManager {
       logException(error, {
         location: 'editor-synced-block-provider/syncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, fetchReferencesErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, fetchReferencesErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       return {
         error: SyncBlockError.Errored
       };

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

@@ -1,9 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchErrorPayload, fetchSuccessPayload } from '../utils/errorHandling';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { getSourceProductFromResourceIdSafe, productAttrIfGateOn } from '../utils/utils';
+import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
  * Manages the lifecycle of GraphQL WebSocket subscriptions for sync block
  * real-time updates, owns the subscriptions and titleSubscriptions maps,
@@ -221,7 +220,7 @@ export class SyncBlockSubscriptionManager {
       logException(error, {
         location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
       });
-      (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+      (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
     });
     if (unsubscribe) {
       this.graphqlSubscriptions.set(resourceId, unsubscribe);
@@ -273,15 +272,13 @@ export class SyncBlockSubscriptionManager {
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
         var _this$deps$getFireAna3, _syncBlockInstance$da, _syncBlockInstance$da2;
-        (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchSuccessPayload(syncBlockInstance.resourceId, localId,
-        // Prefer cached product when available; fall back to parsing the resourceId.
-        fg('platform_synced_block_patch_11') ? (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId) : undefined));
+        (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
       });
       this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
     } else {
       var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna4, _syncBlockInstance$da3, _syncBlockInstance$da4;
       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, fg('platform_synced_block_patch_11') ? (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId) : undefined));
+      (_this$deps$getFireAna4 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna4 === void 0 ? void 0 : _this$deps$getFireAna4(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
     }
   }
 }