@atlaskit/link-datasource 1.19.21 → 1.19.22

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.19.22
+
+### Patch Changes
+
+- [#59059](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59059) [`9b56935315f5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9b56935315f5) - Add logic to append selected site url to dropdown icon urls if they are not absolute urls.
+
 ## 1.19.21
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.21"
+  packageVersion: "1.19.22"
 };

package/dist/cjs/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useFilterOptions = exports.getAssigneeUnassignedFilterOption = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
@@ -14,6 +15,8 @@ var _reactIntlNext = require("react-intl-next");
 var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
 var _transformers = require("../utils/transformers");
 var _messages = require("./messages");
+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 getAssigneeUnassignedFilterOption = exports.getAssigneeUnassignedFilterOption = function getAssigneeUnassignedFilterOption(formatMessage) {
   return {
     label: formatMessage(_messages.filterOptionMessages.assigneeUnassignedFilterOption),
@@ -23,7 +26,7 @@ var getAssigneeUnassignedFilterOption = exports.getAssigneeUnassignedFilterOptio
 };
 var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref) {
   var filterType = _ref.filterType,
-    cloudId = _ref.cloudId;
+    site = _ref.site;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useState = (0, _react.useState)([]),
@@ -47,10 +50,13 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
     nextPageCursor = _useState10[0],
     setNextPageCursor = _useState10[1];
   var initialData = (0, _react.useRef)();
+  var _ref2 = site || {},
+    cloudId = _ref2.cloudId,
+    siteUrl = _ref2.url;
   var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
     getFieldValues = _useBasicFilterAGG.getFieldValues;
   var fetchFilterOptions = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var _ref3,
+    var _ref4,
       pageCursor,
       searchString,
       isNewSearch,
@@ -63,21 +69,27 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref3.pageCursor, searchString = _ref3.searchString;
+          _ref4 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref4.pageCursor, searchString = _ref4.searchString;
+          if (cloudId) {
+            _context.next = 3;
+            break;
+          }
+          return _context.abrupt("return");
+        case 3:
           isNewSearch = !pageCursor;
           isNewSearch ? setStatus('loading') : setStatus('loadingMore');
           isRequestLikeInitialSearch = !pageCursor && !searchString;
           initialResponseData = initialData.current;
-          _context.prev = 5;
+          _context.prev = 7;
           if (!(isRequestLikeInitialSearch && initialResponseData)) {
-            _context.next = 10;
+            _context.next = 12;
             break;
           }
           _context.t0 = initialResponseData;
-          _context.next = 13;
+          _context.next = 15;
           break;
-        case 10:
-          _context.next = 12;
+        case 12:
+          _context.next = 14;
           return getFieldValues({
             cloudId: cloudId,
             jql: '',
@@ -85,19 +97,21 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
             searchString: searchString,
             pageCursor: pageCursor
           });
-        case 12:
+        case 14:
           _context.t0 = _context.sent;
-        case 13:
+        case 15:
           response = _context.t0;
           if (!(response.errors && response.errors.length > 0)) {
-            _context.next = 18;
+            _context.next = 20;
             break;
           }
           setStatus('rejected');
           setErrors(response.errors);
           return _context.abrupt("return");
-        case 18:
-          mappedResponse = (0, _transformers.mapFieldValuesToFilterOptions)(response);
+        case 20:
+          mappedResponse = (0, _transformers.mapFieldValuesToFilterOptions)(_objectSpread(_objectSpread({}, response), {}, {
+            siteUrl: siteUrl
+          }));
           mappedTotalCount = (0, _transformers.mapFieldValuesToTotalCount)(response);
           if (isNewSearch) {
             if (isRequestLikeInitialSearch) {
@@ -123,19 +137,19 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
           setTotalCount(mappedTotalCount);
           setNextPageCursor((0, _transformers.mapFieldValuesToPageCursor)(response));
           setStatus('resolved');
-          _context.next = 30;
+          _context.next = 32;
           break;
-        case 26:
-          _context.prev = 26;
-          _context.t1 = _context["catch"](5);
+        case 28:
+          _context.prev = 28;
+          _context.t1 = _context["catch"](7);
           setStatus('rejected');
           setErrors([_context.t1]);
-        case 30:
+        case 32:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 26]]);
-  })), [cloudId, filterOptions, filterType, formatMessage, getFieldValues]);
+    }, _callee, null, [[7, 28]]);
+  })), [cloudId, filterOptions, filterType, formatMessage, getFieldValues, siteUrl]);
   (0, _react.useEffect)(function () {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -36,7 +36,7 @@ var noFilterOptions = function noFilterOptions() {
 var SEARCH_DEBOUNCE_MS = exports.SEARCH_DEBOUNCE_MS = 350;
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
-    cloudId = _ref.cloudId,
+    site = _ref.site,
     selection = _ref.selection,
     isJQLHydrating = _ref.isJQLHydrating,
     _ref$onSelectionChang = _ref.onSelectionChange,
@@ -59,12 +59,14 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     sortedOptions = _useState6[0],
     setSortedOptions = _useState6[1];
-  var currentSiteCloudId = (0, _react.useRef)(cloudId);
+  var _ref2 = site || {},
+    cloudId = _ref2.cloudId;
+  var currentSiteCloudId = (0, _react.useRef)(cloudId || '');
   var sortPaginatedResults = (0, _react.useRef)(false); // this is to track pagination for sorting purpose
 
   var _useFilterOptions = (0, _useFilterOptions2.useFilterOptions)({
       filterType: filterType,
-      cloudId: cloudId
+      site: site
     }),
     filterOptions = _useFilterOptions.filterOptions,
     fetchFilterOptions = _useFilterOptions.fetchFilterOptions,
@@ -81,7 +83,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
   var handleInputChange = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newSearchTerm, actionMeta) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newSearchTerm, actionMeta) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -96,7 +98,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       }, _callee);
     }));
     return function (_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }(), [handleDebouncedFetchFilterOptions, searchTerm]);
   var handleOptionSelection = (0, _react.useCallback)(function (newValue) {
@@ -195,7 +197,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   }, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
 
   (0, _react.useEffect)(function () {
-    if (currentSiteCloudId.current !== cloudId) {
+    if (cloudId && currentSiteCloudId.current !== cloudId) {
       currentSiteCloudId.current = cloudId;
       setSortedOptions([]);
       setSearchTerm('');
@@ -262,9 +264,9 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     onInputChange: handleInputChange,
     onOpen: handleMenuOpen,
     onClose: handleMenuClose,
-    target: function target(_ref3) {
-      var isOpen = _ref3.isOpen,
-        triggerProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
+    target: function target(_ref4) {
+      var isOpen = _ref4.isOpen,
+        triggerProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
       return /*#__PURE__*/_react.default.createElement(_trigger.default, (0, _extends2.default)({}, triggerProps, {
         filterType: filterType,
         selectedOptions: selectedOptions,

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -18,13 +18,15 @@ var basicFilterContainerStyles = (0, _primitives.xcss)({
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,
-    cloudId = _ref.cloudId,
+    site = _ref.site,
     onChange = _ref.onChange,
     selections = _ref.selections,
     isJQLHydrating = _ref.isJQLHydrating;
   var extractedFilterValues = (0, _react.useMemo)(function () {
     return isJQLHydrating ? (0, _extractValuesFromNonComplexJQL.extractValuesFromNonComplexJQL)(jql) : {};
   }, [isJQLHydrating, jql]);
+  var _ref2 = site || {},
+    cloudId = _ref2.cloudId;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
@@ -33,7 +35,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
     var _extractedFilterValue;
     var shouldShowHydrationLoader = isJQLHydrating && ((_extractedFilterValue = extractedFilterValues[filter]) === null || _extractedFilterValue === void 0 ? void 0 : _extractedFilterValue.length) > 0;
     return /*#__PURE__*/_react.default.createElement(_asyncPopupSelect.default, {
-      cloudId: cloudId,
+      site: site,
       filterType: filter,
       key: filter,
       selection: selections[filter] || [],

package/dist/cjs/ui/jira-issues-modal/basic-filters/utils/transformers.js

@@ -24,6 +24,15 @@ var getLozengeAppearance = function getLozengeAppearance(colorName) {
     return _types.appearanceMap[colorName];
   }
 };
+var checkAndConvertToAbsoluteUrl = function checkAndConvertToAbsoluteUrl(url, siteUrl) {
+  if (!url) {
+    return '';
+  }
+  if (/^data:(.*)/.test(url) || /^http(.*)/.test(url) || !siteUrl) {
+    return url;
+  }
+  return "".concat(siteUrl).concat(url);
+};
 function mapNodeToOption(_ref) {
   var displayName = _ref.displayName,
     jqlTerm = _ref.jqlTerm,
@@ -31,7 +40,8 @@ function mapNodeToOption(_ref) {
     issueTypes = _ref.issueTypes,
     project = _ref.project,
     statusCategory = _ref.statusCategory,
-    user = _ref.user;
+    user = _ref.user,
+    siteUrl = _ref.siteUrl;
   try {
     var baseProps = {
       label: displayName,
@@ -56,14 +66,14 @@ function mapNodeToOption(_ref) {
       var _project$avatar;
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'iconLabel',
-        icon: (_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small, siteUrl)
       });
     }
     if (issueTypes) {
       var _issueTypes$;
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'iconLabel',
-        icon: (_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small, siteUrl)
       });
     }
     if (statusCategory) {
@@ -102,9 +112,12 @@ function mapHydrateResponseData(_ref2) {
 }
 function mapFieldValuesToFilterOptions(_ref5) {
   var _data$jira2;
-  var data = _ref5.data;
+  var data = _ref5.data,
+    siteUrl = _ref5.siteUrl;
   return (data === null || data === void 0 || (_data$jira2 = data.jira) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.jqlBuilder) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.fieldValues) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.edges) === null || _data$jira2 === void 0 ? void 0 : _data$jira2.map(function (edge) {
-    return edge.node ? mapNodeToOption(edge.node) : null;
+    return edge.node ? mapNodeToOption(_objectSpread(_objectSpread({}, edge.node), {}, {
+      siteUrl: siteUrl
+    })) : null;
   }).filter(isNonNullSelectOption)) || [];
 }
 function mapFieldValuesToTotalCount(_ref6) {

package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js

@@ -48,7 +48,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     initialSearchMethod = props.initialSearchMethod,
     setSearchBarJql = props.setSearchBarJql,
     _props$searchBarJql = props.searchBarJql,
-    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql;
+    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql,
+    site = props.site;
   var _ref = parameters || {},
     currentCloudId = _ref.cloudId;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -228,7 +229,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     searchTerm: basicSearchTerm
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
     jql: searchBarJql,
-    cloudId: cloudId || '',
+    site: site,
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -570,7 +570,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     parameters: parameters,
     onSearch: onSearch,
     initialSearchMethod: initialSearchMethod,
-    onSearchMethodChange: setCurrentSearchMethod
+    onSearchMethodChange: setCurrentSearchMethod,
+    site: selectedJiraSite
   }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, null)), (0, _react2.jsx)(_modalDialog.ModalFooter, null, shouldShowIssueCount && (0, _react2.jsx)("div", {
     "data-testid": "jira-jql-datasource-modal-total-issues-count",
     css: issueCountStyles

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.21"
+  packageVersion: "1.19.22"
 };

package/dist/es2019/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.js

@@ -10,7 +10,7 @@ export const getAssigneeUnassignedFilterOption = formatMessage => ({
 });
 export const useFilterOptions = ({
   filterType,
-  cloudId
+  site
 }) => {
   const {
     formatMessage
@@ -21,6 +21,10 @@ export const useFilterOptions = ({
   const [errors, setErrors] = useState([]);
   const [nextPageCursor, setNextPageCursor] = useState(undefined);
   const initialData = useRef();
+  const {
+    cloudId,
+    url: siteUrl
+  } = site || {};
   const {
     getFieldValues
   } = useBasicFilterAGG();
@@ -28,6 +32,9 @@ export const useFilterOptions = ({
     pageCursor,
     searchString
   } = {}) => {
+    if (!cloudId) {
+      return;
+    }
     const isNewSearch = !pageCursor;
     isNewSearch ? setStatus('loading') : setStatus('loadingMore');
     const isRequestLikeInitialSearch = !pageCursor && !searchString;
@@ -47,7 +54,10 @@ export const useFilterOptions = ({
         setErrors(response.errors);
         return;
       }
-      const mappedResponse = mapFieldValuesToFilterOptions(response);
+      const mappedResponse = mapFieldValuesToFilterOptions({
+        ...response,
+        siteUrl
+      });
       let mappedTotalCount = mapFieldValuesToTotalCount(response);
       if (isNewSearch) {
         if (isRequestLikeInitialSearch) {
@@ -77,7 +87,7 @@ export const useFilterOptions = ({
       setStatus('rejected');
       setErrors([error]);
     }
-  }, [cloudId, filterOptions, filterType, formatMessage, getFieldValues]);
+  }, [cloudId, filterOptions, filterType, formatMessage, getFieldValues, siteUrl]);
   useEffect(() => {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -18,7 +18,7 @@ const noFilterOptions = () => true;
 export const SEARCH_DEBOUNCE_MS = 350;
 const AsyncPopupSelect = ({
   filterType,
-  cloudId,
+  site,
   selection,
   isJQLHydrating,
   onSelectionChange = () => {},
@@ -33,7 +33,10 @@ const AsyncPopupSelect = ({
   const [searchTerm, setSearchTerm] = useState('');
   const [selectedOptions, setSelectedOptions] = useState(selection);
   const [sortedOptions, setSortedOptions] = useState([]);
-  const currentSiteCloudId = useRef(cloudId);
+  const {
+    cloudId
+  } = site || {};
+  const currentSiteCloudId = useRef(cloudId || '');
   const sortPaginatedResults = useRef(false); // this is to track pagination for sorting purpose
 
   const {
@@ -46,7 +49,7 @@ const AsyncPopupSelect = ({
     errors
   } = useFilterOptions({
     filterType,
-    cloudId
+    site
   });
   const [handleDebouncedFetchFilterOptions] = useDebouncedCallback(searchString => {
     fetchFilterOptions({
@@ -147,7 +150,7 @@ const AsyncPopupSelect = ({
   }, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
 
   useEffect(() => {
-    if (currentSiteCloudId.current !== cloudId) {
+    if (cloudId && currentSiteCloudId.current !== cloudId) {
       currentSiteCloudId.current = cloudId;
       setSortedOptions([]);
       setSearchTerm('');

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -8,12 +8,15 @@ const basicFilterContainerStyles = xcss({
 });
 const BasicFilterContainer = ({
   jql,
-  cloudId,
+  site,
   onChange,
   selections,
   isJQLHydrating
 }) => {
   const extractedFilterValues = useMemo(() => isJQLHydrating ? extractValuesFromNonComplexJQL(jql) : {}, [isJQLHydrating, jql]);
+  const {
+    cloudId
+  } = site || {};
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
@@ -22,7 +25,7 @@ const BasicFilterContainer = ({
     var _extractedFilterValue;
     const shouldShowHydrationLoader = isJQLHydrating && ((_extractedFilterValue = extractedFilterValues[filter]) === null || _extractedFilterValue === void 0 ? void 0 : _extractedFilterValue.length) > 0;
     return /*#__PURE__*/React.createElement(AsyncPopupSelect, {
-      cloudId: cloudId,
+      site: site,
       filterType: filter,
       key: filter,
       selection: selections[filter] || [],

package/dist/es2019/ui/jira-issues-modal/basic-filters/utils/transformers.js

@@ -11,6 +11,15 @@ const getLozengeAppearance = colorName => {
     return appearanceMap[colorName];
   }
 };
+const checkAndConvertToAbsoluteUrl = (url, siteUrl) => {
+  if (!url) {
+    return '';
+  }
+  if (/^data:(.*)/.test(url) || /^http(.*)/.test(url) || !siteUrl) {
+    return url;
+  }
+  return `${siteUrl}${url}`;
+};
 function mapNodeToOption({
   displayName,
   jqlTerm,
@@ -18,7 +27,8 @@ function mapNodeToOption({
   issueTypes,
   project,
   statusCategory,
-  user
+  user,
+  siteUrl
 }) {
   try {
     const baseProps = {
@@ -47,7 +57,7 @@ function mapNodeToOption({
       return {
         ...baseProps,
         optionType: 'iconLabel',
-        icon: (_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small, siteUrl)
       };
     }
     if (issueTypes) {
@@ -55,7 +65,7 @@ function mapNodeToOption({
       return {
         ...baseProps,
         optionType: 'iconLabel',
-        icon: (_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small, siteUrl)
       };
     }
     if (statusCategory) {
@@ -94,10 +104,14 @@ export function mapHydrateResponseData({
   return transformedHydrateResponseData;
 }
 export function mapFieldValuesToFilterOptions({
-  data
+  data,
+  siteUrl
 }) {
   var _data$jira2, _data$jira2$jqlBuilde, _data$jira2$jqlBuilde2, _data$jira2$jqlBuilde3;
-  return (data === null || data === void 0 ? void 0 : (_data$jira2 = data.jira) === null || _data$jira2 === void 0 ? void 0 : (_data$jira2$jqlBuilde = _data$jira2.jqlBuilder) === null || _data$jira2$jqlBuilde === void 0 ? void 0 : (_data$jira2$jqlBuilde2 = _data$jira2$jqlBuilde.fieldValues) === null || _data$jira2$jqlBuilde2 === void 0 ? void 0 : (_data$jira2$jqlBuilde3 = _data$jira2$jqlBuilde2.edges) === null || _data$jira2$jqlBuilde3 === void 0 ? void 0 : _data$jira2$jqlBuilde3.map(edge => edge.node ? mapNodeToOption(edge.node) : null).filter(isNonNullSelectOption)) || [];
+  return (data === null || data === void 0 ? void 0 : (_data$jira2 = data.jira) === null || _data$jira2 === void 0 ? void 0 : (_data$jira2$jqlBuilde = _data$jira2.jqlBuilder) === null || _data$jira2$jqlBuilde === void 0 ? void 0 : (_data$jira2$jqlBuilde2 = _data$jira2$jqlBuilde.fieldValues) === null || _data$jira2$jqlBuilde2 === void 0 ? void 0 : (_data$jira2$jqlBuilde3 = _data$jira2$jqlBuilde2.edges) === null || _data$jira2$jqlBuilde3 === void 0 ? void 0 : _data$jira2$jqlBuilde3.map(edge => edge.node ? mapNodeToOption({
+    ...edge.node,
+    siteUrl
+  }) : null).filter(isNonNullSelectOption)) || [];
 }
 export function mapFieldValuesToTotalCount({
   data

package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js

@@ -33,7 +33,8 @@ export const JiraSearchContainer = props => {
     onSearchMethodChange: onSearchMethodChangeCallback,
     initialSearchMethod,
     setSearchBarJql,
-    searchBarJql = DEFAULT_JQL_QUERY
+    searchBarJql = DEFAULT_JQL_QUERY,
+    site
   } = props;
   const {
     cloudId: currentCloudId
@@ -194,7 +195,7 @@ export const JiraSearchContainer = props => {
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
     jql: searchBarJql,
-    cloudId: cloudId || '',
+    site: site,
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -518,7 +518,8 @@ export const PlainJiraIssuesConfigModal = props => {
     parameters: parameters,
     onSearch: onSearch,
     initialSearchMethod: initialSearchMethod,
-    onSearchMethodChange: setCurrentSearchMethod
+    onSearchMethodChange: setCurrentSearchMethod,
+    site: selectedJiraSite
   }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, null)), jsx(ModalFooter, null, shouldShowIssueCount && jsx("div", {
     "data-testid": "jira-jql-datasource-modal-total-issues-count",
     css: issueCountStyles

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.21"
+  packageVersion: "1.19.22"
 };

package/dist/esm/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.js

@@ -1,7 +1,10 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
@@ -16,7 +19,7 @@ export var getAssigneeUnassignedFilterOption = function getAssigneeUnassignedFil
 };
 export var useFilterOptions = function useFilterOptions(_ref) {
   var filterType = _ref.filterType,
-    cloudId = _ref.cloudId;
+    site = _ref.site;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useState = useState([]),
@@ -40,10 +43,13 @@ export var useFilterOptions = function useFilterOptions(_ref) {
     nextPageCursor = _useState10[0],
     setNextPageCursor = _useState10[1];
   var initialData = useRef();
+  var _ref2 = site || {},
+    cloudId = _ref2.cloudId,
+    siteUrl = _ref2.url;
   var _useBasicFilterAGG = useBasicFilterAGG(),
     getFieldValues = _useBasicFilterAGG.getFieldValues;
   var fetchFilterOptions = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var _ref3,
+    var _ref4,
       pageCursor,
       searchString,
       isNewSearch,
@@ -56,21 +62,27 @@ export var useFilterOptions = function useFilterOptions(_ref) {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref3.pageCursor, searchString = _ref3.searchString;
+          _ref4 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref4.pageCursor, searchString = _ref4.searchString;
+          if (cloudId) {
+            _context.next = 3;
+            break;
+          }
+          return _context.abrupt("return");
+        case 3:
           isNewSearch = !pageCursor;
           isNewSearch ? setStatus('loading') : setStatus('loadingMore');
           isRequestLikeInitialSearch = !pageCursor && !searchString;
           initialResponseData = initialData.current;
-          _context.prev = 5;
+          _context.prev = 7;
           if (!(isRequestLikeInitialSearch && initialResponseData)) {
-            _context.next = 10;
+            _context.next = 12;
             break;
           }
           _context.t0 = initialResponseData;
-          _context.next = 13;
+          _context.next = 15;
           break;
-        case 10:
-          _context.next = 12;
+        case 12:
+          _context.next = 14;
           return getFieldValues({
             cloudId: cloudId,
             jql: '',
@@ -78,19 +90,21 @@ export var useFilterOptions = function useFilterOptions(_ref) {
             searchString: searchString,
             pageCursor: pageCursor
           });
-        case 12:
+        case 14:
           _context.t0 = _context.sent;
-        case 13:
+        case 15:
           response = _context.t0;
           if (!(response.errors && response.errors.length > 0)) {
-            _context.next = 18;
+            _context.next = 20;
             break;
           }
           setStatus('rejected');
           setErrors(response.errors);
           return _context.abrupt("return");
-        case 18:
-          mappedResponse = mapFieldValuesToFilterOptions(response);
+        case 20:
+          mappedResponse = mapFieldValuesToFilterOptions(_objectSpread(_objectSpread({}, response), {}, {
+            siteUrl: siteUrl
+          }));
           mappedTotalCount = mapFieldValuesToTotalCount(response);
           if (isNewSearch) {
             if (isRequestLikeInitialSearch) {
@@ -116,19 +130,19 @@ export var useFilterOptions = function useFilterOptions(_ref) {
           setTotalCount(mappedTotalCount);
           setNextPageCursor(mapFieldValuesToPageCursor(response));
           setStatus('resolved');
-          _context.next = 30;
+          _context.next = 32;
           break;
-        case 26:
-          _context.prev = 26;
-          _context.t1 = _context["catch"](5);
+        case 28:
+          _context.prev = 28;
+          _context.t1 = _context["catch"](7);
           setStatus('rejected');
           setErrors([_context.t1]);
-        case 30:
+        case 32:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 26]]);
-  })), [cloudId, filterOptions, filterType, formatMessage, getFieldValues]);
+    }, _callee, null, [[7, 28]]);
+  })), [cloudId, filterOptions, filterType, formatMessage, getFieldValues, siteUrl]);
   useEffect(function () {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -26,7 +26,7 @@ var noFilterOptions = function noFilterOptions() {
 export var SEARCH_DEBOUNCE_MS = 350;
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
-    cloudId = _ref.cloudId,
+    site = _ref.site,
     selection = _ref.selection,
     isJQLHydrating = _ref.isJQLHydrating,
     _ref$onSelectionChang = _ref.onSelectionChange,
@@ -49,12 +49,14 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     sortedOptions = _useState6[0],
     setSortedOptions = _useState6[1];
-  var currentSiteCloudId = useRef(cloudId);
+  var _ref2 = site || {},
+    cloudId = _ref2.cloudId;
+  var currentSiteCloudId = useRef(cloudId || '');
   var sortPaginatedResults = useRef(false); // this is to track pagination for sorting purpose
 
   var _useFilterOptions = useFilterOptions({
       filterType: filterType,
-      cloudId: cloudId
+      site: site
     }),
     filterOptions = _useFilterOptions.filterOptions,
     fetchFilterOptions = _useFilterOptions.fetchFilterOptions,
@@ -71,7 +73,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
     handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
   var handleInputChange = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(newSearchTerm, actionMeta) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(newSearchTerm, actionMeta) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -86,7 +88,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       }, _callee);
     }));
     return function (_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }(), [handleDebouncedFetchFilterOptions, searchTerm]);
   var handleOptionSelection = useCallback(function (newValue) {
@@ -185,7 +187,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   }, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
 
   useEffect(function () {
-    if (currentSiteCloudId.current !== cloudId) {
+    if (cloudId && currentSiteCloudId.current !== cloudId) {
       currentSiteCloudId.current = cloudId;
       setSortedOptions([]);
       setSearchTerm('');
@@ -252,9 +254,9 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     onInputChange: handleInputChange,
     onOpen: handleMenuOpen,
     onClose: handleMenuClose,
-    target: function target(_ref3) {
-      var isOpen = _ref3.isOpen,
-        triggerProps = _objectWithoutProperties(_ref3, _excluded);
+    target: function target(_ref4) {
+      var isOpen = _ref4.isOpen,
+        triggerProps = _objectWithoutProperties(_ref4, _excluded);
       return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, triggerProps, {
         filterType: filterType,
         selectedOptions: selectedOptions,

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -8,13 +8,15 @@ var basicFilterContainerStyles = xcss({
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,
-    cloudId = _ref.cloudId,
+    site = _ref.site,
     onChange = _ref.onChange,
     selections = _ref.selections,
     isJQLHydrating = _ref.isJQLHydrating;
   var extractedFilterValues = useMemo(function () {
     return isJQLHydrating ? extractValuesFromNonComplexJQL(jql) : {};
   }, [isJQLHydrating, jql]);
+  var _ref2 = site || {},
+    cloudId = _ref2.cloudId;
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
@@ -23,7 +25,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
     var _extractedFilterValue;
     var shouldShowHydrationLoader = isJQLHydrating && ((_extractedFilterValue = extractedFilterValues[filter]) === null || _extractedFilterValue === void 0 ? void 0 : _extractedFilterValue.length) > 0;
     return /*#__PURE__*/React.createElement(AsyncPopupSelect, {
-      cloudId: cloudId,
+      site: site,
       filterType: filter,
       key: filter,
       selection: selections[filter] || [],

package/dist/esm/ui/jira-issues-modal/basic-filters/utils/transformers.js

@@ -14,6 +14,15 @@ var getLozengeAppearance = function getLozengeAppearance(colorName) {
     return appearanceMap[colorName];
   }
 };
+var checkAndConvertToAbsoluteUrl = function checkAndConvertToAbsoluteUrl(url, siteUrl) {
+  if (!url) {
+    return '';
+  }
+  if (/^data:(.*)/.test(url) || /^http(.*)/.test(url) || !siteUrl) {
+    return url;
+  }
+  return "".concat(siteUrl).concat(url);
+};
 function mapNodeToOption(_ref) {
   var displayName = _ref.displayName,
     jqlTerm = _ref.jqlTerm,
@@ -21,7 +30,8 @@ function mapNodeToOption(_ref) {
     issueTypes = _ref.issueTypes,
     project = _ref.project,
     statusCategory = _ref.statusCategory,
-    user = _ref.user;
+    user = _ref.user,
+    siteUrl = _ref.siteUrl;
   try {
     var baseProps = {
       label: displayName,
@@ -46,14 +56,14 @@ function mapNodeToOption(_ref) {
       var _project$avatar;
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'iconLabel',
-        icon: (_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small, siteUrl)
       });
     }
     if (issueTypes) {
       var _issueTypes$;
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'iconLabel',
-        icon: (_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small, siteUrl)
       });
     }
     if (statusCategory) {
@@ -92,9 +102,12 @@ export function mapHydrateResponseData(_ref2) {
 }
 export function mapFieldValuesToFilterOptions(_ref5) {
   var _data$jira2;
-  var data = _ref5.data;
+  var data = _ref5.data,
+    siteUrl = _ref5.siteUrl;
   return (data === null || data === void 0 || (_data$jira2 = data.jira) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.jqlBuilder) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.fieldValues) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.edges) === null || _data$jira2 === void 0 ? void 0 : _data$jira2.map(function (edge) {
-    return edge.node ? mapNodeToOption(edge.node) : null;
+    return edge.node ? mapNodeToOption(_objectSpread(_objectSpread({}, edge.node), {}, {
+      siteUrl: siteUrl
+    })) : null;
   }).filter(isNonNullSelectOption)) || [];
 }
 export function mapFieldValuesToTotalCount(_ref6) {

package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js

@@ -39,7 +39,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     initialSearchMethod = props.initialSearchMethod,
     setSearchBarJql = props.setSearchBarJql,
     _props$searchBarJql = props.searchBarJql,
-    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql;
+    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql,
+    site = props.site;
   var _ref = parameters || {},
     currentCloudId = _ref.cloudId;
   var _useIntl = useIntl(),
@@ -219,7 +220,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
     jql: searchBarJql,
-    cloudId: cloudId || '',
+    site: site,
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -561,7 +561,8 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     parameters: parameters,
     onSearch: onSearch,
     initialSearchMethod: initialSearchMethod,
-    onSearchMethodChange: setCurrentSearchMethod
+    onSearchMethodChange: setCurrentSearchMethod,
+    site: selectedJiraSite
   }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, null)), jsx(ModalFooter, null, shouldShowIssueCount && jsx("div", {
     "data-testid": "jira-jql-datasource-modal-total-issues-count",
     css: issueCountStyles

package/dist/types/services/getAvailableJiraSites.d.ts

@@ -1,6 +1,2 @@
-export interface Site {
-    cloudId: string;
-    displayName: string;
-    url: string;
-}
+import type { Site } from '../ui/jira-issues-modal/types';
 export declare const getAvailableJiraSites: () => Promise<Site[]>;

package/dist/types/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts

@@ -1,8 +1,9 @@
 import { IntlShape } from 'react-intl-next';
+import type { Site } from '../../types';
 import { AvatarLabelOption, BasicFilterFieldType, SelectOption } from '../types';
 interface FilterOptionsProps {
     filterType: BasicFilterFieldType;
-    cloudId: string;
+    site?: Site;
 }
 export interface FetchFilterOptionsProps {
     pageCursor?: string;
@@ -18,5 +19,5 @@ export interface FilterOptionsState {
     errors: unknown[];
 }
 export declare const getAssigneeUnassignedFilterOption: (formatMessage: IntlShape['formatMessage']) => AvatarLabelOption;
-export declare const useFilterOptions: ({ filterType, cloudId, }: FilterOptionsProps) => FilterOptionsState;
+export declare const useFilterOptions: ({ filterType, site, }: FilterOptionsProps) => FilterOptionsState;
 export {};

package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
+import type { Site } from '../../../types';
 import { BasicFilterFieldType, SelectOption } from '../../types';
 export interface AsyncPopupSelectProps {
     filterType: BasicFilterFieldType;
-    cloudId: string;
     selection: SelectOption[];
     isJQLHydrating: boolean;
     onSelectionChange?: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
     isDisabled?: boolean;
+    site?: Site;
 }
 export declare const SEARCH_DEBOUNCE_MS = 350;
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, site, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="react" />
+import type { Site } from '../../types';
 import type { BasicFilterFieldType, SelectedOptionsMap, SelectOption } from '../types';
 export declare const availableBasicFilterTypes: BasicFilterFieldType[];
 export interface BasicFilterContainerProps {
     jql: string;
-    cloudId: string;
+    site?: Site;
     selections: SelectedOptionsMap;
     onChange: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
     isJQLHydrating: boolean;
 }
-declare const BasicFilterContainer: ({ jql, cloudId, onChange, selections, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ jql, site, onChange, selections, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types/ui/jira-issues-modal/basic-filters/utils/transformers.d.ts

@@ -1,5 +1,7 @@
 import { FieldValuesResponse, HydrateResponse, SelectedOptionsMap, SelectOption } from '../types';
 export declare function mapHydrateResponseData({ data }: HydrateResponse): SelectedOptionsMap;
-export declare function mapFieldValuesToFilterOptions({ data, }: FieldValuesResponse): SelectOption[];
+export declare function mapFieldValuesToFilterOptions({ data, siteUrl, }: FieldValuesResponse & {
+    siteUrl?: string;
+}): SelectOption[];
 export declare function mapFieldValuesToTotalCount({ data, }: FieldValuesResponse): number;
 export declare function mapFieldValuesToPageCursor({ data, }: FieldValuesResponse): string | undefined;

package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -1,7 +1,7 @@
 import { jsx } from '@emotion/react';
 import type { JiraSearchMethod } from '../../../common/types';
 import { SelectedOptionsMap } from '../basic-filters/types';
-import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
+import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery, Site } from '../types';
 export declare const DEFAULT_JQL_QUERY = "created >= -30d order by created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export declare const FILTER_SELECTION_DEBOUNCE_MS = 500;
@@ -17,5 +17,6 @@ export interface SearchContainerProps {
     parameters?: JiraIssueDatasourceParameters;
     searchBarJql?: string;
     setSearchBarJql: (jql: string) => void;
+    site?: Site;
 }
 export declare const JiraSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;

package/dist/types/ui/jira-issues-modal/site-selector/index.d.ts

@@ -1,5 +1,5 @@
 import { jsx } from '@emotion/react';
-import { Site } from '../../../services/getAvailableJiraSites';
+import type { Site } from '../types';
 export interface JiraSiteSelectorProps {
     availableSites: Site[] | undefined;
     onSiteSelection: (selectedSite: Site) => void;

package/dist/types/ui/jira-issues-modal/types.d.ts

@@ -14,6 +14,11 @@ export type JiraIssueDatasourceParameters = {
     cloudId: string;
 } & JiraIssueDatasourceParametersQuery;
 export type JiraIssueViewModes = 'issue' | 'count';
+export interface Site {
+    cloudId: string;
+    displayName: string;
+    url: string;
+}
 export interface JiraIssuesDatasourceAdf extends DatasourceAdf {
     attrs: {
         url?: string;

package/dist/types-ts4.5/services/getAvailableJiraSites.d.ts

@@ -1,6 +1,2 @@
-export interface Site {
-    cloudId: string;
-    displayName: string;
-    url: string;
-}
+import type { Site } from '../ui/jira-issues-modal/types';
 export declare const getAvailableJiraSites: () => Promise<Site[]>;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts

@@ -1,8 +1,9 @@
 import { IntlShape } from 'react-intl-next';
+import type { Site } from '../../types';
 import { AvatarLabelOption, BasicFilterFieldType, SelectOption } from '../types';
 interface FilterOptionsProps {
     filterType: BasicFilterFieldType;
-    cloudId: string;
+    site?: Site;
 }
 export interface FetchFilterOptionsProps {
     pageCursor?: string;
@@ -18,5 +19,5 @@ export interface FilterOptionsState {
     errors: unknown[];
 }
 export declare const getAssigneeUnassignedFilterOption: (formatMessage: IntlShape['formatMessage']) => AvatarLabelOption;
-export declare const useFilterOptions: ({ filterType, cloudId, }: FilterOptionsProps) => FilterOptionsState;
+export declare const useFilterOptions: ({ filterType, site, }: FilterOptionsProps) => FilterOptionsState;
 export {};

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
+import type { Site } from '../../../types';
 import { BasicFilterFieldType, SelectOption } from '../../types';
 export interface AsyncPopupSelectProps {
     filterType: BasicFilterFieldType;
-    cloudId: string;
     selection: SelectOption[];
     isJQLHydrating: boolean;
     onSelectionChange?: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
     isDisabled?: boolean;
+    site?: Site;
 }
 export declare const SEARCH_DEBOUNCE_MS = 350;
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, site, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="react" />
+import type { Site } from '../../types';
 import type { BasicFilterFieldType, SelectedOptionsMap, SelectOption } from '../types';
 export declare const availableBasicFilterTypes: BasicFilterFieldType[];
 export interface BasicFilterContainerProps {
     jql: string;
-    cloudId: string;
+    site?: Site;
     selections: SelectedOptionsMap;
     onChange: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
     isJQLHydrating: boolean;
 }
-declare const BasicFilterContainer: ({ jql, cloudId, onChange, selections, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ jql, site, onChange, selections, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/utils/transformers.d.ts

@@ -1,5 +1,7 @@
 import { FieldValuesResponse, HydrateResponse, SelectedOptionsMap, SelectOption } from '../types';
 export declare function mapHydrateResponseData({ data }: HydrateResponse): SelectedOptionsMap;
-export declare function mapFieldValuesToFilterOptions({ data, }: FieldValuesResponse): SelectOption[];
+export declare function mapFieldValuesToFilterOptions({ data, siteUrl, }: FieldValuesResponse & {
+    siteUrl?: string;
+}): SelectOption[];
 export declare function mapFieldValuesToTotalCount({ data, }: FieldValuesResponse): number;
 export declare function mapFieldValuesToPageCursor({ data, }: FieldValuesResponse): string | undefined;

package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -1,7 +1,7 @@
 import { jsx } from '@emotion/react';
 import type { JiraSearchMethod } from '../../../common/types';
 import { SelectedOptionsMap } from '../basic-filters/types';
-import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
+import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery, Site } from '../types';
 export declare const DEFAULT_JQL_QUERY = "created >= -30d order by created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export declare const FILTER_SELECTION_DEBOUNCE_MS = 500;
@@ -17,5 +17,6 @@ export interface SearchContainerProps {
     parameters?: JiraIssueDatasourceParameters;
     searchBarJql?: string;
     setSearchBarJql: (jql: string) => void;
+    site?: Site;
 }
 export declare const JiraSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/jira-issues-modal/site-selector/index.d.ts

@@ -1,5 +1,5 @@
 import { jsx } from '@emotion/react';
-import { Site } from '../../../services/getAvailableJiraSites';
+import type { Site } from '../types';
 export interface JiraSiteSelectorProps {
     availableSites: Site[] | undefined;
     onSiteSelection: (selectedSite: Site) => void;

package/dist/types-ts4.5/ui/jira-issues-modal/types.d.ts

@@ -14,6 +14,11 @@ export type JiraIssueDatasourceParameters = {
     cloudId: string;
 } & JiraIssueDatasourceParametersQuery;
 export type JiraIssueViewModes = 'issue' | 'count';
+export interface Site {
+    cloudId: string;
+    displayName: string;
+    url: string;
+}
 export interface JiraIssuesDatasourceAdf extends DatasourceAdf {
     attrs: {
         url?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.21",
+  "version": "1.19.22",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"