@atlaskit/editor-synced-block-provider 6.5.2 → 6.6.0

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -22,7 +22,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @returns A merged SyncBlockInstance object.
  */
 var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resolveSyncBlockInstance(oldResult, newResult) {
-  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3;
+  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3, _newResult$data4, _oldResult$data4;
   // if the old result has no data, we simply return the new result
   if (!oldResult.data) {
     return newResult;
@@ -42,29 +42,30 @@ var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resol
       sourceURL: ((_newResult$data = newResult.data) === null || _newResult$data === void 0 ? void 0 : _newResult$data.sourceURL) || ((_oldResult$data = oldResult.data) === null || _oldResult$data === void 0 ? void 0 : _oldResult$data.sourceURL) || undefined,
       sourceTitle: ((_newResult$data2 = newResult.data) === null || _newResult$data2 === void 0 ? void 0 : _newResult$data2.sourceTitle) || ((_oldResult$data2 = oldResult.data) === null || _oldResult$data2 === void 0 ? void 0 : _oldResult$data2.sourceTitle) || undefined,
       sourceSubType: mergeSubType(oldResult, newResult),
-      onSameDocument: ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.onSameDocument) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.onSameDocument) || undefined
+      onSameDocument: ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.onSameDocument) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.onSameDocument) || undefined,
+      issueType: ((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.issueType) || ((_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.issueType) || undefined
     })
   });
 };
 var mergeSubType = function mergeSubType(oldResult, newResult) {
-  var _newResult$data4, _newResult$data5, _oldResult$data4;
+  var _newResult$data5, _newResult$data6, _oldResult$data5;
   // for classic pages, subType is 'null'
-  if (((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.sourceSubType) !== undefined) {
+  if (((_newResult$data5 = newResult.data) === null || _newResult$data5 === void 0 ? void 0 : _newResult$data5.sourceSubType) !== undefined) {
     return newResult.data.sourceSubType;
   }
-  if ((_newResult$data5 = newResult.data) !== null && _newResult$data5 !== void 0 && _newResult$data5.sourceAri) {
+  if ((_newResult$data6 = newResult.data) !== null && _newResult$data6 !== void 0 && _newResult$data6.sourceAri) {
     // for blogposts, subType is always undefined
     try {
-      var _newResult$data6;
+      var _newResult$data7;
       var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
-          ari: (_newResult$data6 = newResult.data) === null || _newResult$data6 === void 0 ? void 0 : _newResult$data6.sourceAri
+          ari: (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceAri
         }),
         pageType = _getPageIdAndTypeFrom.type;
       if (pageType === 'blogpost') {
-        var _newResult$data7;
-        return (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceSubType;
+        var _newResult$data8;
+        return (_newResult$data8 = newResult.data) === null || _newResult$data8 === void 0 ? void 0 : _newResult$data8.sourceSubType;
       }
     } catch (_unused) {}
   }
-  return (_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.sourceSubType;
+  return (_oldResult$data5 = oldResult.data) === null || _oldResult$data5 === void 0 ? void 0 : _oldResult$data5.sourceSubType;
 };

package/dist/cjs/utils/utils.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
+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");
 /* eslint-disable require-unicode-regexp  */
 
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
@@ -58,11 +59,38 @@ var getContentIdAndProductFromResourceId = exports.getContentIdAndProductFromRes
   }
   throw new Error("Invalid resourceId: ".concat(resourceId));
 };
+
+/*
+ * Safe variant of `getContentIdAndProductFromResourceId` for analytics call-sites.
+ * Returns `undefined` instead of throwing when the resourceId is missing or malformed,
+ * so a bad value can never break the analytics pipeline.
+ */
+var getSourceProductFromResourceIdSafe = exports.getSourceProductFromResourceIdSafe = function getSourceProductFromResourceIdSafe(resourceId) {
+  if (!resourceId) {
+    return undefined;
+  }
+  try {
+    return getContentIdAndProductFromResourceId(resourceId).sourceProduct;
+  } catch (_unused) {
+    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 {
       return new Date(contentUpdatedAt).toISOString();
-    } catch (_unused) {
+    } catch (_unused2) {
       return undefined;
     }
   }

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,12 +15,22 @@ 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.
 const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!) {
   jira {
     issueById(id: $id) {
       id
       webUrl
       summary
+      issueType {
+        name
+        avatar {
+          xsmall
+        }
+      }
     }
   }}`;
 const getJiraWorkItemSourceInfo = async ari => {
@@ -69,13 +79,63 @@ const resolveNoAccessWorkItemInfo = async ari => {
     throw new Error(`Failed to resolve ari: ${response.statusText}`);
   }
 };
+
+/**
+ * Fetch source-info metadata for a Jira work item used by reference sync blocks.
+ *
+ * Parity notes vs the Confluence equivalent (`fetchConfluencePageInfo`):
+ *
+ * - **Archived / draft URL variants** are intentionally omitted. Confluence pages can be
+ *   "unpublished" (draft, archived, in-trash) and need REST fallbacks plus alternate URL
+ *   shapes. Jira work items have no equivalent lifecycle — an issue either exists in AGG
+ *   or it does not — so a single `webUrl` is sufficient.
+ *
+ * - **`#block-{localId}` deep-link anchor** is intentionally not appended. The current
+ *   Jira issue view does not implement scroll-to-anchor for unknown fragments, so the
+ *   anchor would be dead weight on the URL. The dispatching code in
+ *   `syncBlockProvider.fetchSyncBlockSourceInfo` deliberately does not pass `localId`
+ *   here for the same reason. If/when Jira issue view supports anchor scrolling for
+ *   sync-block local IDs, accept `localId?: string` here and append `#block-{localId}`.
+ *
+ * - **`subType` / page-type variants** are not modeled — Jira issue type is exposed via
+ *   the separate `issueType` field returned alongside `summary` / `webUrl`.
+ */
 export const fetchJiraWorkItemInfo = async (workItemAri, hasAccess) => {
   if (hasAccess) {
-    var _response$data, _response$data$jira;
+    var _response$data, _response$data$jira, _contentData$webUrl, _contentData$summary;
     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 = contentData === null || contentData === void 0 ? void 0 : contentData.webUrl;
-    const summary = contentData === null || contentData === void 0 ? void 0 : contentData.summary;
+
+    // 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;
     return Promise.resolve({
       url: webUrl,
       sourceAri: workItemAri,

package/dist/es2019/entry-points/blockService-ari.js

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from '../clients/block-service/ari';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { BlockError, updateSyncedBlocks } from '../clients/block-service/blockService';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, fetchReferences, batchFetchData, writeDataBatch, blockAriToResourceId, convertToSyncBlockData, extractResourceIdFromBlockAri } from '../providers/block-service/blockServiceAPI';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { extractGraphQLWSErrorMessage, getConnectionDiagnosticsSummary } from '../clients/block-service/blockSubscription';

package/dist/es2019/entry-points/common-types.js

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { SyncBlockError } from '../common/types';

package/dist/es2019/entry-points/confluence-ari.js

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { fetchErrorPayload } from '../utils/errorHandling';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { fetchJiraMediaToken } from '../clients/jira/fetchMediaToken';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { fetchMediaToken } from '../clients/confluence/fetchMediaToken';

package/dist/es2019/entry-points/jira-ari.js

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from '../clients/jira/ari';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { rebaseTransaction } from '../common/rebase-transaction';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { ReferenceSyncBlockStoreManager } from '../store-manager/referenceSyncBlockStoreManager';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { requestJiraSpaceAccess } from '../clients/jira/requestJiraIssueAccess';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { parseResourceId, createResourceIdForReference } from '../utils/resourceId';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { SyncBlockInMemorySessionCache, syncBlockInMemorySessionCache } from '../store-manager/syncBlockInMemorySessionCache';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { SyncedBlockProvider, useMemoizedSyncedBlockProvider } from '../providers/syncBlockProvider';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager } from '../store-manager/syncBlockStoreManager';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { fetchTokenForSourceProduct, requiresCrossProductAuth } from '../clients/tokenRouting';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { useFetchSyncBlockData } from '../hooks/useFetchSyncBlockData';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { useFetchSyncBlockTitle } from '../hooks/useFetchSyncBlockTitle';

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { useHandleContentChanges } from '../hooks/useHandleContentChanges';

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

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

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

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { normaliseSyncBlockProduct, normaliseSyncBlockStatus } from '../utils/validValue';

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 } from '../utils/utils';
+import { createSyncBlockNode, productAttrIfGateOn } 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));
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
 
       // Set error state if fetching fails
       setFetchState({

package/dist/es2019/providers/syncBlockProvider.js

@@ -220,8 +220,10 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
           var _this$writeProvider4;
           // Note: `subType`, archived URL handling, and `isUnpublished` are intentionally
           // omitted here — Jira work items have no equivalent page subtype or archived state.
-          // The `localId` param is not forwarded because deep-linking to a specific block
-          // within a Jira issue description is working as intended without it.
+          // The `localId` param is intentionally not forwarded: the current Jira issue view
+          // does not scroll to `#block-{localId}` anchors, so passing it would only pollute
+          // the URL. See the parity-notes JSDoc on `fetchJiraWorkItemInfo` for the full
+          // rationale and the conditions under which this should be revisited.
           const sourceInfo = await fetchJiraWorkItemInfo(ari, hasAccess);
           if (!sourceInfo) {
             return Promise.resolve(undefined);

package/dist/es2019/providers/types.js

@@ -6,6 +6,13 @@ import { NodeDataProvider } from '@atlaskit/node-data-provider';
  * This will be used in both data processing and rendering contexts.
  */
 
+/**
+ * Lightweight metadata for a Jira issue's type, surfaced so consumers can render the
+ * correct ADS issue-type icon (Task / Bug / Story / Epic / Subtask) or fall back to the
+ * AGG-provided `iconUrl` for custom types. Optional throughout — Confluence references
+ * leave it `undefined`.
+ */
+
 /**
  * Configuration options for batch fetch operations
  */

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

@@ -6,7 +6,7 @@ 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 } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe, productAttrIfGateOn } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -218,7 +218,8 @@ export class ReferenceSyncBlockStoreManager {
         sourceURL,
         sourceTitle,
         onSameDocument,
-        sourceSubType
+        sourceSubType,
+        issueType
       } = existingSyncBlock.data || {};
       // skip if source URL and title are already present
       if (sourceURL && sourceTitle) {
@@ -228,12 +229,18 @@ export class ReferenceSyncBlockStoreManager {
           subType: sourceSubType,
           sourceAri: sourceAri || '',
           onSameDocument,
-          productType: product
+          productType: product,
+          issueType
         });
       }
+
+      // 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;
       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));
+        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing', resourceId, sourceProduct));
         return Promise.resolve(undefined);
       }
       (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 ? void 0 : _this$fetchSourceInfo.start({});
@@ -244,7 +251,7 @@ export class ReferenceSyncBlockStoreManager {
           (_this$fetchSourceInfo2 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo2 === void 0 ? void 0 : _this$fetchSourceInfo2.failure({
             reason: 'No source info returned'
           });
-          (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, getSourceInfoErrorPayload('No source info returned', resourceId));
+          (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, getSourceInfoErrorPayload('No source info returned', resourceId, sourceProduct));
           return undefined;
         }
         this.updateCacheWithSourceInfo(resourceId, sourceInfo);
@@ -259,7 +266,7 @@ export class ReferenceSyncBlockStoreManager {
           (_this$fetchSourceInfo4 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo4 === void 0 ? void 0 : _this$fetchSourceInfo4.failure({
             reason: 'Missing title or url'
           });
-          (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, getSourceInfoErrorPayload('Missing title or url', resourceId));
+          (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, getSourceInfoErrorPayload('Missing title or url', resourceId, sourceProduct));
         }
         return sourceInfo;
       }).catch(error => {
@@ -267,7 +274,7 @@ export class ReferenceSyncBlockStoreManager {
         (_this$fetchSourceInfo5 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo5 === void 0 ? void 0 : _this$fetchSourceInfo5.failure({
           reason: error.message
         });
-        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, getSourceInfoErrorPayload(error.message, resourceId));
+        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, getSourceInfoErrorPayload(error.message, resourceId, sourceProduct));
         return undefined;
       }).finally(() => {
         this.syncBlockSourceInfoRequests.delete(resourceId);
@@ -279,7 +286,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));
+      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, getSourceInfoErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
     }
     return Promise.resolve(undefined);
   }
@@ -407,6 +414,7 @@ export class ReferenceSyncBlockStoreManager {
       if (!syncBlockInstance.resourceId) {
         var _syncBlockInstance$er, _syncBlockInstance$er2, _this$fireAnalyticsEv8;
         const payload = ((_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) || 'Returned sync block instance does not have resource id';
+        // No resourceId means we cannot derive a sourceProduct here; intentionally omit.
         (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, fetchErrorPayload(payload));
         return;
       }
@@ -425,8 +433,8 @@ export class ReferenceSyncBlockStoreManager {
         this.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
       }
       if (syncBlockInstance.error) {
-        var _this$fireAnalyticsEv9;
-        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
+        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));
         if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
           hasExpectedError = true;
         } else if (syncBlockInstance.error) {
@@ -437,8 +445,10 @@ export class ReferenceSyncBlockStoreManager {
       const callbacks = this._subscriptionManager.getSubscriptions().get(syncBlockInstance.resourceId);
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
-        var _this$fireAnalyticsEv0, _syncBlockInstance$da;
-        (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = syncBlockInstance.data) === null || _syncBlockInstance$da === void 0 ? void 0 : _syncBlockInstance$da.product));
+        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.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });
@@ -456,7 +466,8 @@ export class ReferenceSyncBlockStoreManager {
         sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
         sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title,
         onSameDocument: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.onSameDocument,
-        sourceSubType: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.subType
+        sourceSubType: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.subType,
+        issueType: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.issueType
       };
       this.updateCache(existingSyncBlock);
     }
@@ -629,6 +640,7 @@ export class ReferenceSyncBlockStoreManager {
       (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 ? void 0 : _this$saveExperience3.failure({
         reason: error.message
       });
+      // No `resourceId` available in this catch — sourceProduct is intentionally omitted.
       (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, updateReferenceErrorPayload(error.message));
     } finally {
       if (!success) {