@atlaskit/link-datasource 6.4.13 → 6.6.0

package/dist/cjs/ui/issue-like-table/table-cell-content/index.js

@@ -10,10 +10,11 @@ require("./index.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
-var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
+var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
+var _useDatasourceCrossProductAttribution = require("../../../analytics/xpc/useDatasourceCrossProductAttribution");
 var _state = require("../../../state");
 var _actions = require("../../../state/actions");
 var _editType = require("../edit-type");
@@ -40,7 +41,7 @@ var TooltipWrapper = function TooltipWrapper(_ref) {
     return value !== '';
   }).join(', ');
   if (stringifiedContent && !(wrappedColumnKeys !== null && wrappedColumnKeys !== void 0 && wrappedColumnKeys.includes(columnKey))) {
-    return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+    return /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
       tag: _truncateTextTag.TruncateTextTag,
       content: stringifiedContent,
       testId: "issues-table-cell-tooltip"
@@ -79,17 +80,32 @@ var getLinkedCellContent = function getLinkedCellContent(_ref2) {
     "data-testid": 'issue-like-table-type-icon-link'
   }, children);
 };
+var LinkedCellContentWrapped = function LinkedCellContentWrapped(_ref3) {
+  var children = _ref3.children,
+    issueLinkData = _ref3.issueLinkData;
+  var _useDatasourceCrossPr = (0, _useDatasourceCrossProductAttribution.useDatasourceCrossProductAttribution)(),
+    wrapCrossProductUrl = _useDatasourceCrossPr.wrapCrossProductUrl;
+  if (!issueLinkData) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
+  }
+  return /*#__PURE__*/_react.default.createElement(_linkUrl.default, {
+    href: wrapCrossProductUrl(issueLinkData.url),
+    target: "_blank",
+    "aria-label": issueLinkData.text || issueLinkData.url,
+    "data-testid": 'issue-like-table-type-icon-link'
+  }, children);
+};
 var isIssueTypeColumnFn = function isIssueTypeColumnFn(columnKey) {
   return columnKey === 'issuetype';
 };
-var ReadOnlyCell = exports.ReadOnlyCell = function ReadOnlyCell(_ref3) {
+var ReadOnlyCell = exports.ReadOnlyCell = function ReadOnlyCell(_ref4) {
   var _useDatasourceItem, _rowData$columnKey;
-  var id = _ref3.id,
-    columnType = _ref3.columnType,
-    _ref3$wrappedColumnKe = _ref3.wrappedColumnKeys,
-    wrappedColumnKeys = _ref3$wrappedColumnKe === void 0 ? [] : _ref3$wrappedColumnKe,
-    renderItem = _ref3.renderItem,
-    columnKey = _ref3.columnKey;
+  var id = _ref4.id,
+    columnType = _ref4.columnType,
+    _ref4$wrappedColumnKe = _ref4.wrappedColumnKeys,
+    wrappedColumnKeys = _ref4$wrappedColumnKe === void 0 ? [] : _ref4$wrappedColumnKe,
+    renderItem = _ref4.renderItem,
+    columnKey = _ref4.columnKey;
   var rowData = (_useDatasourceItem = (0, _state.useDatasourceItem)({
     id: id
   })) === null || _useDatasourceItem === void 0 ? void 0 : _useDatasourceItem.data;
@@ -104,33 +120,28 @@ var ReadOnlyCell = exports.ReadOnlyCell = function ReadOnlyCell(_ref3) {
     type: columnType,
     values: values
   };
-  if ((0, _platformFeatureFlags.fg)('platform_lp_sllv_jira_type_as_link')) {
-    var isIssueTypeColumn = isIssueTypeColumnFn(columnKey);
-    var issueLinkData = getIssueLinkData(rowData);
-    return /*#__PURE__*/_react.default.createElement(TooltipWrapper, {
-      columnKey: columnKey,
-      datasourceTypeWithValues: datasourceTypeWithValues,
-      wrappedColumnKeys: wrappedColumnKeys
-    }, isIssueTypeColumn && issueLinkData ? getLinkedCellContent({
-      children: renderItem(datasourceTypeWithValues),
-      issueLinkData: issueLinkData
-    }) : renderItem(datasourceTypeWithValues));
-  }
+  var isIssueTypeColumn = isIssueTypeColumnFn(columnKey);
+  var issueLinkData = getIssueLinkData(rowData);
   return /*#__PURE__*/_react.default.createElement(TooltipWrapper, {
     columnKey: columnKey,
     datasourceTypeWithValues: datasourceTypeWithValues,
     wrappedColumnKeys: wrappedColumnKeys
-  }, renderItem(datasourceTypeWithValues));
+  }, isIssueTypeColumn && issueLinkData ? (0, _fg.fg)('electric_issue_like_table_xpc_url_wrapping') ? /*#__PURE__*/_react.default.createElement(LinkedCellContentWrapped, {
+    issueLinkData: issueLinkData
+  }, renderItem(datasourceTypeWithValues)) : getLinkedCellContent({
+    children: renderItem(datasourceTypeWithValues),
+    issueLinkData: issueLinkData
+  }) : renderItem(datasourceTypeWithValues));
 };
-var InlineEditableCell = function InlineEditableCell(_ref4) {
-  var ari = _ref4.ari,
-    values = _ref4.values,
-    columnKey = _ref4.columnKey,
-    columnTitle = _ref4.columnTitle,
-    renderItem = _ref4.renderItem,
-    integrationKey = _ref4.integrationKey,
-    issueLinkData = _ref4.issueLinkData,
-    wrappedColumnKeys = _ref4.wrappedColumnKeys;
+var InlineEditableCell = function InlineEditableCell(_ref5) {
+  var ari = _ref5.ari,
+    values = _ref5.values,
+    columnKey = _ref5.columnKey,
+    columnTitle = _ref5.columnTitle,
+    renderItem = _ref5.renderItem,
+    integrationKey = _ref5.integrationKey,
+    issueLinkData = _ref5.issueLinkData,
+    wrappedColumnKeys = _ref5.wrappedColumnKeys;
   // Callbacks are returned only when the ari is editable and the action schemas exist in the store
   var _useExecuteAtomicActi = (0, _actions.useExecuteAtomicAction)({
       ari: ari,
@@ -157,10 +168,12 @@ var InlineEditableCell = function InlineEditableCell(_ref4) {
     style: {
       minHeight: 'calc(40px - 2px * 2)'
     }
-  }, (0, _platformFeatureFlags.fg)('platform_lp_sllv_jira_type_as_link') ? !isEditable && isIssueTypeColumnFn(columnKey) && issueLinkData ? getLinkedCellContent({
+  }, !isEditable && isIssueTypeColumnFn(columnKey) && issueLinkData ? (0, _fg.fg)('electric_issue_like_table_xpc_url_wrapping') ? /*#__PURE__*/_react.default.createElement(LinkedCellContentWrapped, {
+    issueLinkData: issueLinkData
+  }, renderItem(values)) : getLinkedCellContent({
     children: renderItem(values),
     issueLinkData: issueLinkData
-  }) : renderItem(values) : renderItem(values)));
+  }) : renderItem(values)));
   if (!isEditable) {
     return readView;
   }
@@ -179,11 +192,11 @@ var InlineEditableCell = function InlineEditableCell(_ref4) {
     datasourceTypeWithValues: values
   });
 };
-var toDatasourceTypeWithValues = function toDatasourceTypeWithValues(_ref5) {
+var toDatasourceTypeWithValues = function toDatasourceTypeWithValues(_ref6) {
   var _rowData$columnKey2;
-  var rowData = _ref5.rowData,
-    columnKey = _ref5.columnKey,
-    columnType = _ref5.columnType;
+  var rowData = _ref6.rowData,
+    columnKey = _ref6.columnKey,
+    columnType = _ref6.columnType;
   // Need to make sure we keep falsy values like 0 and '', as well as the boolean false.
   var value = (_rowData$columnKey2 = rowData[columnKey]) === null || _rowData$columnKey2 === void 0 ? void 0 : _rowData$columnKey2.data;
   var values = !value ? [] : Array.isArray(value) ? value : [value];
@@ -192,13 +205,13 @@ var toDatasourceTypeWithValues = function toDatasourceTypeWithValues(_ref5) {
     values: values
   };
 };
-var TableCellContent = exports.TableCellContent = function TableCellContent(_ref6) {
-  var id = _ref6.id,
-    columnKey = _ref6.columnKey,
-    columnTitle = _ref6.columnTitle,
-    columnType = _ref6.columnType,
-    renderItem = _ref6.renderItem,
-    wrappedColumnKeys = _ref6.wrappedColumnKeys;
+var TableCellContent = exports.TableCellContent = function TableCellContent(_ref7) {
+  var id = _ref7.id,
+    columnKey = _ref7.columnKey,
+    columnTitle = _ref7.columnTitle,
+    columnType = _ref7.columnType,
+    renderItem = _ref7.renderItem,
+    wrappedColumnKeys = _ref7.wrappedColumnKeys;
   var item = (0, _state.useDatasourceItem)({
     id: id
   });
@@ -214,7 +227,7 @@ var TableCellContent = exports.TableCellContent = function TableCellContent(_ref
         columnTitle: columnTitle,
         renderItem: renderItem,
         integrationKey: integrationKey,
-        issueLinkData: (0, _platformFeatureFlags.fg)('platform_lp_sllv_jira_type_as_link') ? getIssueLinkData(rowData) : undefined,
+        issueLinkData: getIssueLinkData(rowData),
         values: toDatasourceTypeWithValues({
           rowData: rowData,
           columnKey: columnKey,

package/dist/cjs/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -15,7 +15,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _inlineEdit = _interopRequireDefault(require("@atlaskit/inline-edit"));
+var _inlineEdit = _interopRequireDefault(require("@atlaskit/inline-edit/inline-edit"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _hooks = require("@atlaskit/smart-card/hooks");
 var _analytics = require("../../../analytics");

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

@@ -8,7 +8,7 @@ exports.JiraJQLEditor = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _jqlEditor = require("@atlaskit/jql-editor");
-var _jqlEditorAutocompleteRest = require("@atlaskit/jql-editor-autocomplete-rest");
+var _useAutocompleteProvider = require("@atlaskit/jql-editor-autocomplete-rest/use-autocomplete-provider");
 var _makeGetJqlAutocompleteData = require("../../../services/makeGetJqlAutocompleteData");
 var _makeGetJqlSuggestionsData = require("../../../services/makeGetJqlSuggestionsData");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -18,7 +18,7 @@ var JiraJQLEditor = exports.JiraJQLEditor = function JiraJQLEditor(_ref) {
     onChange = _ref.onChange,
     onSearch = _ref.onSearch,
     query = _ref.query;
-  var autocompleteProvider = (0, _jqlEditorAutocompleteRest.useAutocompleteProvider)('link-datasource', (0, _makeGetJqlAutocompleteData.makeGetJqlAutocompleteData)(cloudId), (0, _makeGetJqlSuggestionsData.makeGetJqlSuggestionsData)(cloudId));
+  var autocompleteProvider = (0, _useAutocompleteProvider.useAutocompleteProvider)('link-datasource', (0, _makeGetJqlAutocompleteData.makeGetJqlAutocompleteData)(cloudId), (0, _makeGetJqlSuggestionsData.makeGetJqlSuggestionsData)(cloudId));
 
   // This is an expected (pretty strange imo) way of making sure text field is in focus when rendered
   var inputRef = (0, _react.useRef)({

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

@@ -14,11 +14,16 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
+var _featureGates = _interopRequireDefault(require("@atlaskit/feature-gate-js-client/feature-gates"));
 var _main = _interopRequireDefault(require("@atlaskit/intl-messages-provider/main"));
-var _link = _interopRequireDefault(require("@atlaskit/link"));
-var _modalDialog = require("@atlaskit/modal-dialog");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _link = _interopRequireDefault(require("@atlaskit/link/link"));
+var _closeButton = require("@atlaskit/modal-dialog/close-button");
+var _modalBody = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-body"));
+var _modalFooter = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-footer"));
+var _modalHeader = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-header"));
+var _modalTitle = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-title"));
+var _modalTransition = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-transition"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
@@ -27,6 +32,7 @@ var _ufoExperiences = require("../../../analytics/ufoExperiences");
 var _useColumnPickerRenderedFailedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience");
 var _useDataRenderedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience");
 var _utils = require("../../../analytics/utils");
+var _useDatasourceCrossProductAttribution = require("../../../analytics/xpc/useDatasourceCrossProductAttribution");
 var _search = require("../../../common/ui/rich-icon/search");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _datasourceExperienceId = require("../../../contexts/datasource-experience-id");
@@ -129,6 +135,8 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var experienceId = (0, _datasourceExperienceId.useDatasourceExperienceId)();
+  var _useDatasourceCrossPr = (0, _useDatasourceCrossProductAttribution.useDatasourceCrossProductAttribution)(),
+    wrapCrossProductUrl = _useDatasourceCrossPr.wrapCrossProductUrl;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var analyticsPayload = (0, _react.useMemo)(function () {
@@ -140,8 +148,9 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   // With columns available the table can keep its headers and show the empty state in place of
   // the rows, instead of replacing the whole table with it.
-  var shouldRenderTableWithNoResults = resolvedWithNoResults && !!columns.length && (0, _platformFeatureFlags.fg)('platform_lp_sllv_ux_improvements');
-  var jqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
+  var shouldRenderTableWithNoResults = resolvedWithNoResults && !!columns.length && (0, _fg.fg)('platform_lp_sllv_ux_improvements');
+  var jqlUrlUnwrapped = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
+  var jqlUrl = jqlUrlUnwrapped && (0, _fg.fg)('electric_issue_like_table_xpc_url_wrapping') ? wrapCrossProductUrl(jqlUrlUnwrapped) : jqlUrlUnwrapped;
   var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   var isDataReady = (visibleColumnKeys || []).length > 0;
   var hasNoJiraSites = availableSites && availableSites.length === 0;
@@ -273,7 +282,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
       });
     } else if (status === 'empty' || !jql || !selectedJiraSiteUrl) {
       return /*#__PURE__*/_react.default.createElement(_countViewSmartLink.SmartCardPlaceholder, {
-        placeholderText: (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.issuesCountSmartCardPlaceholderTextIssueTermRefresh : _messages3.modalMessages.issuesCountSmartCardPlaceholderText
+        placeholderText: (0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.issuesCountSmartCardPlaceholderTextIssueTermRefresh : _messages3.modalMessages.issuesCountSmartCardPlaceholderText
       });
     } else {
       var url;
@@ -293,14 +302,14 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
       if (currentSearchMethod === 'basic') {
         return _messages2.initialStateViewMessages.searchDescriptionForBasicSearchSllv;
       }
-      if ((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh')) {
+      if ((0, _fg.fg)('confluence-issue-terminology-refresh')) {
         return currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : _messages2.initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
       }
       return currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearch : _messages2.initialStateViewMessages.searchDescriptionForBasicSearch;
     };
     if (status === 'rejected' && jqlUrl) {
       return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, {
-        errorMessage: jqlUrl ? /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, _featureGateJsClient.default.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? _messages3.modalMessages.checkConnectionWithSourceVisualRefreshSllvGalaxia : _messages3.modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
+        errorMessage: jqlUrl ? /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, _featureGates.default.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? _messages3.modalMessages.checkConnectionWithSourceVisualRefreshSllvGalaxia : _messages3.modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
           values: {
             a: function a(urlText) {
               return /*#__PURE__*/_react.default.createElement(_link.default, {
@@ -329,10 +338,10 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
         testId: "jira-datasource-modal--empty-state"
       }) : /*#__PURE__*/_react.default.createElement(_initialStateView.InitialStateView, {
         icon: /*#__PURE__*/_react.default.createElement(_search.RichIconSearch, {
-          alt: formatMessage((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.searchJiraTitleIssueTermRefresh : _messages3.modalMessages.searchJiraTitle),
+          alt: formatMessage((0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.searchJiraTitleIssueTermRefresh : _messages3.modalMessages.searchJiraTitle),
           size: 'xlarge'
         }),
-        title: (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.searchJiraTitleIssueTermRefresh : _messages3.modalMessages.searchJiraTitle,
+        title: (0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.searchJiraTitleIssueTermRefresh : _messages3.modalMessages.searchJiraTitle,
         description: getDescriptionMessage(),
         learnMoreLink: currentSearchMethod === 'jql' ? {
           href: jqlSupportDocumentLink,
@@ -350,7 +359,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     }));
   }, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, shouldRenderTableWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, reset]);
   var siteSelectorLabel = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh')) {
+    if ((0, _fg.fg)('confluence-issue-terminology-refresh')) {
       return availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySitesIssueTermRefresh : _messages3.modalMessages.insertIssuesTitleIssueTermRefresh;
     }
     return availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySites : _messages3.modalMessages.insertIssuesTitle;
@@ -388,29 +397,29 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   return /*#__PURE__*/_react.default.createElement(_main.default, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
-  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {
+  }, /*#__PURE__*/_react.default.createElement(_modalTransition.default, null, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {
     testId: "jira-datasource-modal",
     onClose: onCancel,
     shouldReturnFocus: shouldReturnFocus
-  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+  }, /*#__PURE__*/_react.default.createElement(_modalHeader.default, null, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
     gap: "space.200",
     justifyContent: "space-between",
     xcss: styles.flexStyles
   }, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
     justifyContent: "end",
     xcss: styles.viewModeContainer
-  }, !hasNoJiraSites && /*#__PURE__*/_react.default.createElement(_modeSwitcher.DatasourceViewModeDropDown, null), /*#__PURE__*/_react.default.createElement(_modalDialog.CloseButton, {
+  }, !hasNoJiraSites && /*#__PURE__*/_react.default.createElement(_modeSwitcher.DatasourceViewModeDropDown, null), /*#__PURE__*/_react.default.createElement(_closeButton.CloseButton, {
     onClick: onCancel
   })), /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
     justifyContent: "start",
     xcss: styles.modalTitleContainer
-  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
+  }, /*#__PURE__*/_react.default.createElement(_modalTitle.default, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedJiraSite,
     testId: "jira-datasource-modal--site-selector",
     label: siteSelectorLabel
-  }))))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, !hasNoJiraSites ? /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_jiraSearchContainer.JiraSearchContainer, {
+  }))))), /*#__PURE__*/_react.default.createElement(_modalBody.default, null, !hasNoJiraSites ? /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_jiraSearchContainer.JiraSearchContainer, {
     setSearchBarJql: setSearchBarJql,
     searchBarJql: searchBarJql,
     setHasJqlSyntaxErrors: setHasJqlSyntaxErrors,
@@ -424,7 +433,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     title: _messages.loadingErrorMessages.noAccessToJiraSitesTitle,
     description: _messages.loadingErrorMessages.noAccessToJiraSitesDescription,
     testId: "no-jira-instances-content"
-  })), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, shouldShowIssueCount && /*#__PURE__*/_react.default.createElement(_searchCount.default, {
+  })), /*#__PURE__*/_react.default.createElement(_modalFooter.default, null, shouldShowIssueCount && /*#__PURE__*/_react.default.createElement(_searchCount.default, {
     searchCount: totalCount,
     url: jqlUrl,
     prefixTextType: "issue",

package/dist/cjs/ui/table-footer/index.js

@@ -14,7 +14,7 @@ var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _reactIntl = require("react-intl");
-var _new = require("@atlaskit/button/new");
+var _button = _interopRequireDefault(require("@atlaskit/button/icon/button"));
 var _refresh = _interopRequireDefault(require("@atlaskit/icon/core/refresh"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _assetsModal = require("../assets-modal");
@@ -63,7 +63,7 @@ var TableFooter = exports.TableFooter = function TableFooter(_ref) {
   }, onRefresh && /*#__PURE__*/React.createElement(_compiled.Inline, {
     alignBlock: "center",
     space: "space.050"
-  }, /*#__PURE__*/React.createElement(_new.IconButton, {
+  }, /*#__PURE__*/React.createElement(_button.default, {
     appearance: "subtle",
     icon: function icon(iconProps) {
       return /*#__PURE__*/React.createElement(_refresh.default, (0, _extends2.default)({}, iconProps, {

package/dist/es2019/analytics/generated/use-analytics-events.js

@@ -7,7 +7,7 @@
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 import { useCallback } from 'react';
-import { useAnalyticsEvents as useAnalyticsNextEvents } from '@atlaskit/analytics-next';
+import { useAnalyticsEvents as useAnalyticsNextEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { EVENT_CHANNEL } from '../constants';
 import createEventPayload from './create-event-payload';
 export const useAnalyticsEvents = () => {

package/dist/es2019/analytics/ufoExperiences/index.js

@@ -1,4 +1,5 @@
-import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
+import { ConcurrentExperience } from '@atlaskit/ufo/concurrent-experience';
+import { ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo/experience-types';
 const datasourcePageSegmentLoadExperienceConfig = {
   platform: {
     component: 'datasource'

package/dist/es2019/analytics/wrappers/render-failed/datasourceRenderFailedAnalyticsWrapper.js

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { withAnalyticsContext } from '@atlaskit/analytics-next';
+import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext';
 import { logToSentry } from '../../../hooks/useErrorLogger';
 import { componentMetadata } from '../../constants';
 import { useDatasourceAnalyticsEvents } from '../../index';

package/dist/es2019/analytics/xpc/useDatasourceCrossProductAttribution.js

@@ -0,0 +1,64 @@
+import { useCallback } from 'react';
+import { useCrossProductUrlWrapper } from '@atlaskit/analytics-cross-product/useCrossProductUrlWrapper';
+import { useSmartCardContext } from '@atlaskit/link-provider/context';
+import { functionWithFG } from '@atlaskit/platform-feature-flags-react/function-with-fg';
+const DATASOURCE_XPC_BRIDGE = 'linkDatasource';
+const XPC_QUERY_PARAM = 'xpis';
+const identityUrlWrapper = url => url;
+const noopAttribution = {
+  wrapCrossProductUrl: identityUrlWrapper
+};
+
+/**
+ * No-op fallback used when the `electric_issue_like_table_xpc_url_wrapping` gate is off
+ */
+const useDatasourceCrossProductAttributionFallback = () => noopAttribution;
+
+/**
+ * Returns cross-product (XPC) MAU attribution helpers for the linking-platform datasource modals
+ * and the shared issue-like table renderer.
+ *
+ * Prefer the gated export {@link useDatasourceCrossProductAttribution} which swaps in a no-op
+ * fallback when the gate is off (matching smart-card's `functionWithFG` pattern).
+ */
+const useDatasourceCrossProductAttributionUngated = () => {
+  var _effectiveProduct$toL;
+  const {
+    value: smartLinkContext
+  } = useSmartCardContext();
+  const {
+    product,
+    bridgeProduct,
+    xpcProduct,
+    xpcSubProduct
+  } = smartLinkContext !== null && smartLinkContext !== void 0 ? smartLinkContext : {};
+  const effectiveProduct = xpcProduct !== null && xpcProduct !== void 0 ? xpcProduct : product;
+  const effectiveProductForWrapper = (_effectiveProduct$toL = effectiveProduct === null || effectiveProduct === void 0 ? void 0 : effectiveProduct.toLowerCase()) !== null && _effectiveProduct$toL !== void 0 ? _effectiveProduct$toL : 'unknown';
+  const effectiveBridge = bridgeProduct !== null && bridgeProduct !== void 0 ? bridgeProduct : `${effectiveProductForWrapper}-${DATASOURCE_XPC_BRIDGE}`;
+  const wrapUrl = useCrossProductUrlWrapper({
+    bridge: effectiveBridge,
+    product: effectiveProductForWrapper,
+    ...(xpcSubProduct ? {
+      subProduct: xpcSubProduct
+    } : {})
+  });
+  const wrapCrossProductUrl = useCallback(url => {
+    if (typeof window === 'undefined' || !effectiveProduct) {
+      return url;
+    }
+    let parsedUrl;
+    try {
+      parsedUrl = new URL(url);
+    } catch {
+      return url;
+    }
+    if (parsedUrl.searchParams.has(XPC_QUERY_PARAM)) {
+      return url;
+    }
+    return wrapUrl(url);
+  }, [effectiveProduct, wrapUrl]);
+  return {
+    wrapCrossProductUrl
+  };
+};
+export const useDatasourceCrossProductAttribution = functionWithFG('electric_issue_like_table_xpc_url_wrapping', useDatasourceCrossProductAttributionUngated, useDatasourceCrossProductAttributionFallback);

package/dist/es2019/hooks/useAssetsClient.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId, resolvePrimaryWorkspace } from '../services/cmdbService';
 import { getMeta } from '../services/getMeta';

package/dist/es2019/hooks/useDatasourceTableFlag.js

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
-import { useFlags } from '@atlaskit/flag';
+import { useFlags } from '@atlaskit/flag/use-flags';
 import CrossCircleIcon from '@atlaskit/icon/core/cross-circle';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import { issueLikeTableMessages } from '../ui/issue-like-table/messages';

package/dist/es2019/hooks/useLoadOptions.js

@@ -1,5 +1,5 @@
 import { useEffect, useReducer } from 'react';
-import { ActionOperationStatus } from '@atlaskit/linking-types';
+import { ActionOperationStatus } from '@atlaskit/linking-types/datasource-actions';
 import { useDatasourceTableFlag } from './useDatasourceTableFlag';
 const loadOptions = async (fetchInputs = {}, executeFetch) => {
   if (!executeFetch) {

package/dist/es2019/services/getAvailableSites.js

@@ -1,5 +1,5 @@
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/hooks';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 export const getAccessibleProducts = async product => {
   const requestConfig = {
     method: 'POST',

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -5,10 +5,14 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { withAnalyticsContext } from '@atlaskit/analytics-next';
+import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext';
 import Button from '@atlaskit/button/standard-button';
 import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
-import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import ModalBody from '@atlaskit/modal-dialog/modal-body';
+import ModalFooter from '@atlaskit/modal-dialog/modal-footer';
+import ModalHeader from '@atlaskit/modal-dialog/modal-header';
+import ModalTitle from '@atlaskit/modal-dialog/modal-title';
+import ModalTransition from '@atlaskit/modal-dialog/modal-transition';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';

package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js

@@ -3,7 +3,7 @@ import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl';
-import Link from '@atlaskit/link';
+import Link from '@atlaskit/link/link';
 import { RichIconSearch } from '../../../../../common/ui/rich-icon/search';
 import { initialStateViewMessages } from './messages';
 const initialStateViewContainerStyles = null;

package/dist/es2019/ui/assets-modal/search-container/aql-search-input/index.js

@@ -6,17 +6,19 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { Fragment } from 'react';
 import { useIntl } from 'react-intl';
-import { IconButton } from '@atlaskit/button/new';
-import { ErrorMessage, Field, MessageWrapper } from '@atlaskit/form';
+import IconButton from '@atlaskit/button/icon/button';
+import { ErrorMessage } from '@atlaskit/form/error-message';
+import Field from '@atlaskit/form/field';
+import { MessageWrapper } from '@atlaskit/form/message-wrapper';
 import CrossCircleIcon from '@atlaskit/icon/core/cross-circle';
 import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
 import SearchIcon from '@atlaskit/icon/core/search';
 import CheckCircleIcon from '@atlaskit/icon/core/status-success';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box } from '@atlaskit/primitives/compiled';
-import Spinner from '@atlaskit/spinner';
-import Textfield from '@atlaskit/textfield';
-import Tooltip from '@atlaskit/tooltip';
+import Spinner from '@atlaskit/spinner/spinner';
+import Textfield from '@atlaskit/textfield/text-field';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { useValidateAqlText } from '../../../../hooks/useValidateAqlText';
 import { aqlKey } from '../../../../types/assets/types';
 import { searchInputMessages } from './messages';

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

@@ -4,8 +4,8 @@ import "./index.compiled.css";
 import { forwardRef } from 'react';
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import Form from '@atlaskit/form';
-import { CloseButton } from '@atlaskit/modal-dialog';
+import Form from '@atlaskit/form/form';
+import { CloseButton } from '@atlaskit/modal-dialog/close-button';
 import { Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { AqlSearchInput } from './aql-search-input';

package/dist/es2019/ui/assets-modal/search-container/object-schema-select/index.js

@@ -7,10 +7,10 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useRef, useState } from 'react';
 import debounce from 'debounce-promise';
 import { useIntl } from 'react-intl';
-import Button from '@atlaskit/button/new';
-import { Field } from '@atlaskit/form';
+import Button from '@atlaskit/button/default/button';
+import Field from '@atlaskit/form/field';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
-import { PopupSelect } from '@atlaskit/select';
+import { PopupSelect } from '@atlaskit/select/popup-select';
 import { layers } from '@atlaskit/theme/constants';
 import { useObjectSchemas } from '../../../../hooks/useObjectSchemas';
 import { objectSchemaKey } from '../../../../types/assets/types';

package/dist/es2019/ui/common/error-state/access-required.js

@@ -4,7 +4,7 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useEffect } from 'react';
 import { useIntl } from 'react-intl';
-import EmptyState from '@atlaskit/empty-state';
+import EmptyState from '@atlaskit/empty-state/empty-state';
 import { Box } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { SpotPadlockKey } from '../../../common/ui/spot/basics/padlock-key';

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

@@ -6,7 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 import Button from '@atlaskit/button/standard-button';
-import AKLink from '@atlaskit/link';
+import AKLink from '@atlaskit/link/link';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { SpotErrorSearch } from '../../../common/ui/spot/error-state/search';

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

@@ -5,7 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useEffect } from 'react';
 import { cx } from '@compiled/react';
 import { FormattedMessage } from 'react-intl';
-import Button from '@atlaskit/button/new';
+import Button from '@atlaskit/button/default/button';
 import { Box, Text } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { SpotErrorSearch } from '../../../common/ui/spot/error-state/search';