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

package/dist/es2019/utils/utils.js

@@ -1,6 +1,5 @@
 /* eslint-disable require-unicode-regexp  */
 
-import { fg } from '@atlaskit/platform-feature-flags';
 export const convertSyncBlockPMNodeToSyncBlockData = node => {
   return {
     blockInstanceId: node.attrs.localId,
@@ -65,15 +64,6 @@ export const getSourceProductFromResourceIdSafe = resourceId => {
     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.
- */
-export const productAttrIfGateOn = resourceId => fg('platform_synced_block_patch_11') ? getSourceProductFromResourceIdSafe(resourceId) : undefined;
 export const convertContentUpdatedAt = contentUpdatedAt => {
   if (typeof contentUpdatedAt === 'number') {
     try {

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

@@ -4,7 +4,7 @@ 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; }
 /* eslint-disable require-unicode-regexp  */
-import { fg } from '@atlaskit/platform-feature-flags';
+
 import { fetchWithRetry } from '../../utils/retry';
 var COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -20,11 +20,9 @@ var 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.
-var GET_SOURCE_INFO_QUERY = "query ".concat(GET_SOURCE_INFO_OPERATION_NAME, " ($id: ID!) {\n  jira {\n    issueById(id: $id) {\n      id\n      webUrl\n      summary\n      issueType {\n        name\n        avatar {\n          xsmall\n        }\n      }\n    }\n  }}");
+// `issueType` is requested alongside `summary` and `webUrl` so the
+// SyncedLocationDropdown can render the correct ADS issue-type icon.
+var GET_SOURCE_INFO_QUERY = "query ".concat(GET_SOURCE_INFO_OPERATION_NAME, " ($id: ID!) {\n  jira {\n\tissueById(id: $id) {\n\tid\n\twebUrl\n\tsummary\n\tissueType {\n\t\tname\n\t\tavatar {\n\t\txsmall\n\t\t}\n\t}\n\t}\n  }}");
 var getJiraWorkItemSourceInfo = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ari) {
     var bodyData, response;
@@ -135,59 +133,40 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
  */
 export var fetchJiraWorkItemInfo = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workItemAri, hasAccess) {
-    var _response$data, _contentData$webUrl, _contentData$summary, response, contentData, _rawIssueType$avatar, _webUrl, _summary, rawIssueType, issueTypeName, issueType, webUrl, summary;
+    var _response$data, _contentData$issueTyp, _contentData$issueTyp2, response, contentData, webUrl, summary, issueTypeName, issueType;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (!hasAccess) {
-            _context3.next = 17;
+            _context3.next = 12;
             break;
           }
           _context3.next = 3;
           return getJiraWorkItemSourceInfo(workItemAri);
         case 3:
           response = _context3.sent;
-          contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.jira) === null || _response$data === void 0 ? void 0 : _response$data.issueById; // 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')) {
-            _context3.next = 12;
-            break;
-          }
-          _webUrl = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) === 'string' ? contentData.webUrl : undefined;
-          _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`.
-          rawIssueType = contentData === null || contentData === void 0 ? void 0 : contentData.issueType;
-          issueTypeName = typeof (rawIssueType === null || rawIssueType === void 0 ? void 0 : rawIssueType.name) === 'string' && rawIssueType.name.length > 0 ? rawIssueType.name : undefined;
-          issueType = issueTypeName ? {
+          contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.jira) === null || _response$data === void 0 ? void 0 : _response$data.issueById;
+          webUrl = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) === 'string' ? contentData.webUrl : undefined;
+          summary = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.summary) === 'string' ? 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`.
+          issueTypeName = contentData === null || contentData === void 0 || (_contentData$issueTyp = contentData.issueType) === null || _contentData$issueTyp === void 0 ? void 0 : _contentData$issueTyp.name;
+          issueType = typeof issueTypeName === 'string' && issueTypeName.length > 0 ? {
             name: issueTypeName,
-            iconUrl: typeof (rawIssueType === null || rawIssueType === void 0 || (_rawIssueType$avatar = rawIssueType.avatar) === null || _rawIssueType$avatar === void 0 ? void 0 : _rawIssueType$avatar.xsmall) === 'string' ? rawIssueType.avatar.xsmall : undefined
+            iconUrl: typeof (contentData === null || contentData === void 0 || (_contentData$issueTyp2 = contentData.issueType) === null || _contentData$issueTyp2 === void 0 || (_contentData$issueTyp2 = _contentData$issueTyp2.avatar) === null || _contentData$issueTyp2 === void 0 ? void 0 : _contentData$issueTyp2.xsmall) === 'string' ? contentData.issueType.avatar.xsmall : undefined
           } : undefined;
           return _context3.abrupt("return", Promise.resolve({
-            url: _webUrl,
+            url: webUrl,
             sourceAri: workItemAri,
-            title: _summary,
+            title: summary,
             issueType: issueType
           }));
         case 12:
-          webUrl = (_contentData$webUrl = contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) !== null && _contentData$webUrl !== void 0 ? _contentData$webUrl : undefined;
-          summary = (_contentData$summary = contentData === null || contentData === void 0 ? void 0 : contentData.summary) !== null && _contentData$summary !== void 0 ? _contentData$summary : undefined;
-          return _context3.abrupt("return", Promise.resolve({
-            url: webUrl,
-            sourceAri: workItemAri,
-            title: summary
-          }));
-        case 17:
-          _context3.next = 19;
+          _context3.next = 14;
           return resolveNoAccessWorkItemInfo(workItemAri);
-        case 19:
+        case 14:
           return _context3.abrupt("return", _context3.sent);
-        case 20:
+        case 15:
         case "end":
           return _context3.stop();
       }

package/dist/esm/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/esm/hooks/useFetchSyncBlockData.js

@@ -9,7 +9,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 var useFetchSyncBlockData = function 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
@@ -71,7 +71,7 @@ export var useFetchSyncBlockData = function useFetchSyncBlockData(manager, resou
           logException(_context.t0, {
             location: 'editor-synced-block-provider/useFetchSyncBlockData'
           });
-          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent(fetchErrorPayload(_context.t0.message, resourceId, productAttrIfGateOn(resourceId)));
+          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent(fetchErrorPayload(_context.t0.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
 
           // Set error state if fetching fails
           setFetchState({

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

@@ -11,12 +11,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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';
@@ -311,7 +310,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         // 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.
-        var sourceProduct = fg('platform_synced_block_patch_11') ? product !== null && product !== void 0 ? product : getSourceProductFromResourceIdSafe(resourceId) : undefined;
+        var 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 || _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing', resourceId, sourceProduct));
@@ -360,7 +359,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, getSourceInfoErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, getSourceInfoErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       }
       return Promise.resolve(undefined);
     }
@@ -555,7 +554,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         }
         if (syncBlockInstance.error) {
           var _this5$fireAnalyticsE2, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, 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));
+          (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, 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) {
@@ -567,9 +566,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
           var _this5$fireAnalyticsE3, _syncBlockInstance$da3, _syncBlockInstance$da4;
-          (_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, 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));
+          (_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, 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)));
         });
         _this5.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       });

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

@@ -3,17 +3,21 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-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 { 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. */
+var 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.
@@ -24,6 +28,22 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     var _this = this;
     _classCallCheck(this, SourceSyncBlockStoreManager);
     _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", function (Ids, value) {
       if (_this.viewMode === 'view') {
         return;
@@ -50,6 +70,18 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function 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.
+     */
+  }, {
+    key: "registerPostCreationFlushCallback",
+    value: function registerPostCreationFlushCallback(callback) {
+      this.postCreationFlushCallback = callback;
+    }
   }, {
     key: "setFireAnalyticsEvent",
     value: function setFireAnalyticsEvent(fireAnalyticsEvent) {
@@ -112,7 +144,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         });
         // 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 || _this$fireAnalyticsEv.call(this, updateCacheErrorPayload(error.message, syncBlockNode === null || syncBlockNode === void 0 || (_syncBlockNode$attrs2 = syncBlockNode.attrs) === null || _syncBlockNode$attrs2 === void 0 ? void 0 : _syncBlockNode$attrs2.resourceId, productAttrIfGateOn(syncBlockNode === null || syncBlockNode === void 0 || (_syncBlockNode$attrs3 = syncBlockNode.attrs) === null || _syncBlockNode$attrs3 === void 0 ? void 0 : _syncBlockNode$attrs3.resourceId)));
+        (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, updateCacheErrorPayload(error.message, syncBlockNode === null || syncBlockNode === void 0 || (_syncBlockNode$attrs2 = syncBlockNode.attrs) === null || _syncBlockNode$attrs2 === void 0 ? void 0 : _syncBlockNode$attrs2.resourceId, getSourceProductFromResourceIdSafe(syncBlockNode === null || syncBlockNode === void 0 || (_syncBlockNode$attrs3 = syncBlockNode.attrs) === null || _syncBlockNode$attrs3 === void 0 ? void 0 : _syncBlockNode$attrs3.resourceId)));
         return false;
       }
     }
@@ -127,7 +159,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: (function () {
       var _flush = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this2 = this;
-        var _this$saveExperience, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
+        var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -138,6 +170,39 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               }
               return _context.abrupt("return", true);
             case 3:
+              if (!(this.pendingCreationPromises.size > 0 && fg('platform_synced_block_patch_12'))) {
+                _context.next = 10;
+                break;
+              }
+              timedOut = false;
+              timeout = new Promise(function (resolve) {
+                timeoutId = setTimeout(function () {
+                  timedOut = true;
+                  resolve();
+                }, FLUSH_CREATION_AWAIT_TIMEOUT_MS);
+              });
+              _context.next = 8;
+              return Promise.race([Promise.all(this.pendingCreationPromises.values()), timeout]);
+            case 8:
+              if (timeoutId !== undefined) {
+                clearTimeout(timeoutId);
+              }
+              if (timedOut) {
+                // Record every still-in-flight creation so each late
+                // completion is tracked independently.
+                _iterator = _createForOfIteratorHelper(this.pendingCreationPromises.keys());
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    resourceId = _step.value;
+                    this.creationsTimedOutDuringFlush.add(resourceId);
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+              }
+            case 10:
               bodiedSyncBlockNodes = [];
               bodiedSyncBlockData = [];
               Array.from(this.syncBlockCache.values()).forEach(function (syncBlockData) {
@@ -167,21 +232,21 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
-                _context.next = 8;
+                _context.next = 15;
                 break;
               }
               return _context.abrupt("return", Promise.resolve(true));
-            case 8:
+            case 15:
               if (this.dataProvider) {
-                _context.next = 10;
+                _context.next = 17;
                 break;
               }
               throw new Error('Data provider not set');
-            case 10:
+            case 17:
               (_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 || _this$saveExperience.start({});
-              _context.next = 13;
+              _context.next = 20;
               return this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
-            case 13:
+            case 20:
               writeResults = _context.sent;
               writeResults.forEach(function (result) {
                 // set isDirty to true for cases where it failed to save the sync block to the BE
@@ -195,7 +260,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               if (!writeResults.every(function (result) {
                 return result.resourceId && !result.error;
               })) {
-                _context.next = 21;
+                _context.next = 28;
                 break;
               }
               (_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 || _this$saveExperience2.success();
@@ -207,24 +272,24 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                   if (cachedData && result.status) {
                     cachedData.status = result.status;
                   }
-                  (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, updateSuccessPayload(result.resourceId, false, productAttrIfGateOn(result.resourceId)));
+                  (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, updateSuccessPayload(result.resourceId, false, getSourceProductFromResourceIdSafe(result.resourceId)));
                 }
               });
               return _context.abrupt("return", true);
-            case 21:
+            case 28:
               (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 || _this$saveExperience3.failure();
               writeResults.filter(function (result) {
                 return !result.resourceId || result.error;
               }).forEach(function (result) {
                 var _this2$fireAnalyticsE2;
-                (_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, productAttrIfGateOn(result.resourceId)));
+                (_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
               });
               return _context.abrupt("return", false);
-            case 24:
-              _context.next = 31;
+            case 31:
+              _context.next = 38;
               break;
-            case 26:
-              _context.prev = 26;
+            case 33:
+              _context.prev = 33;
               _context.t0 = _context["catch"](0);
               logException(_context.t0, {
                 location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
@@ -232,15 +297,15 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               // Top-level flush failure is not tied to a single resourceId.
               (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, updateErrorPayload(_context.t0.message));
               return _context.abrupt("return", false);
-            case 31:
-              _context.prev = 31;
+            case 38:
+              _context.prev = 38;
               (_this$flushCompletion = this.flushCompletionCallback) === null || _this$flushCompletion === void 0 || _this$flushCompletion.call(this);
-              return _context.finish(31);
-            case 34:
+              return _context.finish(38);
+            case 41:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[0, 26, 31, 34]]);
+        }, _callee, this, [[0, 33, 38, 41]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -296,23 +361,33 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       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.
+        var 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 || _this$postCreationFlu.call(this);
+          }
         }
       } else {
         var _this$fireAnalyticsEv3;
-        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, createErrorPayload('creation complete callback missing', resourceId, productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, createErrorPayload('creation complete callback missing', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       }
       if (success) {
         var _this$fireAnalyticsEv4;
-        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, createSuccessPayload(resourceId || '', productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, createSuccessPayload(resourceId || '', getSourceProductFromResourceIdSafe(resourceId)));
       } else {
         var _this$fireAnalyticsEv5;
         // Delete the node from cache if fail to create so it's not flushed to BE
         this.syncBlockCache.delete(resourceId || '');
-        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 || _this$fireAnalyticsEv5.call(this, createErrorPayload('Fail to create bodied sync block', resourceId, productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 || _this$fireAnalyticsEv5.call(this, createErrorPayload('Fail to create bodied sync block', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       }
     }
   }, {
@@ -379,7 +454,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         }
         this.creationCompletionCallbacks.set(resourceId, onCompletion);
         (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 || _this$createExperienc.start({});
-        this.dataProvider.createNodeData({
+        var creationPromise = this.dataProvider.createNodeData({
           content: [],
           blockInstanceId: blockInstanceId,
           resourceId: resourceId
@@ -395,7 +470,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
             (_this4$createExperien2 = _this4.createExperience) === null || _this4$createExperien2 === void 0 || _this4$createExperien2.failure({
               reason: result.error || 'Failed to create bodied sync block'
             });
-            (_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, createErrorPayload(result.error || 'Failed to create bodied sync block', resourceId, productAttrIfGateOn(resourceId)));
+            (_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, createErrorPayload(result.error || 'Failed to create bodied sync block', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
           }
         }).catch(function (error) {
           var _this4$createExperien3, _this4$fireAnalyticsE2;
@@ -406,8 +481,11 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           (_this4$createExperien3 = _this4.createExperience) === null || _this4$createExperien3 === void 0 || _this4$createExperien3.failure({
             reason: error.message
           });
-          (_this4$fireAnalyticsE2 = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE2 === void 0 || _this4$fireAnalyticsE2.call(_this4, createErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+          (_this4$fireAnalyticsE2 = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE2 === void 0 || _this4$fireAnalyticsE2.call(_this4, createErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+        }).finally(function () {
+          _this4.pendingCreationPromises.delete(resourceId);
         });
+        this.pendingCreationPromises.set(resourceId, creationPromise);
       } catch (error) {
         var _this$fireAnalyticsEv6;
         if (this.isPendingCreation(resourceId)) {
@@ -416,7 +494,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         logException(error, {
           location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 || _this$fireAnalyticsEv6.call(this, createErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 || _this$fireAnalyticsEv6.call(this, createErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       }
     }
   }, {
@@ -464,7 +542,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 (_this$deleteExperienc2 = this.deleteExperience) === null || _this$deleteExperienc2 === void 0 || _this$deleteExperienc2.success();
                 results.forEach(function (result) {
                   var _this5$fireAnalyticsE;
-                  (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, deleteSuccessPayload(result.resourceId, productAttrIfGateOn(result.resourceId)));
+                  (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, deleteSuccessPayload(result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
                 });
               } else {
                 callback = function callback(Ids) {
@@ -474,10 +552,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 results.forEach(function (result) {
                   if (result.success) {
                     var _this5$fireAnalyticsE2;
-                    (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, deleteSuccessPayload(result.resourceId, productAttrIfGateOn(result.resourceId)));
+                    (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, deleteSuccessPayload(result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
                   } else {
                     var _this5$fireAnalyticsE3;
-                    (_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, deleteErrorPayload(result.error || 'Failed to delete synced block', result.resourceId, productAttrIfGateOn(result.resourceId)));
+                    (_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, deleteErrorPayload(result.error || 'Failed to delete synced block', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
                   }
                 });
               }
@@ -489,7 +567,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               syncBlockIds.forEach(function (Ids) {
                 var _this5$fireAnalyticsE4;
                 _this5.setPendingDeletion(Ids, false);
-                (_this5$fireAnalyticsE4 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE4 === void 0 || _this5$fireAnalyticsE4.call(_this5, deleteErrorPayload(_context2.t0.message, Ids.resourceId, productAttrIfGateOn(Ids.resourceId)));
+                (_this5$fireAnalyticsE4 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE4 === void 0 || _this5$fireAnalyticsE4.call(_this5, deleteErrorPayload(_context2.t0.message, Ids.resourceId, getSourceProductFromResourceIdSafe(Ids.resourceId)));
               });
               logException(_context2.t0, {
                 location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
@@ -568,7 +646,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: (function () {
       var _fetchAndCacheStatuses = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         var _this6 = this;
-        var sourceToReferenceMap, syncBlockNodes, results, _iterator, _step, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
+        var sourceToReferenceMap, syncBlockNodes, results, _iterator2, _step2, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -604,10 +682,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               return this.dataProvider.fetchNodesData(syncBlockNodes);
             case 7:
               results = _context4.sent;
-              _iterator = _createForOfIteratorHelper(results);
+              _iterator2 = _createForOfIteratorHelper(results);
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  result = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  result = _step2.value;
                   // Map the reference resourceId back to the source resourceId
                   sourceResourceId = (_sourceToReferenceMap = sourceToReferenceMap.get(result.resourceId)) !== null && _sourceToReferenceMap !== void 0 ? _sourceToReferenceMap : result.resourceId;
                   cached = this.syncBlockCache.get(sourceResourceId);
@@ -616,9 +694,9 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
               _context4.next = 14;
               break;
@@ -780,7 +858,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         logException(error, {
           location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, fetchReferencesErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, fetchReferencesErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
         return Promise.resolve({
           error: SyncBlockError.Errored
         });
@@ -794,6 +872,9 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       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 || _this$saveExperience4.abort({
         reason: 'editorDestroyed'

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

@@ -4,7 +4,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
@@ -33,7 +33,7 @@ export var SyncBlockBatchFetcher = /*#__PURE__*/function () {
         });
         resourceIds.forEach(function (resId) {
           var _this$deps$getFireAna;
-          (_this$deps$getFireAna = _this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(error.message, resId, productAttrIfGateOn(resId)));
+          (_this$deps$getFireAna = _this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(error.message, resId, getSourceProductFromResourceIdSafe(resId)));
         });
       });
     });