@atlaskit/link-datasource 1.24.5 → 1.24.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.24.7
+
+### Patch Changes
+
+- [#83952](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/83952) [`300149437193`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/300149437193) - [ux] Make smart-links rendered non-word-wrapped (truncated) by default and only be word-wrapped when user chooses it
+
+## 1.24.6
+
+### Patch Changes
+
+- [#81820](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81820) [`92e229dc81a0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/92e229dc81a0) - Refactor components to be shared in common and adding new confluence search modal initial state.
+
 ## 1.24.5
 
 ### Patch Changes

package/dist/cjs/common/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/services/{getAvailableJiraSites.js → getAvailableSites.js}

@@ -4,11 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAvailableJiraSites = void 0;
+exports.getAvailableSites = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var getAvailableJiraSites = exports.getAvailableJiraSites = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+var getAvailableSites = exports.getAvailableSites = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(product) {
     var requestConfig, response, res;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -22,7 +22,7 @@ var getAvailableJiraSites = exports.getAvailableJiraSites = /*#__PURE__*/functio
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-              products: ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
+              products: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
             })
           };
           _context.next = 3;
@@ -58,7 +58,7 @@ var getAvailableJiraSites = exports.getAvailableJiraSites = /*#__PURE__*/functio
       }
     }, _callee);
   }));
-  return function getAvailableJiraSites() {
+  return function getAvailableSites(_x) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/cjs/ui/common/error-state/loading-error.js

@@ -42,7 +42,7 @@ var LoadingError = exports.LoadingError = function LoadingError(_ref) {
   }, [fireEvent]);
   return (0, _react2.jsx)("div", {
     css: errorContainerStyles,
-    "data-testid": "jira-jql-datasource--loading-error"
+    "data-testid": "datasource--loading-error"
   }, (0, _react2.jsx)(_loadingErrorSvg.LoadingErrorSVG, null), (0, _react2.jsx)("div", {
     css: errorMessageContainerStyles
   }, (0, _react2.jsx)("span", {

package/dist/cjs/ui/common/error-state/messages.js

@@ -6,56 +6,112 @@ Object.defineProperty(exports, "__esModule", {
 exports.loadingErrorMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var loadingErrorMessages = exports.loadingErrorMessages = (0, _reactIntlNext.defineMessages)({
+  accessInstructionsDuplicate: {
+    id: 'linkDataSource.accessInstructions',
+    description: "Instructions to let the user know they must contact their site administrator in order to access this site's content",
+    defaultMessage: 'To request access, contact your site administrator.'
+  },
+  //delete and remove duplicate from title above
   accessInstructions: {
     id: 'linkDataSource.jira-issues.accessInstructions',
     description: "Instructions to let the user know they must contact their site administrator in order to access this site's content",
     defaultMessage: 'To request access, contact your site administrator.'
   },
+  accessRequiredDuplicate: {
+    id: 'linkDataSource.accessRequired',
+    description: 'Message letting user know that they do not have access to this content',
+    defaultMessage: "You don't have access to this content"
+  },
+  //delete and remove duplicate from title above
   accessRequired: {
     id: 'linkDataSource.jira-issues.accessRequired',
     description: 'Message letting user know that they do not have access to this content',
     defaultMessage: "You don't have access to this content"
   },
+  accessRequiredWithSiteDuplicate: {
+    id: 'linkDataSource.accessRequiredWithSite',
+    description: 'Message letting user know that they do not have access to the site that will be listed below this message',
+    defaultMessage: "You don't have access to the following site:"
+  },
+  //delete and remove duplicate from title above
   accessRequiredWithSite: {
     id: 'linkDataSource.jira-issues.accessRequiredWithSite',
     description: 'Message letting user know that they do not have access to the site that will be listed below this message',
     defaultMessage: "You don't have access to the following site:"
   },
+  checkConnectionDuplicate: {
+    id: 'linkDataSource.checkConnection',
+    description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
+    defaultMessage: 'Check your connection and refresh, or try again later.'
+  },
+  //delete and remove duplicate from title above
   checkConnection: {
     id: 'linkDataSource.jira-issues.checkConnection',
     description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
     defaultMessage: 'Check your connection and refresh, or try again later.'
   },
+  checkConnectionWithSourceDuplicate: {
+    id: 'linkDataSource.checkConnectionWithSource',
+    description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
+    defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
+  },
+  //delete and remove duplicate from title above
   checkConnectionWithSource: {
     id: 'linkDataSource.jira-issues.checkConnectionWithSource',
     description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
     defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
   },
+  noResultsFoundDuplicate: {
+    id: 'linkDataSource.noResultsFound',
+    description: 'Status message letting the user know their query did not have any results',
+    defaultMessage: 'No results found'
+  },
+  //delete and remove duplicate from title above
   noResultsFound: {
     id: 'linkDataSource.jira-issues.noResultsFound',
     description: 'Status message letting the user know their query did not have any results',
     defaultMessage: 'No results found'
   },
+  refreshDuplicate: {
+    id: 'linkDataSource.refresh',
+    description: 'Button text to allow the user to refresh the table to see results',
+    defaultMessage: 'Refresh'
+  },
+  //delete and remove duplicate from title above
   refresh: {
     id: 'linkDataSource.jira-issues.refresh',
     description: 'Button text to allow the user to refresh the table to see results',
     defaultMessage: 'Refresh'
   },
+  unableToLoadItemsDuplicate: {
+    id: 'linkDataSource.unableToLoadItems',
+    description: 'Error state message letting the user know we were unable the load the requested list of items',
+    defaultMessage: 'Unable to load items'
+  },
+  //delete and remove duplicate from title above
   unableToLoadItems: {
     id: 'linkDataSource.jira-issues.unableToLoadItems',
     description: 'Error state message letting the user know we were unable the load the requested list of items',
     defaultMessage: 'Unable to load items'
   },
+  unableToLoadResultsDuplicate: {
+    id: 'linkDataSource.unableToLoadResults',
+    description: 'Error state message letting the user know we were unable the load the requested list of results',
+    defaultMessage: 'Unable to load results'
+  },
+  //delete and remove duplicate from title above
   unableToLoadResults: {
     id: 'linkDataSource.jira-issues.unableToLoadResults',
     description: 'Error state message letting the user know we were unable the load the requested list of results',
     defaultMessage: 'Unable to load results'
   },
+  // delete once EDM-9407 is merged
   noAccessToJiraSitesTitle: {
     id: 'linkDataSource.jira-issues.no.jira.sites.access.title',
     description: 'Title that shows in the modal when user has no access to any Jira sites',
     defaultMessage: "You don't have access to any Jira sites"
   },
+  // delete once EDM-9407 is merged
   noAccessToJiraSitesDescription: {
     id: 'linkDataSource.jira-issues.no.jira.sites.access.description',
     description: 'Description that shows in the modal when user has no access to any Jira sites',

package/dist/cjs/ui/common/error-state/modal-loading-error.js

@@ -42,7 +42,7 @@ var ModalLoadingError = exports.ModalLoadingError = function ModalLoadingError(_
   }, [fireEvent]);
   return (0, _react2.jsx)("div", {
     css: errorContainerStyles,
-    "data-testid": "jira-jql-datasource-modal--loading-error"
+    "data-testid": "datasource-modal--loading-error"
   }, (0, _react2.jsx)(_loadingErrorSvg.LoadingErrorSVG, null), (0, _react2.jsx)("div", {
     css: errorMessageContainerStyles
   }, (0, _react2.jsx)("span", {

package/dist/cjs/ui/common/error-state/no-instances.js

@@ -7,7 +7,6 @@ exports.NoInstancesView = void 0;
 var _react = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _primitives = require("@atlaskit/primitives");
-var _messages = require("./messages");
 var _noInstancesSvg = require("./no-instances-svg");
 /** @jsx jsx */
 
@@ -21,15 +20,20 @@ var descriptionStyles = (0, _react.css)({
 var containerStyles = (0, _primitives.xcss)({
   marginTop: '60px'
 });
-var NoInstancesView = exports.NoInstancesView = function NoInstancesView() {
+var NoInstancesView = exports.NoInstancesView = function NoInstancesView(_ref) {
+  var title = _ref.title,
+    description = _ref.description,
+    testId = _ref.testId;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
   return (0, _react.jsx)(_primitives.Flex, {
-    testId: "no-jira-instances-content",
+    testId: testId,
     direction: "column",
     alignItems: "center",
     xcss: containerStyles
   }, (0, _react.jsx)(_noInstancesSvg.NoInstancesSvg, null), (0, _react.jsx)("span", {
     css: titleStyles
-  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.noAccessToJiraSitesTitle)), (0, _react.jsx)("span", {
+  }, formatMessage(title)), (0, _react.jsx)("span", {
     css: descriptionStyles
-  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.noAccessToJiraSitesDescription)));
+  }, formatMessage(description)));
 };

package/dist/cjs/ui/common/error-state/no-results.js

@@ -36,7 +36,7 @@ var NoResults = exports.NoResults = function NoResults(_ref) {
   }, [fireEvent]);
   return (0, _react2.jsx)("div", {
     css: noResultsContainerStyles,
-    "data-testid": "jira-jql-datasource-modal--no-results"
+    "data-testid": "datasource-modal--no-results"
   }, (0, _react2.jsx)("svg", {
     width: "131",
     height: "120",

package/dist/cjs/ui/common/initial-state-view/index.js

@@ -0,0 +1,73 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.InitialStateView = void 0;
+var _react = require("@emotion/react");
+var _reactIntlNext = require("react-intl-next");
+var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
+var _colors = require("@atlaskit/theme/colors");
+var _messages = require("./messages");
+/** @jsx jsx */
+
+var initialStateViewContainerStyles = (0, _react.css)({
+  display: 'flex',
+  justifyContent: 'center',
+  height: '100%'
+});
+var svgAndTextsWrapperStyles = (0, _react.css)({
+  textAlign: 'center',
+  alignSelf: 'center',
+  paddingTop: "var(--ds-space-600, 48px)",
+  paddingBottom: "var(--ds-space-600, 48px)"
+});
+var betaTagStyles = (0, _react.css)({
+  display: 'flex'
+});
+var searchTitleStyles = (0, _react.css)({
+  color: "var(--ds-text-subtlest, ".concat(_colors.N300, ")"),
+  font: "var(--ds-font-heading-medium, normal 500 20px/24px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  paddingTop: "var(--ds-space-200, 16px)",
+  paddingBottom: "var(--ds-space-100, 8px)",
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  gap: "var(--ds-space-100, 8px)"
+});
+var mainTextStyles = (0, _react.css)({
+  color: "var(--ds-text-subtlest, ".concat(_colors.N300, ")")
+});
+var learnMoreLinkStyles = (0, _react.css)({
+  paddingTop: "var(--ds-space-200, 16px)",
+  display: 'inline-block'
+});
+var InitialStateView = exports.InitialStateView = function InitialStateView(_ref) {
+  var icon = _ref.icon,
+    _ref$showBeta = _ref.showBeta,
+    showBeta = _ref$showBeta === void 0 ? false : _ref$showBeta,
+    title = _ref.title,
+    description = _ref.description,
+    learnMoreLink = _ref.learnMoreLink;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  return (0, _react.jsx)("div", {
+    css: initialStateViewContainerStyles,
+    "data-testid": "datasource-modal--initial-state-view"
+  }, (0, _react.jsx)("div", {
+    css: svgAndTextsWrapperStyles
+  }, icon, (0, _react.jsx)("div", {
+    css: searchTitleStyles
+  }, showBeta && (0, _react.jsx)("div", {
+    css: betaTagStyles
+  }, (0, _react.jsx)(_lozenge.default, {
+    appearance: "new"
+  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.initialStateViewMessages.beta))), formatMessage(title)), (0, _react.jsx)("div", {
+    css: mainTextStyles
+  }, formatMessage(description)), learnMoreLink && (0, _react.jsx)("a", {
+    href: learnMoreLink.href,
+    target: "_blank",
+    css: learnMoreLinkStyles
+  }, formatMessage(learnMoreLink.text))));
+};

package/dist/cjs/ui/{jira-issues-modal → common}/initial-state-view/messages.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.initialStateViewMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var initialStateViewMessages = exports.initialStateViewMessages = (0, _reactIntlNext.defineMessages)({
-  searchTitle: {
-    id: 'linkDataSource.modal-initial-state.searchTitle',
+  jiraSearchTitle: {
+    id: 'linkDataSource.modal-initial-state.jiraSearchTitle',
     description: 'The initial modal search state title that gives the user some idea about how to get information',
     defaultMessage: 'Search for Jira issues'
   },
@@ -16,6 +16,13 @@ var initialStateViewMessages = exports.initialStateViewMessages = (0, _reactIntl
     description: 'Beta lozenge',
     defaultMessage: 'Beta'
   },
+  // everything below is a duplication from the work around EDM-9407
+  // needs to be cleaned up after that PR is merged
+  searchTitle: {
+    id: 'linkDataSource.modal-initial-state.searchTitle',
+    description: 'The initial modal search state title that gives the user some idea about how to get information',
+    defaultMessage: 'Search for Jira issues'
+  },
   searchDescriptionForBasicSearch: {
     id: 'linkDataSource.modal-initial-state.searchDescription-basic',
     description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',

package/dist/cjs/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js

@@ -31,8 +31,9 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
     onChange = _ref.onChange,
     onSearch = _ref.onSearch,
     searchTerm = _ref.searchTerm,
-    _ref$testId = _ref.testId,
-    testId = _ref$testId === void 0 ? 'jira-jql-datasource-modal--basic-search-input' : _ref$testId;
+    fullWidth = _ref.fullWidth,
+    testId = _ref.testId,
+    placeholder = _ref.placeholder;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var handleFormSubmit = function handleFormSubmit(e) {
@@ -45,8 +46,9 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
     }
     return false;
   }, []);
+  var isFullWidth = fullWidth || !showBasicFilters;
   return (0, _react2.jsx)("form", {
-    css: showBasicFilters ? formWithMaxWidthStyles : formStyles,
+    css: isFullWidth ? formStyles : formWithMaxWidthStyles,
     onSubmit: handleFormSubmit
   }, (0, _react2.jsx)(_textfield.default, {
     elemAfterInput: (0, _react2.jsx)(_button.LoadingButton, {
@@ -62,12 +64,12 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
         return onSearch(searchTerm);
       },
       spacing: "none",
-      testId: "jira-jql-datasource-modal--basic-search-button"
+      testId: "".concat(testId, "--basic-search-button")
     }),
     autoFocus: true,
     onChange: onChange,
-    placeholder: formatMessage(_messages.basicSearchInputMessages.basicTextSearchLabel),
-    testId: testId,
+    placeholder: formatMessage(placeholder),
+    testId: "".concat(testId, "--basic-search-input"),
     value: searchTerm
   }));
 };

package/dist/cjs/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js

@@ -6,6 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.basicSearchInputMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var basicSearchInputMessages = exports.basicSearchInputMessages = (0, _reactIntlNext.defineMessages)({
+  basicTextSearchLabelDuplicate: {
+    id: 'linkDataSource.configmodal.basicTextSearchPlaceholder',
+    description: 'Placeholder text for the search input box',
+    defaultMessage: 'Search for issues by keyword'
+  },
   basicTextSearchLabel: {
     id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder',
     description: 'Placeholder text for the search input box',

package/dist/cjs/ui/common/modal/content-container/index.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ContentContainer = void 0;
+var _react = require("@emotion/react");
+var _primitives = require("@atlaskit/primitives");
+var _colors = require("@atlaskit/theme/colors");
+var _issueLikeTable = require("../../../issue-like-table");
+/** @jsx jsx */
+
+var contentContainerStyles = (0, _primitives.xcss)({
+  display: 'grid',
+  maxHeight: '420px',
+  overflow: 'auto',
+  borderBottom: "2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")")),
+  backgroundImage: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundImage,
+  backgroundPosition: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundPosition,
+  backgroundRepeat: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundRepeat,
+  backgroundSize: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundSize,
+  backgroundAttachment: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundAttachment
+});
+var tableContainerStyles = (0, _primitives.xcss)({
+  borderTopLeftRadius: "var(--ds-border-radius-200, 8px)",
+  borderTopRightRadius: "var(--ds-border-radius-200, 8px)",
+  border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")"))
+});
+var ContentContainer = exports.ContentContainer = function ContentContainer(_ref) {
+  var children = _ref.children,
+    withTableBorder = _ref.withTableBorder;
+  return (0, _react.jsx)(_primitives.Box, {
+    xcss: [contentContainerStyles, withTableBorder && tableContainerStyles]
+  }, children);
+};

package/dist/cjs/ui/{jira-issues-modal → common/modal}/site-selector/index.js

@@ -4,28 +4,37 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraSiteSelector = void 0;
+exports.SiteSelector = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
+var _primitives = require("@atlaskit/primitives");
 var _select = _interopRequireDefault(require("@atlaskit/select"));
-var _zindex = require("../../../common/zindex");
+var _zindex = require("../../../../common/zindex");
 var _messages = require("./messages");
 var _excluded = ["width"];
 /** @jsx jsx */
 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 dropdownContainerStyles = (0, _primitives.xcss)({
+  display: 'flex',
+  alignItems: 'center',
+  gap: 'space.100',
+  minHeight: '40px' // to prevent vertical shifting when site selector pops in
+});
 var selectStyles = (0, _react2.css)({
-  font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontSize: "var(--ds-font-size-100, 14px)",
   fontWeight: "var(--ds-font-weight-medium, 500)",
+  lineHeight: "var(--ds-space-250, 20px)",
   zIndex: _zindex.siteSelectorIndex
 });
-var JiraSiteSelector = exports.JiraSiteSelector = function JiraSiteSelector(props) {
+var SiteSelector = exports.SiteSelector = function SiteSelector(props) {
   var availableSites = props.availableSites,
     onSiteSelection = props.onSiteSelection,
-    selectedJiraSite = props.selectedJiraSite,
+    selectedSite = props.selectedSite,
+    label = props.label,
     testId = props.testId;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
@@ -45,11 +54,13 @@ var JiraSiteSelector = exports.JiraSiteSelector = function JiraSiteSelector(prop
       };
     });
   }, [availableSites]);
-  var selectedSiteOption = selectedJiraSite && {
-    label: selectedJiraSite.displayName,
-    value: selectedJiraSite.cloudId
+  var selectedSiteOption = selectedSite && {
+    label: selectedSite.displayName,
+    value: selectedSite.cloudId
   };
-  return (0, _react2.jsx)("span", {
+  return (0, _react2.jsx)(_primitives.Box, {
+    xcss: dropdownContainerStyles
+  }, formatMessage(label), availableSites && availableSites.length > 1 && (0, _react2.jsx)("span", {
     "data-testid": "".concat(testId, "--trigger")
   }, (0, _react2.jsx)(_select.default, {
     css: selectStyles,
@@ -72,5 +83,5 @@ var JiraSiteSelector = exports.JiraSiteSelector = function JiraSiteSelector(prop
     },
     testId: testId,
     value: selectedSiteOption
-  }));
+  })));
 };

package/dist/cjs/ui/{jira-issues-modal → common/modal}/site-selector/messages.js

@@ -6,6 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.siteSelectorMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var siteSelectorMessages = exports.siteSelectorMessages = (0, _reactIntlNext.defineMessages)({
+  chooseSiteDuplicate: {
+    id: 'linkDataSource.site-selector.configmodal.chooseSite',
+    description: 'Label for input letting user know they have to choose a site',
+    defaultMessage: 'Choose site'
+  },
+  // delete this and remove duplicate from above once EDM-9407 is merged
   chooseSite: {
     id: 'linkDataSource.jira-issues.configmodal.chooseSite',
     description: 'Label for input letting user know they have to choose a site',

package/dist/cjs/ui/confluence-search-modal/index.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.CONFLUENCE_SEARCH_DATASOURCE_ID = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _react = _interopRequireWildcard(require("react"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var CONFLUENCE_SEARCH_DATASOURCE_ID = exports.CONFLUENCE_SEARCH_DATASOURCE_ID = '768fc736-3af4-4a8f-b27e-203602bff8ca';
+var LazyConfluenceSearchConfigModal = /*#__PURE__*/(0, _react.lazy)(function () {
+  return Promise.resolve().then(function () {
+    return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_linkdatasource-confluencesearchmodal" */'./modal'));
+  }).then(function (module) {
+    return {
+      default: module.ConfluenceSearchConfigModal
+    };
+  });
+});
+var ConfluenceSearchConfigModalWithWrappers = function ConfluenceSearchConfigModalWithWrappers(props) {
+  return /*#__PURE__*/_react.default.createElement(_react.Suspense, {
+    fallback: /*#__PURE__*/_react.default.createElement("div", {
+      "data-testid": 'confluence-search-datasource-table-suspense'
+    })
+  }, /*#__PURE__*/_react.default.createElement(LazyConfluenceSearchConfigModal, props));
+};
+var _default = exports.default = ConfluenceSearchConfigModalWithWrappers;