@atlaskit/link-datasource 2.5.10 → 2.5.12

package/dist/esm/ui/{jira-issues-modal → common/modal}/mode-switcher/index.js

@@ -6,6 +6,10 @@ import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { N0, N20, N30A, N60, N700 } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
+import { DatasourceAction } from '../../../../analytics/types';
+import { useUserInteractions } from '../../../../contexts/user-interactions';
+import { DisplayViewDropDown } from '../display-view-dropdown/display-view-drop-down';
+import { useViewModeContext } from './useViewModeContext';
 var modeSwitcherStyles = css({
   alignItems: 'center',
   background: "var(--ds-background-neutral, ".concat(N20, ")"),
@@ -104,4 +108,18 @@ export var ModeSwitcher = function ModeSwitcher(props) {
       }));
     });
   })) : null;
+};
+export var DatasourceViewModeDropDown = function DatasourceViewModeDropDown() {
+  var _useViewModeContext = useViewModeContext(),
+    currentViewMode = _useViewModeContext.currentViewMode,
+    setCurrentViewMode = _useViewModeContext.setCurrentViewMode;
+  var userInteractions = useUserInteractions();
+  var handleViewModeChange = function handleViewModeChange(selectedMode) {
+    userInteractions.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
+    setCurrentViewMode(selectedMode);
+  };
+  return jsx(DisplayViewDropDown, {
+    onViewModeChange: handleViewModeChange,
+    viewMode: currentViewMode
+  });
 };

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

@@ -0,0 +1,31 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+/** @jsx jsx */
+import React, { createContext, useContext, useMemo, useState } from 'react';
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { jsx } from '@emotion/react';
+var ViewModeContext = /*#__PURE__*/createContext(null);
+export var DatasourceViewModeProvider = function DatasourceViewModeProvider(_ref) {
+  var initialViewMode = _ref.viewMode,
+    children = _ref.children;
+  var _useState = useState(initialViewMode),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var value = useMemo(function () {
+    return {
+      currentViewMode: currentViewMode,
+      setCurrentViewMode: setCurrentViewMode
+    };
+  }, [currentViewMode, setCurrentViewMode]);
+  return jsx(ViewModeContext.Provider, {
+    value: value
+  }, children);
+};
+export var useViewModeContext = function useViewModeContext() {
+  var value = useContext(ViewModeContext);
+  if (!value) {
+    throw new Error('useViewModeContext must be called within DatasourceViewModeProvider');
+  }
+  return value;
+};

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

@@ -30,12 +30,12 @@ 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 { DatasourceModal } from '../../common/modal/datasource-modal';
+import { useColumnResize } from '../../common/modal/datasources-table-in-modal-preview/use-column-resize';
+import { useColumnWrapping } from '../../common/modal/datasources-table-in-modal-preview/use-column-wrapping';
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 import TableSearchCount from '../../common/modal/search-count';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
-import { useColumnResize } from '../../issue-like-table/use-column-resize';
-import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
 import { getColumnAction } from '../../issue-like-table/utils';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';

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

@@ -1,7 +1,8 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /** @jsx jsx */
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
@@ -9,19 +10,16 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
-import Button from '@atlaskit/button';
 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 { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
+import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
-import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
-import { buildDatasourceAdf } from '../../../common/utils/adf';
+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 { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
 import { AccessRequired } from '../../common/error-state/access-required';
@@ -32,110 +30,95 @@ 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 { useDatasourceContext } from '../../common/modal/datasource-context/DatasourceContext';
-import { DatasourceContextProvider } from '../../common/modal/datasource-context/DatasourceContextProvider';
+import { DatasourceContextProvider, useDatasourceContext } from '../../common/modal/datasource-context';
 import { DatasourceModal } from '../../common/modal/datasource-modal';
-import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
+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 TableSearchCount from '../../common/modal/search-count';
 import { SiteSelector } from '../../common/modal/site-selector';
-import DatasourcesTableUsingContext from '../../datasources-table-in-modal-preview';
 import { EmptyState } from '../../issue-like-table';
-import { getColumnAction } from '../../issue-like-table/utils';
 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',
   minHeight: '72px'
 });
+var isValidParameters = function isValidParameters(parameters) {
+  var _parameters$contribut;
+  return !!(parameters && parameters.cloudId && (parameters.searchString !== undefined || (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length || parameters.lastModified || parameters.lastModifiedFrom || parameters.lastModifiedTo));
+};
+var useUpdateParametersOnFormUpdate = function useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters) {
+  var _useDatasourceContext = useDatasourceContext(),
+    setParameters = _useDatasourceContext.setParameters;
+  useEffect(function () {
+    setParameters(function (parameters) {
+      return _objectSpread(_objectSpread({}, parameters), {}, {
+        cloudId: cloudId || '',
+        searchString: searchString,
+        lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
+        lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
+        lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
+        contributorAccountIds: contributorAccountIds.length > 0 ? contributorAccountIds : undefined
+      }, overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
+    });
+  }, [cloudId, searchString, lastModified, contributorAccountIds, setParameters, overrideParameters]);
+};
 export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
-  var datasourceId = props.datasourceId,
-    onCancel = props.onCancel,
-    onInsert = props.onInsert,
-    _props$viewMode = props.viewMode,
-    viewMode = _props$viewMode === void 0 ? 'table' : _props$viewMode,
+  var onCancel = props.onCancel,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
-    initialVisibleColumnKeys = props.visibleColumnKeys,
     _props$disableDisplay = props.disableDisplayDropdown,
     disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
     overrideParameters = props.overrideParameters;
-  var _useState = useState(viewMode),
+  var _useViewModeContext = useViewModeContext(),
+    currentViewMode = _useViewModeContext.currentViewMode;
+  var _useState = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
     _useState2 = _slicedToArray(_useState, 2),
-    currentViewMode = _useState2[0],
-    setCurrentViewMode = _useState2[1];
-  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
-    _useState4 = _slicedToArray(_useState3, 2),
-    cloudId = _useState4[0],
-    setCloudId = _useState4[1];
+    cloudId = _useState2[0],
+    setCloudId = _useState2[1];
   var _useAvailableSites = useAvailableSites('confluence', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState5 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+    _useState4 = _slicedToArray(_useState3, 2),
+    searchString = _useState4[0],
+    setSearchString = _useState4[1];
+  var _useState5 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchString = _useState6[0],
-    setSearchString = _useState6[1];
-  var _useState7 = useState(initialVisibleColumnKeys),
-    _useState8 = _slicedToArray(_useState7, 2),
-    visibleColumnKeys = _useState8[0],
-    setVisibleColumnKeys = _useState8[1];
-  var _useState9 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
-    _useState10 = _slicedToArray(_useState9, 2),
-    contributorAccountIds = _useState10[0],
-    setContributorAccountIds = _useState10[1];
-  var _useState11 = useState(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
+    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
     } : undefined),
-    _useState12 = _slicedToArray(_useState11, 2),
-    lastModified = _useState12[0],
-    setLastModified = _useState12[1];
+    _useState8 = _slicedToArray(_useState7, 2),
+    lastModified = _useState8[0],
+    setLastModified = _useState8[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
-  var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
-  var parameters = useMemo(function () {
-    return _objectSpread(_objectSpread({}, initialParameters), {}, {
-      cloudId: cloudId || '',
-      searchString: searchString,
-      lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
-      lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
-      lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
-      contributorAccountIds: (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0 ? contributorAccountIds : undefined
-    });
-  }, [initialParameters, cloudId, searchString, lastModified, contributorAccountIds]);
-  var isParametersSet = useMemo(function () {
-    return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
-      return v !== undefined;
-    }).length > 1;
-  }, [cloudId, parameters]);
-  var parametersToSend = useMemo(function () {
-    if (!isParametersSet) {
-      return undefined;
-    }
-    return _objectSpread(_objectSpread({}, parameters), overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
-  }, [parameters, overrideParameters, isParametersSet]);
-  var _useDatasourceTableSt = useDatasourceTableState({
-      datasourceId: datasourceId,
-      parameters: parametersToSend,
-      fieldKeys: visibleColumnKeys
-    }),
-    reset = _useDatasourceTableSt.reset,
-    status = _useDatasourceTableSt.status,
-    onNextPage = _useDatasourceTableSt.onNextPage,
-    responseItems = _useDatasourceTableSt.responseItems,
-    hasNextPage = _useDatasourceTableSt.hasNextPage,
-    columns = _useDatasourceTableSt.columns,
-    defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys,
-    loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
-    totalCount = _useDatasourceTableSt.totalCount,
-    _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
-    extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
-    destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
+  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;
@@ -168,37 +151,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       shouldForceRequest: true
     });
   }, [reset, userInteractions]);
-  useEffect(function () {
-    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    visibleColumnCount.current = newVisibleColumnKeys.length;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
-
-  // TODO: common functionality of all modals refactor in EDM-9573
-  var handleVisibleColumnKeysChange = useCallback(function () {
-    var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
-    userInteractions.add(columnAction);
-    visibleColumnCount.current = newVisibleColumnKeys.length;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [visibleColumnKeys, userInteractions]);
-  var confluenceSearchTable = useMemo(function () {
-    return jsx(ContentContainer, {
-      withTableBorder: true
-    }, jsx(DatasourcesTableUsingContext, {
-      testId: "confluence-search-datasource-table",
-      status: status,
-      columns: columns,
-      items: responseItems,
-      hasNextPage: hasNextPage,
-      visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
-      onNextPage: onNextPage,
-      onLoadDatasourceDetails: loadDatasourceDetails,
-      onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
-      extensionKey: extensionKey
-    }));
-  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, extensionKey]);
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
@@ -246,7 +199,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
         displayedColumnCount: visibleColumnCount.current
       }));
     }
-  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  }, [isDataReady, fireEvent, analyticsPayload, totalCount, visibleColumnCount]);
   useEffect(function () {
     var isResolved = status === 'resolved';
     var isTableViewMode = currentViewMode === 'table';
@@ -282,8 +235,12 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
         description: confluenceSearchModalMessages.initialViewSearchDescription
       }));
     }
-    return confluenceSearchTable;
-  }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
+    return jsx(ContentContainer, {
+      withTableBorder: true
+    }, jsx(DatasourcesTableInModalPreview, {
+      testId: "confluence-search-datasource-table"
+    }));
+  }, [columns.length, selectedConfluenceSiteUrl, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   var renderInlineLinkModalContent = useCallback(function () {
     if (status === 'unauthorized') {
       return jsx(AccessRequired, {
@@ -300,64 +257,6 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     }
   }, [confluenceSearchUrl, selectedConfluenceSiteUrl, status, urlBeingEdited]);
   var shouldShowResultsCount = !!totalCount && currentViewMode === 'table';
-  var _useDatasourceContext = useDatasourceContext(),
-    columnCustomSizes = _useDatasourceContext.columnCustomSizes,
-    wrappedColumnKeys = _useDatasourceContext.wrappedColumnKeys;
-  var onInsertPressed = useCallback(function (e, analyticsEvent) {
-    var _insertButtonClickedE;
-    if (!isParametersSet || !cloudId || !confluenceSearchUrl) {
-      return;
-    }
-    var insertButtonClickedEvent = analyticsEvent.update({
-      actionSubjectId: 'insert',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        totalItemCount: totalCount || 0,
-        displayedColumnCount: visibleColumnCount.current,
-        display: currentViewMode === 'inline' ? DatasourceDisplay.DATASOURCE_INLINE : DatasourceDisplay.DATASOURCE_TABLE,
-        searchCount: searchCount.current,
-        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
-        actions: userInteractions.get()
-      }),
-      eventType: 'ui'
-    });
-    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
-    insertButtonClickedEvent.fire(EVENT_CHANNEL);
-    if (currentViewMode === 'inline') {
-      onInsert({
-        type: 'inlineCard',
-        attrs: {
-          url: confluenceSearchUrl
-        }
-      }, consumerEvent);
-    } else {
-      onInsert(buildDatasourceAdf({
-        id: datasourceId,
-        parameters: _objectSpread(_objectSpread({}, parametersToSend), {}, {
-          cloudId: cloudId
-        }),
-        views: [{
-          type: 'table',
-          properties: {
-            columns: (visibleColumnKeys || []).map(function (key) {
-              var width = columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key];
-              var isWrapped = wrappedColumnKeys === null || wrappedColumnKeys === void 0 ? void 0 : wrappedColumnKeys.includes(key);
-              return _objectSpread(_objectSpread({
-                key: key
-              }, width ? {
-                width: width
-              } : {}), isWrapped ? {
-                isWrapped: isWrapped
-              } : {});
-            })
-          }
-        }]
-      }, confluenceSearchUrl), consumerEvent);
-    }
-  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parametersToSend, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys, userInteractions]);
-  var handleViewModeChange = function handleViewModeChange(selectedMode) {
-    userInteractions.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
-    setCurrentViewMode(selectedMode);
-  };
   var onSearch = useCallback(function (newSearchString, filters) {
     searchCount.current++;
     userInteractions.add(DatasourceAction.QUERY_UPDATED);
@@ -388,8 +287,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       shouldForceRequest: true
     });
   }, [reset, userInteractions]);
-  var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
-  var getCancelButtonAnalyticsPayload = useCallback(function () {
+  var getButtonAnalyticsPayload = useCallback(function () {
     return {
       extensionKey: extensionKey,
       destinationObjectTypes: destinationObjectTypes,
@@ -409,15 +307,14 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     selectedSite: selectedConfluenceSite,
     testId: "confluence-search-datasource-modal--site-selector",
     label: siteSelectorLabel
-  })), !hasNoConfluenceSites && !disableDisplayDropdown && jsx(DisplayViewDropDown, {
-    onViewModeChange: handleViewModeChange,
-    viewMode: currentViewMode
-  })), jsx(ModalBody, null, !hasNoConfluenceSites ? jsx(Fragment, null, jsx(Box, {
+  })), !hasNoConfluenceSites && !disableDisplayDropdown && jsx(DatasourceViewModeDropDown, null)), jsx(ModalBody, null, !hasNoConfluenceSites ? jsx(Fragment, null, jsx(Box, {
     xcss: inputContainerStyles
   }, jsx(ConfluenceSearchContainer, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: parameters
+    parameters: isValidParameters(parameters) ? parameters : {
+      cloudId: ''
+    }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {
     title: confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,
@@ -429,13 +326,12 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     testId: "confluence-search-datasource-modal-total-results-count"
   }), jsx(CancelButton, {
     onCancel: onCancel,
-    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    getAnalyticsPayload: getButtonAnalyticsPayload,
     testId: "confluence-search-modal--cancel-button"
-  }), !hasNoConfluenceSites && jsx(Button, {
-    appearance: "primary",
-    onClick: onInsertPressed,
-    isDisabled: isInsertDisabled,
-    testId: "confluence-search-datasource-modal--insert-button"
+  }), !hasNoConfluenceSites && jsx(InsertButton, {
+    testId: "confluence-search-datasource-modal--insert-button",
+    url: confluenceSearchUrl,
+    getAnalyticsPayload: getButtonAnalyticsPayload
   }, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
 };
 var analyticsContextAttributes = {
@@ -448,10 +344,18 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
 export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(function (props) {
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform.linking-platform.datasources.use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
+  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
-  }, jsx(PlainConfluenceSearchConfigModal, props)) :
+    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)));
 });

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

@@ -11,7 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import mergeWith from 'lodash/mergeWith';
 import { AbstractJastVisitor, COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, JastBuilder, OPERATOR_EQUALS, OPERATOR_IN, OPERATOR_LIKE } from '@atlaskit/jql-ast';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ALLOWED_ORDER_BY_KEYS } from '../../jira-search-container';
 import { isClauseTooComplex } from './isClauseTooComplex';
 import { isValidJql } from './index';
@@ -113,7 +113,7 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
   return JqlClauseCollectingVisitor;
 }(AbstractJastVisitor);
 export var isQueryTooComplex = function isQueryTooComplex(jql) {
-  if (!getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
+  if (!fg('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
     return false;
   }
   if (!isValidJql(jql)) {

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

@@ -11,17 +11,17 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
 import { basicSearchInputMessages } from '../../common/modal/basic-search-input/messages';
+import { ModeSwitcher } from '../../common/modal/mode-switcher';
 import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
 import { BasicFilters } from '../basic-filters';
 import { useHydrateJqlQuery } from '../basic-filters/hooks/useHydrateJqlQuery';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraJQLEditor } from '../jql-editor';
-import { ModeSwitcher } from '../mode-switcher';
 import { buildJQL } from './buildJQL';
 import { modeSwitcherMessages } from './messages';
 var inputContainerStyles = css({
@@ -79,7 +79,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     filterSelections = _useState14[0],
     setFilterSelections = _useState14[1];
   var showBasicFilters = useMemo(function () {
-    if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
+    if (fg('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;