@atlaskit/editor-synced-block-provider 12.2.6 → 13.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-synced-block-provider
 
+## 13.1.0
+
+### Minor Changes
+
+- [`cf59769ca5527`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cf59769ca5527) -
+  Export `getJiraIssueAriFromSourceAri` and rewrite Jira `issuefieldvalue` source ARIs to the parent
+  issue ARI before AGG `issueById`, object-resolver, and media token requests. Returned metadata
+  keeps the original field-value `sourceAri`. Gated by `editor_synced_blocks_jira_custom_rich_text`.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 12.2.6
 
 ### Patch Changes

package/dist/cjs/clients/jira/ari.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getJiraWorkItemIdFromAri = exports.getJiraWorkItemAri = void 0;
+exports.getJiraWorkItemIdFromAri = exports.getJiraWorkItemAri = exports.getJiraIssueAriFromSourceAri = void 0;
 /* eslint-disable require-unicode-regexp  */
 
 var JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+var JIRA_ISSUE_FIELD_VALUE_ARI_REGEX = /ari:cloud:jira:([^:]+):issuefieldvalue\/([^/]+)\/([^/]+)/;
 
 /**
  * Generates the Jira work item ARI
@@ -19,10 +20,23 @@ var getJiraWorkItemAri = exports.getJiraWorkItemAri = function getJiraWorkItemAr
     workItemId = _ref.workItemId;
   return "ari:cloud:jira:".concat(cloudId, ":issue/").concat(workItemId);
 };
+var getFieldValueAriParts = function getFieldValueAriParts(ari) {
+  var match = ari.match(JIRA_ISSUE_FIELD_VALUE_ARI_REGEX);
+  if (match !== null && match !== void 0 && match[1] && match[2] && match[3]) {
+    return {
+      cloudId: match[1],
+      issueId: match[2],
+      fieldId: match[3]
+    };
+  }
+  return undefined;
+};
 
 /**
- * Extracts the Jira work item ID from the Jira work item ARI
- * @param ari - the Jira work item ARI
+ * Extracts the Jira work item ID from an issue ARI or a field-value source ARI.
+ * Field identity stays on `sourceAri`; callers that need an issue id for AGG
+ * or media must not read `fieldId` from `blockAri`.
+ * @param ari - the Jira issue or issuefieldvalue ARI
  * @returns the Jira work item ID
  */
 var getJiraWorkItemIdFromAri = exports.getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
@@ -31,5 +45,26 @@ var getJiraWorkItemIdFromAri = exports.getJiraWorkItemIdFromAri = function getJi
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }
+  var fieldValueParts = getFieldValueAriParts(ari);
+  if (fieldValueParts) {
+    return fieldValueParts.issueId;
+  }
   throw new Error("Invalid Jira work item ARI: ".concat(ari));
+};
+
+/**
+ * Rewrites a Jira field-value source ARI to the parent issue ARI used by AGG
+ * (`issueById`, media tokens, object-resolver). All other ARIs, including
+ * issue ARIs and unrecognized Media context ids, are returned as-is.
+ */
+var getJiraIssueAriFromSourceAri = exports.getJiraIssueAriFromSourceAri = function getJiraIssueAriFromSourceAri(_ref3) {
+  var ari = _ref3.ari;
+  var fieldValueParts = getFieldValueAriParts(ari);
+  if (fieldValueParts) {
+    return getJiraWorkItemAri({
+      cloudId: fieldValueParts.cloudId,
+      workItemId: fieldValueParts.issueId
+    });
+  }
+  return ari;
 };

package/dist/cjs/clients/jira/fetchMediaToken.js

@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _retry = require("../../utils/retry");
+var _ari = require("./ari");
 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) { (0, _defineProperty2.default)(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; }
 var COMMON_HEADERS = {
@@ -70,16 +71,19 @@ var getJiraMediaReadToken = /*#__PURE__*/function () {
  * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
  * to be rendered in cross-product synced block references (e.g. in Confluence).
  *
- * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @param sourceAri - the Jira issue ARI or field-value source ARI
  * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
  */
 var fetchJiraMediaToken = exports.fetchJiraMediaToken = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(issueAri) {
-    var _response$data, _mediaReadToken$token, _mediaReadToken$token2, response, mediaReadToken, clientId, endpointUrl, token, errorMsg, _t;
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(sourceAri) {
+    var _response$data, _mediaReadToken$token, _mediaReadToken$token2, issueAri, response, mediaReadToken, clientId, endpointUrl, token, errorMsg, _t;
     return _regenerator.default.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
+          issueAri = (0, _ari.getJiraIssueAriFromSourceAri)({
+            ari: sourceAri
+          });
           _context2.next = 1;
           return getJiraMediaReadToken(issueAri);
         case 1:

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

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _retry = require("../../utils/retry");
+var _ari = require("./ari");
 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) { (0, _defineProperty2.default)(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  */
 var COMMON_HEADERS = {
@@ -29,7 +30,7 @@ var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
 // 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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(issueAri) {
     var bodyData, response;
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -38,7 +39,7 @@ var getJiraWorkItemSourceInfo = /*#__PURE__*/function () {
             query: GET_SOURCE_INFO_QUERY,
             operationName: GET_SOURCE_INFO_OPERATION_NAME,
             variables: {
-              id: ari
+              id: issueAri
             }
           };
           _context.next = 1;
@@ -70,7 +71,7 @@ var getJiraWorkItemSourceInfo = /*#__PURE__*/function () {
   };
 }();
 var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(ari) {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(sourceAri, issueAri) {
     var response, _payload$data, _payload$data2, payload, url, title;
     return _regenerator.default.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -83,7 +84,7 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
               Accept: 'application/json'
             },
             body: JSON.stringify({
-              ari: ari
+              ari: issueAri
             })
           });
         case 1:
@@ -101,7 +102,7 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
           return _context2.abrupt("return", {
             url: typeof url === 'string' ? url : undefined,
             title: typeof title === 'string' ? title : undefined,
-            sourceAri: ari
+            sourceAri: sourceAri
           });
         case 3:
           throw new Error("Failed to resolve ari: ".concat(response.statusText));
@@ -111,7 +112,7 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function resolveNoAccessWorkItemInfo(_x2) {
+  return function resolveNoAccessWorkItemInfo(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -138,16 +139,21 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
  */
 var fetchJiraWorkItemInfo = exports.fetchJiraWorkItemInfo = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workItemAri, hasAccess) {
-    var _response$data, _contentData$issueTyp, _contentData$issueTyp2, response, contentData, webUrl, summary, issueTypeName, issueType;
+    var issueAri, _response$data, _contentData$issueTyp, _contentData$issueTyp2, response, contentData, webUrl, summary, issueTypeName, issueType;
     return _regenerator.default.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
+          // AGG `issueById` and object-resolver only understand issue ARIs. Field-value
+          // source ARIs keep their original identity on the returned `sourceAri`.
+          issueAri = (0, _ari.getJiraIssueAriFromSourceAri)({
+            ari: workItemAri
+          });
           if (!hasAccess) {
             _context3.next = 2;
             break;
           }
           _context3.next = 1;
-          return getJiraWorkItemSourceInfo(workItemAri);
+          return getJiraWorkItemSourceInfo(issueAri);
         case 1:
           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;
@@ -168,7 +174,7 @@ var fetchJiraWorkItemInfo = exports.fetchJiraWorkItemInfo = /*#__PURE__*/functio
           }));
         case 2:
           _context3.next = 3;
-          return resolveNoAccessWorkItemInfo(workItemAri);
+          return resolveNoAccessWorkItemInfo(workItemAri, issueAri);
         case 3:
           return _context3.abrupt("return", _context3.sent);
         case 4:
@@ -177,7 +183,7 @@ var fetchJiraWorkItemInfo = exports.fetchJiraWorkItemInfo = /*#__PURE__*/functio
       }
     }, _callee3);
   }));
-  return function fetchJiraWorkItemInfo(_x3, _x4) {
+  return function fetchJiraWorkItemInfo(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();

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

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "getJiraIssueAriFromSourceAri", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getJiraIssueAriFromSourceAri;
+  }
+});
 Object.defineProperty(exports, "getJiraWorkItemAri", {
   enumerable: true,
   get: function get() {

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

@@ -1,6 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
 const JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+const JIRA_ISSUE_FIELD_VALUE_ARI_REGEX = /ari:cloud:jira:([^:]+):issuefieldvalue\/([^/]+)\/([^/]+)/;
 
 /**
  * Generates the Jira work item ARI
@@ -14,10 +15,23 @@ export const getJiraWorkItemAri = ({
 }) => {
   return `ari:cloud:jira:${cloudId}:issue/${workItemId}`;
 };
+const getFieldValueAriParts = ari => {
+  const match = ari.match(JIRA_ISSUE_FIELD_VALUE_ARI_REGEX);
+  if (match !== null && match !== void 0 && match[1] && match[2] && match[3]) {
+    return {
+      cloudId: match[1],
+      issueId: match[2],
+      fieldId: match[3]
+    };
+  }
+  return undefined;
+};
 
 /**
- * Extracts the Jira work item ID from the Jira work item ARI
- * @param ari - the Jira work item ARI
+ * Extracts the Jira work item ID from an issue ARI or a field-value source ARI.
+ * Field identity stays on `sourceAri`; callers that need an issue id for AGG
+ * or media must not read `fieldId` from `blockAri`.
+ * @param ari - the Jira issue or issuefieldvalue ARI
  * @returns the Jira work item ID
  */
 export const getJiraWorkItemIdFromAri = ({
@@ -27,5 +41,27 @@ export const getJiraWorkItemIdFromAri = ({
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }
+  const fieldValueParts = getFieldValueAriParts(ari);
+  if (fieldValueParts) {
+    return fieldValueParts.issueId;
+  }
   throw new Error(`Invalid Jira work item ARI: ${ari}`);
+};
+
+/**
+ * Rewrites a Jira field-value source ARI to the parent issue ARI used by AGG
+ * (`issueById`, media tokens, object-resolver). All other ARIs, including
+ * issue ARIs and unrecognized Media context ids, are returned as-is.
+ */
+export const getJiraIssueAriFromSourceAri = ({
+  ari
+}) => {
+  const fieldValueParts = getFieldValueAriParts(ari);
+  if (fieldValueParts) {
+    return getJiraWorkItemAri({
+      cloudId: fieldValueParts.cloudId,
+      workItemId: fieldValueParts.issueId
+    });
+  }
+  return ari;
 };

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

@@ -1,5 +1,6 @@
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fetchWithRetry } from '../../utils/retry';
+import { getJiraIssueAriFromSourceAri } from './ari';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
@@ -55,12 +56,15 @@ const getJiraMediaReadToken = async issueAri => {
  * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
  * to be rendered in cross-product synced block references (e.g. in Confluence).
  *
- * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @param sourceAri - the Jira issue ARI or field-value source ARI
  * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
  */
-export const fetchJiraMediaToken = async issueAri => {
+export const fetchJiraMediaToken = async sourceAri => {
   try {
     var _response$data, _response$data$jira, _response$data$jira$i, _mediaReadToken$token, _mediaReadToken$token2, _mediaReadToken$token3, _mediaReadToken$token4, _mediaReadToken$token5;
+    const issueAri = getJiraIssueAriFromSourceAri({
+      ari: sourceAri
+    });
     const response = await getJiraMediaReadToken(issueAri);
     const mediaReadToken = (_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$i = _response$data$jira.issueById) === null || _response$data$jira$i === void 0 ? void 0 : _response$data$jira$i.mediaReadToken;
     const clientId = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.clientId;

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

@@ -1,6 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
 import { fetchWithRetry } from '../../utils/retry';
+import { getJiraIssueAriFromSourceAri } from './ari';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
@@ -31,12 +32,12 @@ const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!
 	}
 	}
   }}`;
-const getJiraWorkItemSourceInfo = async ari => {
+const getJiraWorkItemSourceInfo = async issueAri => {
   const bodyData = {
     query: GET_SOURCE_INFO_QUERY,
     operationName: GET_SOURCE_INFO_OPERATION_NAME,
     variables: {
-      id: ari
+      id: issueAri
     }
   };
   const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
@@ -52,7 +53,7 @@ const getJiraWorkItemSourceInfo = async ari => {
   }
   return await response.json();
 };
-const resolveNoAccessWorkItemInfo = async ari => {
+const resolveNoAccessWorkItemInfo = async (sourceAri, issueAri) => {
   const response = await fetch('/gateway/api/object-resolver/resolve/ari', {
     method: 'POST',
     headers: {
@@ -60,7 +61,7 @@ const resolveNoAccessWorkItemInfo = async ari => {
       Accept: 'application/json'
     },
     body: JSON.stringify({
-      ari
+      ari: issueAri
     })
   });
   if (response.ok) {
@@ -71,7 +72,7 @@ const resolveNoAccessWorkItemInfo = async ari => {
     return {
       url: typeof url === 'string' ? url : undefined,
       title: typeof title === 'string' ? title : undefined,
-      sourceAri: ari
+      sourceAri
     };
   } else {
     throw new Error(`Failed to resolve ari: ${response.statusText}`);
@@ -99,9 +100,14 @@ const resolveNoAccessWorkItemInfo = async ari => {
  *   the separate `issueType` field returned alongside `summary` / `webUrl`.
  */
 export const fetchJiraWorkItemInfo = async (workItemAri, hasAccess) => {
+  // AGG `issueById` and object-resolver only understand issue ARIs. Field-value
+  // source ARIs keep their original identity on the returned `sourceAri`.
+  const issueAri = getJiraIssueAriFromSourceAri({
+    ari: workItemAri
+  });
   if (hasAccess) {
     var _response$data, _response$data$jira, _contentData$issueTyp, _contentData$issueTyp2, _contentData$issueTyp3;
-    const response = await getJiraWorkItemSourceInfo(workItemAri);
+    const response = await getJiraWorkItemSourceInfo(issueAri);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$jira = _response$data.jira) === null || _response$data$jira === void 0 ? void 0 : _response$data$jira.issueById;
     const webUrl = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.webUrl) === 'string' ? contentData.webUrl : undefined;
     const summary = typeof (contentData === null || contentData === void 0 ? void 0 : contentData.summary) === 'string' ? contentData.summary : undefined;
@@ -121,6 +127,6 @@ export const fetchJiraWorkItemInfo = async (workItemAri, hasAccess) => {
       issueType
     });
   } else {
-    return await resolveNoAccessWorkItemInfo(workItemAri);
+    return await resolveNoAccessWorkItemInfo(workItemAri, issueAri);
   }
 };

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

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

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

@@ -1,6 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
 var JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+var JIRA_ISSUE_FIELD_VALUE_ARI_REGEX = /ari:cloud:jira:([^:]+):issuefieldvalue\/([^/]+)\/([^/]+)/;
 
 /**
  * Generates the Jira work item ARI
@@ -13,10 +14,23 @@ export var getJiraWorkItemAri = function getJiraWorkItemAri(_ref) {
     workItemId = _ref.workItemId;
   return "ari:cloud:jira:".concat(cloudId, ":issue/").concat(workItemId);
 };
+var getFieldValueAriParts = function getFieldValueAriParts(ari) {
+  var match = ari.match(JIRA_ISSUE_FIELD_VALUE_ARI_REGEX);
+  if (match !== null && match !== void 0 && match[1] && match[2] && match[3]) {
+    return {
+      cloudId: match[1],
+      issueId: match[2],
+      fieldId: match[3]
+    };
+  }
+  return undefined;
+};
 
 /**
- * Extracts the Jira work item ID from the Jira work item ARI
- * @param ari - the Jira work item ARI
+ * Extracts the Jira work item ID from an issue ARI or a field-value source ARI.
+ * Field identity stays on `sourceAri`; callers that need an issue id for AGG
+ * or media must not read `fieldId` from `blockAri`.
+ * @param ari - the Jira issue or issuefieldvalue ARI
  * @returns the Jira work item ID
  */
 export var getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
@@ -25,5 +39,26 @@ export var getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }
+  var fieldValueParts = getFieldValueAriParts(ari);
+  if (fieldValueParts) {
+    return fieldValueParts.issueId;
+  }
   throw new Error("Invalid Jira work item ARI: ".concat(ari));
+};
+
+/**
+ * Rewrites a Jira field-value source ARI to the parent issue ARI used by AGG
+ * (`issueById`, media tokens, object-resolver). All other ARIs, including
+ * issue ARIs and unrecognized Media context ids, are returned as-is.
+ */
+export var getJiraIssueAriFromSourceAri = function getJiraIssueAriFromSourceAri(_ref3) {
+  var ari = _ref3.ari;
+  var fieldValueParts = getFieldValueAriParts(ari);
+  if (fieldValueParts) {
+    return getJiraWorkItemAri({
+      cloudId: fieldValueParts.cloudId,
+      workItemId: fieldValueParts.issueId
+    });
+  }
+  return ari;
 };

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

@@ -5,6 +5,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { fetchWithRetry } from '../../utils/retry';
+import { getJiraIssueAriFromSourceAri } from './ari';
 var COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
@@ -63,16 +64,19 @@ var getJiraMediaReadToken = /*#__PURE__*/function () {
  * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
  * to be rendered in cross-product synced block references (e.g. in Confluence).
  *
- * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @param sourceAri - the Jira issue ARI or field-value source ARI
  * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
  */
 export var fetchJiraMediaToken = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(issueAri) {
-    var _response$data, _mediaReadToken$token, _mediaReadToken$token2, response, mediaReadToken, clientId, endpointUrl, token, errorMsg, _t;
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(sourceAri) {
+    var _response$data, _mediaReadToken$token, _mediaReadToken$token2, issueAri, response, mediaReadToken, clientId, endpointUrl, token, errorMsg, _t;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
+          issueAri = getJiraIssueAriFromSourceAri({
+            ari: sourceAri
+          });
           _context2.next = 1;
           return getJiraMediaReadToken(issueAri);
         case 1:

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

@@ -6,6 +6,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 /* eslint-disable require-unicode-regexp  */
 
 import { fetchWithRetry } from '../../utils/retry';
+import { getJiraIssueAriFromSourceAri } from './ari';
 var COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
@@ -24,7 +25,7 @@ var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
 // 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 _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(issueAri) {
     var bodyData, response;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -33,7 +34,7 @@ var getJiraWorkItemSourceInfo = /*#__PURE__*/function () {
             query: GET_SOURCE_INFO_QUERY,
             operationName: GET_SOURCE_INFO_OPERATION_NAME,
             variables: {
-              id: ari
+              id: issueAri
             }
           };
           _context.next = 1;
@@ -65,7 +66,7 @@ var getJiraWorkItemSourceInfo = /*#__PURE__*/function () {
   };
 }();
 var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ari) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(sourceAri, issueAri) {
     var response, _payload$data, _payload$data2, payload, url, title;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -78,7 +79,7 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
               Accept: 'application/json'
             },
             body: JSON.stringify({
-              ari: ari
+              ari: issueAri
             })
           });
         case 1:
@@ -96,7 +97,7 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
           return _context2.abrupt("return", {
             url: typeof url === 'string' ? url : undefined,
             title: typeof title === 'string' ? title : undefined,
-            sourceAri: ari
+            sourceAri: sourceAri
           });
         case 3:
           throw new Error("Failed to resolve ari: ".concat(response.statusText));
@@ -106,7 +107,7 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function resolveNoAccessWorkItemInfo(_x2) {
+  return function resolveNoAccessWorkItemInfo(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -133,16 +134,21 @@ var resolveNoAccessWorkItemInfo = /*#__PURE__*/function () {
  */
 export var fetchJiraWorkItemInfo = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workItemAri, hasAccess) {
-    var _response$data, _contentData$issueTyp, _contentData$issueTyp2, response, contentData, webUrl, summary, issueTypeName, issueType;
+    var issueAri, _response$data, _contentData$issueTyp, _contentData$issueTyp2, response, contentData, webUrl, summary, issueTypeName, issueType;
     return _regeneratorRuntime.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
+          // AGG `issueById` and object-resolver only understand issue ARIs. Field-value
+          // source ARIs keep their original identity on the returned `sourceAri`.
+          issueAri = getJiraIssueAriFromSourceAri({
+            ari: workItemAri
+          });
           if (!hasAccess) {
             _context3.next = 2;
             break;
           }
           _context3.next = 1;
-          return getJiraWorkItemSourceInfo(workItemAri);
+          return getJiraWorkItemSourceInfo(issueAri);
         case 1:
           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;
@@ -163,7 +169,7 @@ export var fetchJiraWorkItemInfo = /*#__PURE__*/function () {
           }));
         case 2:
           _context3.next = 3;
-          return resolveNoAccessWorkItemInfo(workItemAri);
+          return resolveNoAccessWorkItemInfo(workItemAri, issueAri);
         case 3:
           return _context3.abrupt("return", _context3.sent);
         case 4:
@@ -172,7 +178,7 @@ export var fetchJiraWorkItemInfo = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function fetchJiraWorkItemInfo(_x3, _x4) {
+  return function fetchJiraWorkItemInfo(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();

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

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

package/dist/types/clients/jira/ari.d.ts

@@ -9,10 +9,20 @@ export declare const getJiraWorkItemAri: ({ cloudId, workItemId, }: {
     workItemId: string;
 }) => string;
 /**
- * Extracts the Jira work item ID from the Jira work item ARI
- * @param ari - the Jira work item ARI
+ * Extracts the Jira work item ID from an issue ARI or a field-value source ARI.
+ * Field identity stays on `sourceAri`; callers that need an issue id for AGG
+ * or media must not read `fieldId` from `blockAri`.
+ * @param ari - the Jira issue or issuefieldvalue ARI
  * @returns the Jira work item ID
  */
 export declare const getJiraWorkItemIdFromAri: ({ ari }: {
     ari: string;
 }) => string;
+/**
+ * Rewrites a Jira field-value source ARI to the parent issue ARI used by AGG
+ * (`issueById`, media tokens, object-resolver). All other ARIs, including
+ * issue ARIs and unrecognized Media context ids, are returned as-is.
+ */
+export declare const getJiraIssueAriFromSourceAri: ({ ari }: {
+    ari: string;
+}) => string;

package/dist/types/clients/jira/fetchMediaToken.d.ts

@@ -3,7 +3,7 @@ import type { TokenData } from '../confluence/fetchMediaToken';
  * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
  * to be rendered in cross-product synced block references (e.g. in Confluence).
  *
- * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @param sourceAri - the Jira issue ARI or field-value source ARI
  * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
  */
-export declare const fetchJiraMediaToken: (issueAri: string) => Promise<TokenData>;
+export declare const fetchJiraMediaToken: (sourceAri: string) => Promise<TokenData>;

package/dist/types/entry-points/jira-ari.d.ts

@@ -1 +1 @@
-export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from '../clients/jira/ari';
+export { getJiraIssueAriFromSourceAri, getJiraWorkItemAri, getJiraWorkItemIdFromAri, } from '../clients/jira/ari';

package/package.json

@@ -20,10 +20,10 @@
 		"@atlaskit/browser-apis": "^1.2.0",
 		"@atlaskit/editor-json-transformer": "^9.8.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
-		"@atlaskit/node-data-provider": "^17.0.0",
+		"@atlaskit/node-data-provider": "^18.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^178.0.0",
+		"@atlaskit/tmp-editor-statsig": "^179.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"bind-event-listener": "^3.0.0",
@@ -33,7 +33,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.16.0",
+		"@atlaskit/editor-common": "^121.1.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"devDependencies": {
@@ -42,7 +42,7 @@
 		"react-dom": "^19.2.0"
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "12.2.6",
+	"version": "13.1.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",