@atlaskit/link-datasource 3.13.15 → 3.13.17

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/link-datasource
 
+## 3.13.17
+
+### Patch Changes
+
+- [#174013](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/174013)
+  [`39cb9b152b1bc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/39cb9b152b1bc) -
+  Removes feature flag platform-datasources-use-refactored-config-modal which removes the old
+  implementation of the Jira and Confluence SLLV modals, and now uses a refactored implementation.
+
+## 3.13.16
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.13.15
 
 ### Patch Changes

package/dist/cjs/ui/common/modal/mode-switcher/index.js

@@ -28,7 +28,6 @@ var modeSwitcherStyles = (0, _react2.css)({
   boxSizing: 'border-box',
   display: 'inline-flex',
   gap: "var(--ds-space-050, 4px)",
-  lineHeight: "var(--ds-space-200, 16px)",
   padding: "var(--ds-space-050, 4px)",
   '&:disabled': {
     opacity: '0.5'
@@ -44,8 +43,8 @@ var modeInputStyles = (0, _react2.css)({
 });
 var modeSwitcherLabelStyles = (0, _react2.css)({
   color: "var(--ds-text-subtlest, ".concat(_colors.N700, ")"),
-  fontSize: "var(--ds-space-150, 12px)",
-  fontWeight: '600',
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-semibold, 600)",
   textTransform: 'uppercase',
   padding: "var(--ds-space-050, 4px)",
   borderRadius: "var(--ds-space-050, 4px)",

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

@@ -10,16 +10,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
-var _analyticsNext = require("@atlaskit/analytics-next");
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _modalDialog = require("@atlaskit/modal-dialog");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _analytics = require("../../../analytics");
-var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
-var _datasourceExperienceId = require("../../../contexts/datasource-experience-id");
 var _userInteractions = require("../../../contexts/user-interactions");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
 var _useAvailableSites2 = require("../../../services/useAvailableSites");
@@ -45,7 +41,6 @@ var _issueLikeTable = require("../../issue-like-table");
 var _confluenceSearchContainer = _interopRequireDefault(require("../confluence-search-container"));
 var _confluenceSearchInitialStateSvg = require("./confluence-search-initial-state-svg");
 var _messages = require("./messages");
-var _ModalOld = require("./ModalOld");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */ /**
  * @jsxRuntime classic
@@ -345,32 +340,18 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     getAnalyticsPayload: getButtonAnalyticsPayload
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.confluenceSearchModalMessages.insertResultsButtonText)))));
 };
-var analyticsContextAttributes = {
-  dataProvider: 'confluence-search'
-};
-var analyticsContextData = _objectSpread(_objectSpread({}, _constants.componentMetadata.configModal), {}, {
-  source: 'datasourceConfigModal'
-});
-var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
-  attributes: _objectSpread({}, analyticsContextAttributes)
-});
 var ConnectedConfluenceSearchConfigModal = (0, _createDatasourceModal.createDatasourceModal)({
   isValidParameters: isValidParameters,
   dataProvider: 'confluence-search',
   component: PlainConfluenceSearchConfigModal
 });
 var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
-  if ((0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal')) {
-    return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(ConnectedConfluenceSearchConfigModal, (0, _extends2.default)({}, props, {
-      /**
-       * If the intial parameters are not valid, we will not initialise the modal state
-       * with `overrideParameters`. This is to allow the modal to be opened without
-       * any initial parameters and require the user to perform a search.
-       */
-      parameters: props.overrideParameters && isValidParameters(props.parameters) ? _objectSpread(_objectSpread({}, props.parameters), props.overrideParameters) : props.parameters
-    })));
-  }
-  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
-    data: contextData
-  }, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _react2.jsx)(_ModalOld.PlainConfluenceSearchConfigModal, props)))));
+  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(ConnectedConfluenceSearchConfigModal, (0, _extends2.default)({}, props, {
+    /**
+     * If the intial parameters are not valid, we will not initialise the modal state
+     * with `overrideParameters`. This is to allow the modal to be opened without
+     * any initial parameters and require the user to perform a search.
+     */
+    parameters: props.overrideParameters && isValidParameters(props.parameters) ? _objectSpread(_objectSpread({}, props.parameters), props.overrideParameters) : props.parameters
+  })));
 };

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

@@ -11,10 +11,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
-var _analyticsNext = require("@atlaskit/analytics-next");
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _modalDialog = require("@atlaskit/modal-dialog");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
@@ -53,7 +51,6 @@ var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _jiraSearchContainer = require("../jira-search-container");
 var _jiraIssuesInitialStateSvg = require("./jira-issues-initial-state-svg");
 var _messages3 = require("./messages");
-var _ModalOld = require("./ModalOld");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @atlaskit/platform/no-preconditioning */ /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */ /**
  * @jsxRuntime classic
@@ -379,15 +376,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonText))))));
 };
-var analyticsContextAttributes = {
-  dataProvider: 'jira-issues'
-};
-var analyticsContextData = _objectSpread(_objectSpread({}, _constants.componentMetadata.configModal), {}, {
-  source: 'datasourceConfigModal'
-});
-var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
-  attributes: _objectSpread({}, analyticsContextAttributes)
-});
 var ConnectedJiraIssueConfigModal = (0, _createDatasourceModal.createDatasourceModal)({
   isValidParameters: isValidParameters,
   dataProvider: 'jira-issues',
@@ -413,10 +401,5 @@ var JiraIssuesConfigModalWithExtraAnalyticsOnInsert = function JiraIssuesConfigM
   })));
 };
 var JiraIssuesConfigModal = exports.JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
-  if ((0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal')) {
-    return (0, _react2.jsx)(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
-  }
-  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
-    data: contextData
-  }, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _react2.jsx)(_ModalOld.PlainJiraIssuesConfigModalOld, props)))));
+  return (0, _react2.jsx)(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
 };

package/dist/es2019/ui/common/modal/mode-switcher/index.js

@@ -20,7 +20,6 @@ const modeSwitcherStyles = css({
   boxSizing: 'border-box',
   display: 'inline-flex',
   gap: "var(--ds-space-050, 4px)",
-  lineHeight: "var(--ds-space-200, 16px)",
   padding: "var(--ds-space-050, 4px)",
   '&:disabled': {
     opacity: '0.5'
@@ -36,8 +35,8 @@ const modeInputStyles = css({
 });
 const modeSwitcherLabelStyles = css({
   color: `var(--ds-text-subtlest, ${N700})`,
-  fontSize: "var(--ds-space-150, 12px)",
-  fontWeight: '600',
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-semibold, 600)",
   textTransform: 'uppercase',
   padding: `${"var(--ds-space-050, 4px)"}`,
   borderRadius: "var(--ds-space-050, 4px)",

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

@@ -9,17 +9,13 @@ import { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
-import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceSearchMethod } from '../../../analytics/types';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
-import { DatasourceExperienceIdProvider } from '../../../contexts/datasource-experience-id';
-import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
+import { useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
 import { StoreContainer } from '../../../state';
@@ -44,7 +40,6 @@ import { EmptyState } from '../../issue-like-table';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
 import { confluenceSearchModalMessages } from './messages';
-import { PlainConfluenceSearchConfigModal as PlainConfluenceSearchConfigModalOld } from './ModalOld';
 const inputContainerStyles = xcss({
   alignItems: 'baseline',
   display: 'flex',
@@ -337,39 +332,21 @@ export const PlainConfluenceSearchConfigModal = props => {
     getAnalyticsPayload: getButtonAnalyticsPayload
   }, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
 };
-const analyticsContextAttributes = {
-  dataProvider: 'confluence-search'
-};
-const analyticsContextData = {
-  ...componentMetadata.configModal,
-  source: 'datasourceConfigModal'
-};
-const contextData = {
-  ...analyticsContextData,
-  attributes: {
-    ...analyticsContextAttributes
-  }
-};
 const ConnectedConfluenceSearchConfigModal = createDatasourceModal({
   isValidParameters,
   dataProvider: 'confluence-search',
   component: PlainConfluenceSearchConfigModal
 });
 export const ConfluenceSearchConfigModal = props => {
-  if (fg('platform-datasources-use-refactored-config-modal')) {
-    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, _extends({}, props, {
-      /**
-       * If the intial parameters are not valid, we will not initialise the modal state
-       * with `overrideParameters`. This is to allow the modal to be opened without
-       * any initial parameters and require the user to perform a search.
-       */
-      parameters: props.overrideParameters && isValidParameters(props.parameters) ? {
-        ...props.parameters,
-        ...props.overrideParameters
-      } : props.parameters
-    })));
-  }
-  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
-    data: contextData
-  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainConfluenceSearchConfigModalOld, props)))));
+  return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, _extends({}, props, {
+    /**
+     * If the intial parameters are not valid, we will not initialise the modal state
+     * with `overrideParameters`. This is to allow the modal to be opened without
+     * any initial parameters and require the user to perform a search.
+     */
+    parameters: props.overrideParameters && isValidParameters(props.parameters) ? {
+      ...props.parameters,
+      ...props.overrideParameters
+    } : props.parameters
+  })));
 };

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

@@ -10,20 +10,18 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
-import { componentMetadata, EVENT_CHANNEL } from '../../../analytics/constants';
+import { EVENT_CHANNEL } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
 import { startUfoExperience } from '../../../analytics/ufoExperiences';
 import { useColumnPickerRenderedFailedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
 import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
 import { mapSearchMethod } from '../../../analytics/utils';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
-import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
-import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
+import { useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
+import { useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
 import { StoreContainer } from '../../../state';
@@ -52,7 +50,6 @@ import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
 import { JiraInitialStateSVG } from './jira-issues-initial-state-svg';
 import { modalMessages } from './messages';
-import { PlainJiraIssuesConfigModalOld } from './ModalOld';
 const getDisplayValue = (currentViewMode, itemCount) => {
   if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
@@ -372,19 +369,6 @@ const PlainJiraIssuesConfigModal = props => {
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
   }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
 };
-const analyticsContextAttributes = {
-  dataProvider: 'jira-issues'
-};
-const analyticsContextData = {
-  ...componentMetadata.configModal,
-  source: 'datasourceConfigModal'
-};
-const contextData = {
-  ...analyticsContextData,
-  attributes: {
-    ...analyticsContextAttributes
-  }
-};
 const ConnectedJiraIssueConfigModal = createDatasourceModal({
   isValidParameters,
   dataProvider: 'jira-issues',
@@ -410,10 +394,5 @@ const JiraIssuesConfigModalWithExtraAnalyticsOnInsert = props => {
   })));
 };
 export const JiraIssuesConfigModal = props => {
-  if (fg('platform-datasources-use-refactored-config-modal')) {
-    return jsx(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
-  }
-  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
-    data: contextData
-  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainJiraIssuesConfigModalOld, props)))));
+  return jsx(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
 };

package/dist/esm/ui/common/modal/mode-switcher/index.js

@@ -20,7 +20,6 @@ var modeSwitcherStyles = css({
   boxSizing: 'border-box',
   display: 'inline-flex',
   gap: "var(--ds-space-050, 4px)",
-  lineHeight: "var(--ds-space-200, 16px)",
   padding: "var(--ds-space-050, 4px)",
   '&:disabled': {
     opacity: '0.5'
@@ -36,8 +35,8 @@ var modeInputStyles = css({
 });
 var modeSwitcherLabelStyles = css({
   color: "var(--ds-text-subtlest, ".concat(N700, ")"),
-  fontSize: "var(--ds-space-150, 12px)",
-  fontWeight: '600',
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-semibold, 600)",
   textTransform: 'uppercase',
   padding: "var(--ds-space-050, 4px)",
   borderRadius: "var(--ds-space-050, 4px)",

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

@@ -12,17 +12,13 @@ import { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
-import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceSearchMethod } from '../../../analytics/types';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
-import { DatasourceExperienceIdProvider } from '../../../contexts/datasource-experience-id';
-import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
+import { useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
 import { StoreContainer } from '../../../state';
@@ -47,7 +43,6 @@ import { EmptyState } from '../../issue-like-table';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
 import { confluenceSearchModalMessages } from './messages';
-import { PlainConfluenceSearchConfigModal as PlainConfluenceSearchConfigModalOld } from './ModalOld';
 var inputContainerStyles = xcss({
   alignItems: 'baseline',
   display: 'flex',
@@ -342,32 +337,18 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     getAnalyticsPayload: getButtonAnalyticsPayload
   }, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
 };
-var analyticsContextAttributes = {
-  dataProvider: 'confluence-search'
-};
-var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.configModal), {}, {
-  source: 'datasourceConfigModal'
-});
-var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
-  attributes: _objectSpread({}, analyticsContextAttributes)
-});
 var ConnectedConfluenceSearchConfigModal = createDatasourceModal({
   isValidParameters: isValidParameters,
   dataProvider: 'confluence-search',
   component: PlainConfluenceSearchConfigModal
 });
 export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
-  if (fg('platform-datasources-use-refactored-config-modal')) {
-    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, _extends({}, props, {
-      /**
-       * If the intial parameters are not valid, we will not initialise the modal state
-       * with `overrideParameters`. This is to allow the modal to be opened without
-       * any initial parameters and require the user to perform a search.
-       */
-      parameters: props.overrideParameters && isValidParameters(props.parameters) ? _objectSpread(_objectSpread({}, props.parameters), props.overrideParameters) : props.parameters
-    })));
-  }
-  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
-    data: contextData
-  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainConfluenceSearchConfigModalOld, props)))));
+  return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, _extends({}, props, {
+    /**
+     * If the intial parameters are not valid, we will not initialise the modal state
+     * with `overrideParameters`. This is to allow the modal to be opened without
+     * any initial parameters and require the user to perform a search.
+     */
+    parameters: props.overrideParameters && isValidParameters(props.parameters) ? _objectSpread(_objectSpread({}, props.parameters), props.overrideParameters) : props.parameters
+  })));
 };

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

@@ -14,20 +14,18 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
-import { componentMetadata, EVENT_CHANNEL } from '../../../analytics/constants';
+import { EVENT_CHANNEL } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
 import { startUfoExperience } from '../../../analytics/ufoExperiences';
 import { useColumnPickerRenderedFailedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
 import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
 import { mapSearchMethod } from '../../../analytics/utils';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
-import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
-import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
+import { useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
+import { useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
 import { StoreContainer } from '../../../state';
@@ -56,7 +54,6 @@ import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
 import { JiraInitialStateSVG } from './jira-issues-initial-state-svg';
 import { modalMessages } from './messages';
-import { PlainJiraIssuesConfigModalOld } from './ModalOld';
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
@@ -377,15 +374,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
   }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
 };
-var analyticsContextAttributes = {
-  dataProvider: 'jira-issues'
-};
-var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.configModal), {}, {
-  source: 'datasourceConfigModal'
-});
-var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
-  attributes: _objectSpread({}, analyticsContextAttributes)
-});
 var ConnectedJiraIssueConfigModal = createDatasourceModal({
   isValidParameters: isValidParameters,
   dataProvider: 'jira-issues',
@@ -411,10 +399,5 @@ var JiraIssuesConfigModalWithExtraAnalyticsOnInsert = function JiraIssuesConfigM
   })));
 };
 export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
-  if (fg('platform-datasources-use-refactored-config-modal')) {
-    return jsx(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
-  }
-  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
-    data: contextData
-  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainJiraIssuesConfigModalOld, props)))));
+  return jsx(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.13.15",
+	"version": "3.13.17",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -71,13 +71,13 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.3.0",
-		"@atlaskit/react-select": "^1.4.0",
-		"@atlaskit/select": "^18.7.0",
+		"@atlaskit/react-select": "^1.5.0",
+		"@atlaskit/select": "^18.8.0",
 		"@atlaskit/smart-card": "^32.5.0",
 		"@atlaskit/smart-user-picker": "6.11.2",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/tag": "^12.6.0",
-		"@atlaskit/textfield": "6.6.0",
+		"@atlaskit/textfield": "6.7.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tokens": "^2.4.0",
 		"@atlaskit/tooltip": "^18.9.0",
@@ -173,9 +173,6 @@
 		},
 		"platform-datasources-enable-two-way-sync-assignee": {
 			"type": "boolean"
-		},
-		"platform-datasources-use-refactored-config-modal": {
-			"type": "boolean"
 		}
 	}
 }