@atlaskit/link-datasource 2.8.0 → 2.9.1

package/dist/esm/state/index.js

@@ -0,0 +1,61 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import React from 'react';
+import { createActionsHook, createContainer, createStateHook, createStore } from 'react-sweet-state';
+import { v4 as uuidv4 } from 'uuid';
+import { fg } from '@atlaskit/platform-feature-flags';
+var getInitialState = function getInitialState() {
+  return {
+    items: {}
+  };
+};
+export var actions = {
+  onAddItems: function onAddItems(items) {
+    return function (_ref) {
+      var setState = _ref.setState,
+        getState = _ref.getState;
+      var oldItems = _objectSpread({}, getState().items);
+      var _items$reduce = items.reduce(function (_ref2, item) {
+          var _item$ari;
+          var _ref3 = _slicedToArray(_ref2, 2),
+            ids = _ref3[0],
+            itemMap = _ref3[1];
+          var ari = typeof ((_item$ari = item['ari']) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? item['ari'].data : undefined;
+          var id = ari !== null && ari !== void 0 ? ari : uuidv4();
+          return [[].concat(_toConsumableArray(ids), [id]), _objectSpread(_objectSpread({}, itemMap), {}, _defineProperty({}, id, _objectSpread(_objectSpread({}, oldItems[id]), item)))];
+        }, [[], oldItems]),
+        _items$reduce2 = _slicedToArray(_items$reduce, 2),
+        newItemIds = _items$reduce2[0],
+        newItems = _items$reduce2[1];
+      setState({
+        items: newItems
+      });
+      return newItemIds;
+    };
+  }
+};
+export var Store = createStore({
+  name: 'datasource-store',
+  initialState: getInitialState(),
+  actions: actions
+});
+export var useDatasourceItem = createStateHook(Store, {
+  selector: function selector(state, _ref4) {
+    var id = _ref4.id;
+    return state.items[id];
+  }
+});
+export var useDatasourceActions = createActionsHook(Store);
+var Container = createContainer(Store);
+export var StoreContainer = function StoreContainer(_ref5) {
+  var children = _ref5.children;
+  if (fg('enable_datasource_react_sweet_state')) {
+    return /*#__PURE__*/React.createElement(Container, {
+      scope: "datasource"
+    }, children);
+  }
+  return children;
+};

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

@@ -16,7 +16,7 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -31,6 +31,7 @@ import { useAssetsClient } from '../../../hooks/useAssetsClient';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { PermissionError } from '../../../services/cmdbService.utils';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { CancelButton } from '../../common/modal/cancel-button';
@@ -62,7 +63,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = useState(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = useState(
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = _slicedToArray(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -121,7 +124,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       aql: aql || '',
       schemaId: schemaId || '',
       workspaceId: workspaceId || ''
-    }, getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+    }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
       version: VERSION_TWO
     } : {});
   }, [aql, schemaId, workspaceId]);
@@ -205,7 +208,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   useEffect(function () {
-    if (getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter')) {
+    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
       var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
       setVisibleColumnKeys(newVisibleColumnKeys);
     } else {
@@ -264,7 +267,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
           workspaceId: workspaceId,
           aql: aql,
           schemaId: schemaId
-        }, getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+        }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
           version: VERSION_TWO
         } : {}),
         views: [{
@@ -386,5 +389,5 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
 export var AssetsConfigModal = withAnalyticsContext(contextData)(function (props) {
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props)));
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props))));
 });

package/dist/esm/ui/common/modal/datasource-modal/createDatasourceModal.js

@@ -0,0 +1,48 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+import React from 'react';
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { jsx } from '@emotion/react';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { DatasourceExperienceIdProvider } from '../../../../contexts/datasource-experience-id';
+import { UserInteractionsProvider } from '../../../../contexts/user-interactions';
+import { DatasourceContextProvider } from '../datasource-context';
+import { DatasourceViewModeProvider } from '../mode-switcher/useViewModeContext';
+var DEFAULT_VIEW_MODE = 'table';
+export var createDatasourceModal = function createDatasourceModal(_ref) {
+  var isValidParameters = _ref.isValidParameters,
+    dataProvider = _ref.dataProvider,
+    ModalContent = _ref.component;
+  return function (props) {
+    var datasourceId = props.datasourceId,
+      visibleColumnKeys = props.visibleColumnKeys,
+      columnCustomSizes = props.columnCustomSizes,
+      wrappedColumnKeys = props.wrappedColumnKeys,
+      parameters = props.parameters,
+      onInsert = props.onInsert,
+      viewMode = props.viewMode;
+    return jsx(AnalyticsContext, {
+      data: {
+        source: 'datasourceConfigModal',
+        component: 'datasourceConfigModal',
+        attributes: {
+          dataProvider: dataProvider
+        }
+      }
+    }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(DatasourceContextProvider, {
+      datasourceId: datasourceId,
+      initialVisibleColumnKeys: visibleColumnKeys,
+      initialColumnCustomSizes: columnCustomSizes,
+      initialWrappedColumnKeys: wrappedColumnKeys,
+      initialParameters: parameters,
+      isValidParameters: isValidParameters,
+      onInsert: onInsert
+    }, jsx(DatasourceViewModeProvider, {
+      viewMode: viewMode !== null && viewMode !== void 0 ? viewMode : DEFAULT_VIEW_MODE
+    }, jsx(ModalContent, props))))));
+  };
+};

package/dist/esm/ui/common/modal/datasources-table-in-modal-preview/index.js

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
+import React, { useCallback } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { DatasourceAction } from '../../../../analytics/types';
+import { useUserInteractions } from '../../../../contexts/user-interactions';
 import { IssueLikeDataTableView } from '../../../issue-like-table';
 import { useDatasourceContext } from '../datasource-context';
 var Table = function Table(props) {
@@ -21,13 +23,19 @@ var Table = function Table(props) {
     loadDatasourceDetails = _useDatasourceContext2.loadDatasourceDetails,
     _useDatasourceContext3 = _useDatasourceContext2.extensionKey,
     extensionKey = _useDatasourceContext3 === void 0 ? null : _useDatasourceContext3;
+  var userInteractions = useUserInteractions();
+  var handleOnNextPage = useCallback(function () {
+    var onNextPageProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    userInteractions.add(DatasourceAction.NEXT_PAGE_SCROLLED);
+    onNextPage(onNextPageProps);
+  }, [onNextPage, userInteractions]);
   return /*#__PURE__*/React.createElement(IssueLikeDataTableView, _extends({}, props, {
     status: status,
     columns: columns,
     items: responseItems,
     hasNextPage: hasNextPage,
     visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
-    onNextPage: onNextPage,
+    onNextPage: handleOnNextPage,
     onLoadDatasourceDetails: loadDatasourceDetails,
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     extensionKey: extensionKey,

package/dist/esm/ui/common/modal/insert-button/index.js

@@ -21,6 +21,7 @@ export var InsertButton = function InsertButton(_ref) {
   var testId = _ref.testId,
     url = _ref.url,
     getAnalyticsPayload = _ref.getAnalyticsPayload,
+    overwriteParameters = _ref.overwriteParameters,
     children = _ref.children;
   var _useDatasourceContext = useDatasourceContext(),
     datasourceId = _useDatasourceContext.datasourceId,
@@ -45,13 +46,13 @@ export var InsertButton = function InsertButton(_ref) {
     }
     var insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
-      attributes: _objectSpread(_objectSpread({}, getAnalyticsPayload()), {}, {
+      attributes: _objectSpread({
         totalItemCount: totalCount || 0,
         displayedColumnCount: visibleColumnCount.current,
         display: currentViewMode === 'inline' ? DatasourceDisplay.DATASOURCE_INLINE : DatasourceDisplay.DATASOURCE_TABLE,
         searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
         actions: userInteractions.get()
-      }),
+      }, getAnalyticsPayload()),
       eventType: 'ui'
     });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
@@ -66,7 +67,7 @@ export var InsertButton = function InsertButton(_ref) {
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: parameters,
+        parameters: overwriteParameters ? overwriteParameters(parameters) : parameters,
         views: [{
           type: 'table',
           properties: {
@@ -85,7 +86,7 @@ export var InsertButton = function InsertButton(_ref) {
         }]
       }, url), consumerEvent);
     }
-  }, [isValidParameters, parameters, url, getAnalyticsPayload, totalCount, visibleColumnCount, currentViewMode, userInteractions, onInsert, datasourceId, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, overwriteParameters, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys]);
   return jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,

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

@@ -12,7 +12,7 @@ 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 { withAnalyticsContext } from '@atlaskit/analytics-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';
@@ -25,6 +25,7 @@ import { DatasourceExperienceIdProvider } from '../../../contexts/datasource-exp
 import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { NoInstancesView } from '../../common/error-state/no-instances';
@@ -33,12 +34,13 @@ import { InitialStateView } from '../../common/initial-state-view';
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
-import { DatasourceContextProvider, useDatasourceContext } from '../../common/modal/datasource-context';
+import { useDatasourceContext } from '../../common/modal/datasource-context';
 import { DatasourceModal } from '../../common/modal/datasource-modal';
+import { createDatasourceModal } from '../../common/modal/datasource-modal/createDatasourceModal';
 import DatasourcesTableInModalPreview from '../../common/modal/datasources-table-in-modal-preview';
 import { InsertButton } from '../../common/modal/insert-button';
 import { DatasourceViewModeDropDown } from '../../common/modal/mode-switcher';
-import { DatasourceViewModeProvider, useViewModeContext } from '../../common/modal/mode-switcher/useViewModeContext';
+import { useViewModeContext } from '../../common/modal/mode-switcher/useViewModeContext';
 import TableSearchCount from '../../common/modal/search-count';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState } from '../../issue-like-table';
@@ -46,7 +48,6 @@ 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 DEFAULT_VIEW_MODE = 'table';
 var inputContainerStyles = xcss({
   alignItems: 'baseline',
   display: 'flex',
@@ -74,32 +75,44 @@ var useUpdateParametersOnFormUpdate = function useUpdateParametersOnFormUpdate(c
 };
 export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var onCancel = props.onCancel,
-    initialParameters = props.parameters,
     urlBeingEdited = props.url,
     _props$disableDisplay = props.disableDisplayDropdown,
     disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
     overrideParameters = props.overrideParameters;
   var _useViewModeContext = useViewModeContext(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var _useState = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+  var _useDatasourceContext2 = useDatasourceContext(),
+    visibleColumnKeys = _useDatasourceContext2.visibleColumnKeys,
+    _useDatasourceContext3 = _useDatasourceContext2.tableState,
+    reset = _useDatasourceContext3.reset,
+    status = _useDatasourceContext3.status,
+    responseItems = _useDatasourceContext3.responseItems,
+    _useDatasourceContext4 = _useDatasourceContext3.extensionKey,
+    extensionKey = _useDatasourceContext4 === void 0 ? null : _useDatasourceContext4,
+    destinationObjectTypes = _useDatasourceContext3.destinationObjectTypes,
+    totalCount = _useDatasourceContext3.totalCount,
+    columns = _useDatasourceContext3.columns,
+    visibleColumnCount = _useDatasourceContext2.visibleColumnCount,
+    parameters = _useDatasourceContext2.parameters;
+  var _useState = useState(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
     _useState2 = _slicedToArray(_useState, 2),
     cloudId = _useState2[0],
     setCloudId = _useState2[1];
   var _useAvailableSites = useAvailableSites('confluence', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+  var _useState3 = useState(parameters === null || parameters === void 0 ? void 0 : parameters.searchString),
     _useState4 = _slicedToArray(_useState3, 2),
     searchString = _useState4[0],
     setSearchString = _useState4[1];
-  var _useState5 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
+  var _useState5 = useState((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []),
     _useState6 = _slicedToArray(_useState5, 2),
     contributorAccountIds = _useState6[0],
     setContributorAccountIds = _useState6[1];
-  var _useState7 = useState(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
-      value: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified,
-      from: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedFrom,
-      to: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedTo
+  var _useState7 = useState(parameters !== null && parameters !== void 0 && parameters.lastModified ? {
+      value: parameters === null || parameters === void 0 ? void 0 : parameters.lastModified,
+      from: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedFrom,
+      to: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedTo
     } : undefined),
     _useState8 = _slicedToArray(_useState7, 2),
     lastModified = _useState8[0],
@@ -109,19 +122,6 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
   useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
-  var _useDatasourceContext2 = useDatasourceContext(),
-    visibleColumnKeys = _useDatasourceContext2.visibleColumnKeys,
-    _useDatasourceContext3 = _useDatasourceContext2.tableState,
-    reset = _useDatasourceContext3.reset,
-    status = _useDatasourceContext3.status,
-    responseItems = _useDatasourceContext3.responseItems,
-    _useDatasourceContext4 = _useDatasourceContext3.extensionKey,
-    extensionKey = _useDatasourceContext4 === void 0 ? null : _useDatasourceContext4,
-    destinationObjectTypes = _useDatasourceContext3.destinationObjectTypes,
-    totalCount = _useDatasourceContext3.totalCount,
-    columns = _useDatasourceContext3.columns,
-    visibleColumnCount = _useDatasourceContext2.visibleColumnCount,
-    parameters = _useDatasourceContext2.parameters;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
@@ -315,7 +315,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   }, jsx(ConfluenceSearchContainer, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: isValidParameters(parameters) ? parameters : {
+    parameters: parameters && isValidParameters(parameters) ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {
@@ -346,19 +346,16 @@ var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.con
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
-export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(function (props) {
-  var _props$viewMode;
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
-    datasourceId: props.datasourceId,
-    initialVisibleColumnKeys: props.visibleColumnKeys,
-    initialColumnCustomSizes: props.columnCustomSizes,
-    initialWrappedColumnKeys: props.wrappedColumnKeys,
-    initialParameters: props.parameters,
-    isValidParameters: isValidParameters,
-    onInsert: props.onInsert
-  }, jsx(DatasourceViewModeProvider, {
-    viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
-  }, jsx(PlainConfluenceSearchConfigModal, props))) :
-  // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
-  jsx(PlainConfluenceSearchConfigModalOld, props)));
-});
+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, props));
+  }
+  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
+    data: contextData
+  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainConfluenceSearchConfigModalOld, props)))));
+};

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -8,7 +8,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';
 import { startUfoExperience } from '../../analytics/ufoExperiences';
@@ -18,6 +18,7 @@ import { fetchMessagesForLocale } from '../../common/utils/locale/fetch-messages
 import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../contexts/datasource-experience-id';
 import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
 import i18nEN from '../../i18n/en';
+import { StoreContainer } from '../../state';
 import { ScrollableContainerHeight } from '../../ui/issue-like-table/styled';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
 import { AccessRequired } from '../common/error-state/access-required';
@@ -113,7 +114,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var forcedReset = useCallback(function () {
     reset({
       shouldForceRequest: true,
-      shouldResetColumns: getBooleanFF('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
+      shouldResetColumns: fg('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
     });
   }, [reset, datasourceId]);
   var onRefresh = useCallback(function () {
@@ -184,5 +185,5 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   })));
 };
 export var DatasourceTableView = withAnalyticsContext(componentMetadata.tableView)(function (props) {
-  return jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props));
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props)));
 });