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

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

@@ -6,7 +6,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 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 } from '../utils/utils';
+import { convertSyncBlockPMNodeToSyncBlockData, productAttrIfGateOn } from '../utils/utils';
 // 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.
@@ -106,11 +106,13 @@ export class SourceSyncBlockStoreManager {
       }
       return true;
     } catch (error) {
-      var _this$fireAnalyticsEv;
+      var _this$fireAnalyticsEv, _syncBlockNode$attrs, _syncBlockNode$attrs2;
       logException(error, {
         location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, updateCacheErrorPayload(error.message));
+      // 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)));
       return false;
     }
   }
@@ -185,7 +187,7 @@ export class SourceSyncBlockStoreManager {
                 cachedData.status = result.status;
               }
             }
-            (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, updateSuccessPayload(result.resourceId, false));
+            (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, updateSuccessPayload(result.resourceId, false, productAttrIfGateOn(result.resourceId)));
           }
         });
         return true;
@@ -194,7 +196,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));
+          (_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)));
         });
         return false;
       }
@@ -203,6 +205,7 @@ export class SourceSyncBlockStoreManager {
       logException(error, {
         location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
       });
+      // Top-level flush failure is not tied to a single resourceId.
       (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, updateErrorPayload(error.message));
       return false;
     } finally {
@@ -258,16 +261,16 @@ export class SourceSyncBlockStoreManager {
       }
     } 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));
+      (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, createErrorPayload('creation complete callback missing', resourceId, productAttrIfGateOn(resourceId)));
     }
     if (success) {
       var _this$fireAnalyticsEv6;
-      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, createSuccessPayload(resourceId || ''));
+      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, createSuccessPayload(resourceId || '', productAttrIfGateOn(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));
+      (_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)));
     }
   }
   registerConfirmationCallback(callback) {
@@ -346,7 +349,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));
+          (_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)));
         }
       }).catch(error => {
         var _this$createExperienc4, _this$fireAnalyticsEv9;
@@ -357,7 +360,7 @@ 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));
+        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, createErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
       });
     } catch (error) {
       var _this$fireAnalyticsEv0;
@@ -367,7 +370,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));
+      (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, createErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
     }
   }
   async delete(syncBlockIds, onDelete, onDeleteCompleted, reason) {
@@ -395,7 +398,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));
+          (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 ? void 0 : _this$fireAnalyticsEv1.call(this, deleteSuccessPayload(result.resourceId, productAttrIfGateOn(result.resourceId)));
         });
       } else {
         var _this$deleteExperienc3;
@@ -406,10 +409,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));
+            (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 ? void 0 : _this$fireAnalyticsEv10.call(this, deleteSuccessPayload(result.resourceId, productAttrIfGateOn(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));
+            (_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)));
           }
         });
       }
@@ -419,7 +422,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));
+        (_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, deleteErrorPayload(error.message, Ids.resourceId, productAttrIfGateOn(Ids.resourceId)));
       });
       logException(error, {
         location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
@@ -597,7 +600,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));
+      (_this$fireAnalyticsEv14 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv14 === void 0 ? void 0 : _this$fireAnalyticsEv14.call(this, fetchReferencesErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
       return Promise.resolve({
         error: SyncBlockError.Errored
       });

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 } from '../utils/utils';
+import { createSyncBlockNode, productAttrIfGateOn } 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));
+          (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resId, productAttrIfGateOn(resId)));
         });
       });
     });

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

@@ -3,6 +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';
 /**
  * Manages creation and caching of ProviderFactory instances used to
  * render synced block content (media, emoji, smart links, etc.).
@@ -20,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));
+      (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
       return undefined;
     }
     const {
@@ -54,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));
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
       }
     }
     return providerFactory;
@@ -130,8 +131,9 @@ export class SyncBlockProviderFactoryManager {
       return;
     }
     if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
-      var _this$deps$getFireAna3;
-      (_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'));
+      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)));
       return;
     }
     const parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);

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

@@ -5,6 +5,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 { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 
@@ -102,7 +103,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));
+      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, fetchReferencesErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
       return {
         error: SyncBlockError.Errored
       };

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

@@ -1,7 +1,9 @@
 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';
 /**
  * Manages the lifecycle of GraphQL WebSocket subscriptions for sync block
  * real-time updates, owns the subscriptions and titleSubscriptions maps,
@@ -219,7 +221,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));
+      (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
     });
     if (unsubscribe) {
       this.graphqlSubscriptions.set(resourceId, unsubscribe);
@@ -270,14 +272,16 @@ export class SyncBlockSubscriptionManager {
       const callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
-        var _this$deps$getFireAna3, _syncBlockInstance$da;
-        (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = syncBlockInstance.data) === null || _syncBlockInstance$da === void 0 ? void 0 : _syncBlockInstance$da.product));
+        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.fetchSyncBlockSourceInfo(resolved.resourceId);
     } else {
-      var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna4;
+      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));
+      (_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));
     }
   }
 }

package/dist/es2019/utils/errorHandling.js

@@ -6,7 +6,14 @@ export const stringifyError = error => {
     return undefined;
   }
 };
-export const getErrorPayload = (actionSubjectId, error, resourceId) => ({
+
+// `sourceProduct` is threaded through every helper so analytics
+// events can be attributed to the source product (`confluence-page` vs `jira-work-item`).
+// All helpers accept it as an optional trailing argument; the spread-only-when-truthy
+// pattern below ensures we never emit `sourceProduct: undefined` (which would dirty the
+// event schema with empty keys).
+
+export const getErrorPayload = (actionSubjectId, error, resourceId, sourceProduct) => ({
   action: ACTION.ERROR,
   actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
   actionSubjectId,
@@ -15,17 +22,20 @@ export const getErrorPayload = (actionSubjectId, error, resourceId) => ({
     error,
     ...(resourceId && {
       resourceId
+    }),
+    ...(sourceProduct && {
+      sourceProduct
     })
   }
 });
-export const fetchErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error, resourceId);
-export const getSourceInfoErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_GET_SOURCE_INFO, error, resourceId);
-export const updateErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error, resourceId);
-export const updateReferenceErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_UPDATE, error, resourceId);
-export const createErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE, error, resourceId);
-export const deleteErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE, error, resourceId);
-export const updateCacheErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE_CACHE, error, resourceId);
-export const fetchReferencesErrorPayload = (error, resourceId) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH_REFERENCES, error, resourceId);
+export const fetchErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error, resourceId, sourceProduct);
+export const getSourceInfoErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_GET_SOURCE_INFO, error, resourceId, sourceProduct);
+export const updateErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct);
+export const updateReferenceErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct);
+export const createErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE, error, resourceId, sourceProduct);
+export const deleteErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE, error, resourceId, sourceProduct);
+export const updateCacheErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE_CACHE, error, resourceId, sourceProduct);
+export const fetchReferencesErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH_REFERENCES, error, resourceId, sourceProduct);
 
 // Success payloads
 export const fetchSuccessPayload = (resourceId, blockInstanceId, sourceProduct) => ({
@@ -41,14 +51,17 @@ export const fetchSuccessPayload = (resourceId, blockInstanceId, sourceProduct)
     })
   }
 });
-export const createSuccessPayload = resourceId => {
+export const createSuccessPayload = (resourceId, sourceProduct) => {
   return {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.BODIED_SYNCED_BLOCK,
     eventType: EVENT_TYPE.TRACK,
     attributes: {
-      resourceId
+      resourceId,
+      ...(sourceProduct && {
+        sourceProduct
+      })
     }
   };
 };
@@ -61,7 +74,7 @@ export const createSuccessPayloadNew = resourceId => ({
     resourceId
   }
 });
-export const updateSuccessPayload = (resourceId, hasReference) => ({
+export const updateSuccessPayload = (resourceId, hasReference, sourceProduct) => ({
   action: ACTION.UPDATED,
   actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
   actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE,
@@ -70,15 +83,21 @@ export const updateSuccessPayload = (resourceId, hasReference) => ({
     resourceId,
     ...(hasReference !== undefined && {
       hasReference
+    }),
+    ...(sourceProduct && {
+      sourceProduct
     })
   }
 });
-export const deleteSuccessPayload = resourceId => ({
+export const deleteSuccessPayload = (resourceId, sourceProduct) => ({
   action: ACTION.DELETED,
   actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
   actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE,
   eventType: EVENT_TYPE.OPERATIONAL,
   attributes: {
-    resourceId
+    resourceId,
+    ...(sourceProduct && {
+      sourceProduct
+    })
   }
 });

package/dist/es2019/utils/resolveSyncBlockInstance.js

@@ -12,7 +12,7 @@ import { SyncBlockError } from '../common/types';
  * @returns A merged SyncBlockInstance object.
  */
 export const resolveSyncBlockInstance = (oldResult, newResult) => {
-  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3;
+  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;
@@ -34,30 +34,31 @@ export const resolveSyncBlockInstance = (oldResult, newResult) => {
       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
     }
   };
 };
 const 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;
       const {
         type: pageType
       } = 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
       });
       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 {}
   }
-  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/es2019/utils/utils.js

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
 export const convertSyncBlockPMNodeToSyncBlockData = node => {
   return {
     blockInstanceId: node.attrs.localId,
@@ -48,6 +49,31 @@ export const getContentIdAndProductFromResourceId = resourceId => {
   }
   throw new Error(`Invalid resourceId: ${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.
+ */
+export const getSourceProductFromResourceIdSafe = resourceId => {
+  if (!resourceId) {
+    return undefined;
+  }
+  try {
+    return getContentIdAndProductFromResourceId(resourceId).sourceProduct;
+  } catch {
+    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,7 +20,11 @@ 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
  */
-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    }\n  }}");
+// `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  }}");
 var getJiraWorkItemSourceInfo = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ari) {
     var bodyData, response;
@@ -108,34 +112,82 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
+
+/**
+ * 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 var fetchJiraWorkItemInfo = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workItemAri, hasAccess) {
-    var _response$data, response, contentData, webUrl, summary;
+    var _response$data, _contentData$webUrl, _contentData$summary, response, contentData, _rawIssueType$avatar, _webUrl, _summary, rawIssueType, issueTypeName, issueType, webUrl, summary;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (!hasAccess) {
-            _context3.next = 10;
+            _context3.next = 17;
             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;
-          webUrl = contentData === null || contentData === void 0 ? void 0 : contentData.webUrl;
-          summary = contentData === null || contentData === void 0 ? void 0 : contentData.summary;
+          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 ? {
+            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
+          } : undefined;
+          return _context3.abrupt("return", Promise.resolve({
+            url: _webUrl,
+            sourceAri: workItemAri,
+            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 10:
-          _context3.next = 12;
+        case 17:
+          _context3.next = 19;
           return resolveNoAccessWorkItemInfo(workItemAri);
-        case 12:
+        case 19:
           return _context3.abrupt("return", _context3.sent);
-        case 13:
+        case 20:
         case "end":
           return _context3.stop();
       }

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

package/dist/esm/providers/types.js

@@ -13,6 +13,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
  */