@atlaskit/link-datasource 2.5.10 → 2.5.11

package/dist/cjs/ui/common/modal/datasources-table-in-modal-preview/use-column-visibility/index.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useColumnVisibility = void 0;
+var _react = require("react");
+var _userInteractions = require("../../../../../contexts/user-interactions");
+var _utils = require("../../../../issue-like-table/utils");
+var useColumnVisibility = exports.useColumnVisibility = function useColumnVisibility(_ref) {
+  var visibleColumnKeys = _ref.visibleColumnKeys,
+    setVisibleColumnKeys = _ref.setVisibleColumnKeys,
+    defaultVisibleColumnKeys = _ref.defaultVisibleColumnKeys,
+    initialVisibleColumnKeys = _ref.initialVisibleColumnKeys;
+  var userInteractions = (0, _userInteractions.useUserInteractions)();
+  var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
+  (0, _react.useEffect)(function () {
+    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [initialVisibleColumnKeys, setVisibleColumnKeys, defaultVisibleColumnKeys]);
+  var onVisibleColumnKeysChange = (0, _react.useCallback)(function () {
+    var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var columnAction = (0, _utils.getColumnAction)(visibleColumnKeys || [], newVisibleColumnKeys);
+    userInteractions.add(columnAction);
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [visibleColumnKeys, setVisibleColumnKeys, userInteractions]);
+  return {
+    onVisibleColumnKeysChange: onVisibleColumnKeysChange,
+    visibleColumnCount: visibleColumnCount
+  };
+};

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

@@ -4,12 +4,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ModeSwitcher = void 0;
+exports.ModeSwitcher = exports.DatasourceViewModeDropDown = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
+var _types = require("../../../../analytics/types");
+var _userInteractions = require("../../../../contexts/user-interactions");
+var _displayViewDropDown = require("../display-view-dropdown/display-view-drop-down");
+var _useViewModeContext2 = require("./useViewModeContext");
 /** @jsx jsx */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -112,4 +116,18 @@ var ModeSwitcher = exports.ModeSwitcher = function ModeSwitcher(props) {
       }));
     });
   })) : null;
+};
+var DatasourceViewModeDropDown = exports.DatasourceViewModeDropDown = function DatasourceViewModeDropDown() {
+  var _useViewModeContext = (0, _useViewModeContext2.useViewModeContext)(),
+    currentViewMode = _useViewModeContext.currentViewMode,
+    setCurrentViewMode = _useViewModeContext.setCurrentViewMode;
+  var userInteractions = (0, _userInteractions.useUserInteractions)();
+  var handleViewModeChange = function handleViewModeChange(selectedMode) {
+    userInteractions.add(_types.DatasourceAction.DISPLAY_VIEW_CHANGED);
+    setCurrentViewMode(selectedMode);
+  };
+  return (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
+    onViewModeChange: handleViewModeChange,
+    viewMode: currentViewMode
+  });
 };

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

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useViewModeContext = exports.DatasourceViewModeProvider = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _react2 = require("@emotion/react");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+/** @jsx jsx */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+var ViewModeContext = /*#__PURE__*/(0, _react.createContext)(null);
+var DatasourceViewModeProvider = exports.DatasourceViewModeProvider = function DatasourceViewModeProvider(_ref) {
+  var initialViewMode = _ref.viewMode,
+    children = _ref.children;
+  var _useState = (0, _react.useState)(initialViewMode),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var value = (0, _react.useMemo)(function () {
+    return {
+      currentViewMode: currentViewMode,
+      setCurrentViewMode: setCurrentViewMode
+    };
+  }, [currentViewMode, setCurrentViewMode]);
+  return (0, _react2.jsx)(ViewModeContext.Provider, {
+    value: value
+  }, children);
+};
+var useViewModeContext = exports.useViewModeContext = function useViewModeContext() {
+  var value = (0, _react.useContext)(ViewModeContext);
+  if (!value) {
+    throw new Error('useViewModeContext must be called within DatasourceViewModeProvider');
+  }
+  return value;
+};

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

@@ -32,12 +32,12 @@ var _cancelButton = require("../../common/modal/cancel-button");
 var _contentContainer = require("../../common/modal/content-container");
 var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
 var _datasourceModal = require("../../common/modal/datasource-modal");
+var _useColumnResize2 = require("../../common/modal/datasources-table-in-modal-preview/use-column-resize");
+var _useColumnWrapping2 = require("../../common/modal/datasources-table-in-modal-preview/use-column-wrapping");
 var _displayViewDropDown = require("../../common/modal/display-view-dropdown/display-view-drop-down");
 var _searchCount = _interopRequireDefault(require("../../common/modal/search-count"));
 var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
-var _useColumnResize2 = require("../../issue-like-table/use-column-resize");
-var _useColumnWrapping2 = require("../../issue-like-table/use-column-wrapping");
 var _utils = require("../../issue-like-table/utils");
 var _confluenceSearchContainer = _interopRequireDefault(require("../confluence-search-container"));
 var _confluenceSearchInitialStateSvg = require("./confluence-search-initial-state-svg");

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PlainConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
@@ -23,7 +23,6 @@ var _adf = require("../../../common/utils/adf");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _datasourceExperienceId = require("../../../contexts/datasource-experience-id");
 var _userInteractions = require("../../../contexts/user-interactions");
-var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
 var _useAvailableSites2 = require("../../../services/useAvailableSites");
 var _accessRequired = require("../../common/error-state/access-required");
@@ -34,112 +33,98 @@ var _initialStateView = require("../../common/initial-state-view");
 var _cancelButton = require("../../common/modal/cancel-button");
 var _contentContainer = require("../../common/modal/content-container");
 var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
-var _DatasourceContext = require("../../common/modal/datasource-context/DatasourceContext");
-var _DatasourceContextProvider = require("../../common/modal/datasource-context/DatasourceContextProvider");
+var _datasourceContext = require("../../common/modal/datasource-context");
 var _datasourceModal = require("../../common/modal/datasource-modal");
-var _displayViewDropDown = require("../../common/modal/display-view-dropdown/display-view-drop-down");
+var _datasourcesTableInModalPreview = _interopRequireDefault(require("../../common/modal/datasources-table-in-modal-preview"));
+var _modeSwitcher = require("../../common/modal/mode-switcher");
+var _useViewModeContext2 = require("../../common/modal/mode-switcher/useViewModeContext");
 var _searchCount = _interopRequireDefault(require("../../common/modal/search-count"));
 var _siteSelector = require("../../common/modal/site-selector");
-var _datasourcesTableInModalPreview = _interopRequireDefault(require("../../datasources-table-in-modal-preview"));
 var _issueLikeTable = require("../../issue-like-table");
-var _utils = require("../../issue-like-table/utils");
 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; } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+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 */ /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+var DEFAULT_VIEW_MODE = 'table';
 var inputContainerStyles = (0, _primitives.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 = (0, _datasourceContext.useDatasourceContext)(),
+    setParameters = _useDatasourceContext.setParameters;
+  (0, _react.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]);
+};
 var PlainConfluenceSearchConfigModal = exports.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,
     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 = (0, _react.useState)(viewMode),
+  var _useViewModeContext = (0, _useViewModeContext2.useViewModeContext)(),
+    currentViewMode = _useViewModeContext.currentViewMode;
+  var _useState = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    currentViewMode = _useState2[0],
-    setCurrentViewMode = _useState2[1];
-  var _useState3 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    cloudId = _useState4[0],
-    setCloudId = _useState4[1];
+    cloudId = _useState2[0],
+    setCloudId = _useState2[1];
   var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('confluence', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState5 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+  var _useState3 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    searchString = _useState4[0],
+    setSearchString = _useState4[1];
+  var _useState5 = (0, _react.useState)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    searchString = _useState6[0],
-    setSearchString = _useState6[1];
-  var _useState7 = (0, _react.useState)(initialVisibleColumnKeys),
-    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    visibleColumnKeys = _useState8[0],
-    setVisibleColumnKeys = _useState8[1];
-  var _useState9 = (0, _react.useState)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
-    _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    contributorAccountIds = _useState10[0],
-    setContributorAccountIds = _useState10[1];
-  var _useState11 = (0, _react.useState)(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
+    contributorAccountIds = _useState6[0],
+    setContributorAccountIds = _useState6[1];
+  var _useState7 = (0, _react.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 = (0, _slicedToArray2.default)(_useState11, 2),
-    lastModified = _useState12[0],
-    setLastModified = _useState12[1];
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    lastModified = _useState8[0],
+    setLastModified = _useState8[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractions = (0, _userInteractions.useUserInteractions)();
-  var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
-  var parameters = (0, _react.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 = (0, _react.useMemo)(function () {
-    return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
-      return v !== undefined;
-    }).length > 1;
-  }, [cloudId, parameters]);
-  var parametersToSend = (0, _react.useMemo)(function () {
-    if (!isParametersSet) {
-      return undefined;
-    }
-    return _objectSpread(_objectSpread({}, parameters), overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
-  }, [parameters, overrideParameters, isParametersSet]);
-  var _useDatasourceTableSt = (0, _useDatasourceTableState.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 = (0, _datasourceContext.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 = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
@@ -172,37 +157,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       shouldForceRequest: true
     });
   }, [reset, userInteractions]);
-  (0, _react.useEffect)(function () {
-    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    visibleColumnCount.current = newVisibleColumnKeys.length;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages.confluenceSearchModalMessages.insertIssuesTitleManySites : _messages.confluenceSearchModalMessages.insertIssuesTitle;
-
-  // TODO: common functionality of all modals refactor in EDM-9573
-  var handleVisibleColumnKeysChange = (0, _react.useCallback)(function () {
-    var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var columnAction = (0, _utils.getColumnAction)(visibleColumnKeys || [], newVisibleColumnKeys);
-    userInteractions.add(columnAction);
-    visibleColumnCount.current = newVisibleColumnKeys.length;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [visibleColumnKeys, userInteractions]);
-  var confluenceSearchTable = (0, _react.useMemo)(function () {
-    return (0, _react2.jsx)(_contentContainer.ContentContainer, {
-      withTableBorder: true
-    }, (0, _react2.jsx)(_datasourcesTableInModalPreview.default, {
-      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;
@@ -250,7 +205,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
         displayedColumnCount: visibleColumnCount.current
       }));
     }
-  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  }, [isDataReady, fireEvent, analyticsPayload, totalCount, visibleColumnCount]);
   (0, _react.useEffect)(function () {
     var isResolved = status === 'resolved';
     var isTableViewMode = currentViewMode === 'table';
@@ -286,8 +241,12 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
         description: _messages.confluenceSearchModalMessages.initialViewSearchDescription
       }));
     }
-    return confluenceSearchTable;
-  }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
+    return (0, _react2.jsx)(_contentContainer.ContentContainer, {
+      withTableBorder: true
+    }, (0, _react2.jsx)(_datasourcesTableInModalPreview.default, {
+      testId: "confluence-search-datasource-table"
+    }));
+  }, [columns.length, selectedConfluenceSiteUrl, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   var renderInlineLinkModalContent = (0, _react.useCallback)(function () {
     if (status === 'unauthorized') {
       return (0, _react2.jsx)(_accessRequired.AccessRequired, {
@@ -304,12 +263,12 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     }
   }, [confluenceSearchUrl, selectedConfluenceSiteUrl, status, urlBeingEdited]);
   var shouldShowResultsCount = !!totalCount && currentViewMode === 'table';
-  var _useDatasourceContext = (0, _DatasourceContext.useDatasourceContext)(),
-    columnCustomSizes = _useDatasourceContext.columnCustomSizes,
-    wrappedColumnKeys = _useDatasourceContext.wrappedColumnKeys;
+  var _useDatasourceContext5 = (0, _datasourceContext.useDatasourceContext)(),
+    columnCustomSizes = _useDatasourceContext5.columnCustomSizes,
+    wrappedColumnKeys = _useDatasourceContext5.wrappedColumnKeys;
   var onInsertPressed = (0, _react.useCallback)(function (e, analyticsEvent) {
     var _insertButtonClickedE;
-    if (!isParametersSet || !cloudId || !confluenceSearchUrl) {
+    if (!parameters || !isValidParameters(parameters) || !confluenceSearchUrl) {
       return;
     }
     var insertButtonClickedEvent = analyticsEvent.update({
@@ -336,9 +295,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: _objectSpread(_objectSpread({}, parametersToSend), {}, {
-          cloudId: cloudId
-        }),
+        parameters: parameters,
         views: [{
           type: 'table',
           properties: {
@@ -357,11 +314,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
         }]
       }, confluenceSearchUrl), consumerEvent);
     }
-  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parametersToSend, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys, userInteractions]);
-  var handleViewModeChange = function handleViewModeChange(selectedMode) {
-    userInteractions.add(_types.DatasourceAction.DISPLAY_VIEW_CHANGED);
-    setCurrentViewMode(selectedMode);
-  };
+  }, [parameters, confluenceSearchUrl, analyticsPayload, totalCount, visibleColumnCount, currentViewMode, userInteractions, onInsert, datasourceId, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = (0, _react.useCallback)(function (newSearchString, filters) {
     searchCount.current++;
     userInteractions.add(_types.DatasourceAction.QUERY_UPDATED);
@@ -392,7 +345,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       shouldForceRequest: true
     });
   }, [reset, userInteractions]);
-  var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  var isInsertDisabled = !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
   var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
     return {
       extensionKey: extensionKey,
@@ -413,15 +366,14 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     selectedSite: selectedConfluenceSite,
     testId: "confluence-search-datasource-modal--site-selector",
     label: siteSelectorLabel
-  })), !hasNoConfluenceSites && !disableDisplayDropdown && (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
-    onViewModeChange: handleViewModeChange,
-    viewMode: currentViewMode
-  })), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoConfluenceSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_primitives.Box, {
+  })), !hasNoConfluenceSites && !disableDisplayDropdown && (0, _react2.jsx)(_modeSwitcher.DatasourceViewModeDropDown, null)), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoConfluenceSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_primitives.Box, {
     xcss: inputContainerStyles
   }, (0, _react2.jsx)(_confluenceSearchContainer.default, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: parameters
+    parameters: isValidParameters(parameters) ? parameters : {
+      cloudId: ''
+    }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
     title: _messages.confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: _messages.confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,
@@ -452,10 +404,17 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
 var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(function (props) {
-  return (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasources.use-refactored-config-modal') ? (0, _react2.jsx)(_DatasourceContextProvider.DatasourceContextProvider, {
+  var _props$viewMode;
+  return (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal') ? (0, _react2.jsx)(_datasourceContext.DatasourceContextProvider, {
+    datasourceId: props.datasourceId,
+    initialVisibleColumnKeys: props.visibleColumnKeys,
     initialColumnCustomSizes: props.columnCustomSizes,
-    initialWrappedColumnKeys: props.wrappedColumnKeys
-  }, (0, _react2.jsx)(PlainConfluenceSearchConfigModal, props)) :
+    initialWrappedColumnKeys: props.wrappedColumnKeys,
+    initialParameters: props.parameters,
+    isValidParameters: isValidParameters
+  }, (0, _react2.jsx)(_useViewModeContext2.DatasourceViewModeProvider, {
+    viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
+  }, (0, _react2.jsx)(PlainConfluenceSearchConfigModal, props))) :
   // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
   (0, _react2.jsx)(_ModalOld.PlainConfluenceSearchConfigModal, props)));
 });

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

@@ -119,7 +119,7 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
   return JqlClauseCollectingVisitor;
 }(_jqlAst.AbstractJastVisitor);
 var isQueryTooComplex = exports.isQueryTooComplex = function isQueryTooComplex(jql) {
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
+  if (!(0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
     return false;
   }
   if (!(0, _index.isValidJql)(jql)) {

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

@@ -18,12 +18,12 @@ var _primitives = require("@atlaskit/primitives");
 var _analytics = require("../../../analytics");
 var _basicSearchInput = require("../../common/modal/basic-search-input");
 var _messages = require("../../common/modal/basic-search-input/messages");
+var _modeSwitcher = require("../../common/modal/mode-switcher");
 var _constants = require("../../common/modal/popup-select/constants");
 var _basicFilters = require("../basic-filters");
 var _useHydrateJqlQuery2 = require("../basic-filters/hooks/useHydrateJqlQuery");
 var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _jqlEditor = require("../jql-editor");
-var _modeSwitcher = require("../mode-switcher");
 var _buildJQL = require("./buildJQL");
 var _messages2 = require("./messages");
 var _excluded = ["basicInputTextValue"];
@@ -86,7 +86,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     filterSelections = _useState14[0],
     setFilterSelections = _useState14[1];
   var showBasicFilters = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
+    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;