@atlaskit/link-datasource 1.27.3 → 1.27.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.27.4
+
+### Patch Changes
+
+- [#91584](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91584) [`4d0c2f61a927`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d0c2f61a927) - The changes here updates the testIds in the common filter component along with some code refactoring
+
 ## 1.27.3
 
 ### Patch Changes

package/dist/cjs/ui/common/modal/popup-select/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SEARCH_DEBOUNCE_MS = exports.FILTER_SELECTION_DEBOUNCE_MS = void 0;
+var FILTER_SELECTION_DEBOUNCE_MS = exports.FILTER_SELECTION_DEBOUNCE_MS = 500;
+var SEARCH_DEBOUNCE_MS = exports.SEARCH_DEBOUNCE_MS = 350;

package/dist/cjs/ui/common/modal/popup-select/footer.js

@@ -23,9 +23,10 @@ var footerPaginationInfoStyles = (0, _primitives.xcss)({
 });
 var PopupFooter = function PopupFooter(_ref) {
   var currentDisplayCount = _ref.currentDisplayCount,
-    totalCount = _ref.totalCount;
+    totalCount = _ref.totalCount,
+    filterName = _ref.filterName;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
-    testId: "jlol-basic-filter-popup-select--footer",
+    testId: "".concat(filterName, "--footer"),
     direction: "row",
     alignItems: "center",
     justifyContent: "end",

package/dist/cjs/ui/common/modal/popup-select/formatOptionLabel.js

@@ -36,14 +36,14 @@ var IconOptionLabel = function IconOptionLabel(_ref) {
   };
   return /*#__PURE__*/_react.default.createElement(AvatarOptionLabel, {
     data: avatarOptionLabelData,
-    testId: "jlol-basic-filter-popup-select-option--icon-label"
+    testId: "basic-filter-popup-select-option--icon-label"
   });
 };
 var LozengeOptionLabel = function LozengeOptionLabel(_ref2) {
   var data = _ref2.data;
   return /*#__PURE__*/_react.default.createElement(_lozenge.default, {
     appearance: data.appearance,
-    testId: "jlol-basic-filter-popup-select-option--lozenge"
+    testId: "basic-filter-popup-select-option--lozenge"
   }, /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     xcss: [commonLabelStyles]
   }, data.label));
@@ -53,7 +53,7 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
     testId = _ref3.testId;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     alignItems: "center",
-    testId: testId || 'jlol-basic-filter-popup-select-option--avatar'
+    testId: testId || 'basic-filter-popup-select-option--avatar'
   }, data.isGroup ? /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     alignItems: "center",
     justifyContent: "center",
@@ -66,8 +66,7 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
     src: data.avatar,
     size: "xsmall"
   }), /*#__PURE__*/_react.default.createElement(_primitives.Box, {
-    xcss: [commonLabelStyles, avatarOptionLabelStyles],
-    testId: "nidhin"
+    xcss: [commonLabelStyles, avatarOptionLabelStyles]
   }, data.label));
 };
 var formatOptionLabel = function formatOptionLabel(data) {

package/dist/cjs/ui/common/modal/popup-select/index.js

@@ -215,7 +215,8 @@ var FilterPopupSelect = exports.FilterPopupSelect = function FilterPopupSelect(_
     },
     footer: shouldShowFooter && /*#__PURE__*/_react.default.createElement(_footer.default, {
       currentDisplayCount: options.length,
-      totalCount: totalCount
+      totalCount: totalCount,
+      filterName: filterName
     })
   });
 };

package/dist/cjs/ui/common/modal/popup-select/menu-list/errorMessage.js

@@ -12,7 +12,7 @@ var _useDebounce = require("use-debounce");
 var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/error"));
 var _colors = require("@atlaskit/theme/colors");
 var _analytics = require("../../../../../analytics");
-var _asyncPopupSelect = require("../../../../jira-issues-modal/basic-filters/ui/async-popup-select");
+var _constants = require("../constants");
 var _messages = require("./messages");
 var _selectMessage = _interopRequireDefault(require("./selectMessage"));
 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); }
@@ -44,7 +44,7 @@ var CustomErrorMessage = function CustomErrorMessage(_ref3) {
         filterName: filterName,
         reason: getErrorReasonType(errors)
       });
-    }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
+    }, _constants.SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     debouncedAnalyticsCallback = _useDebouncedCallback2[0];
   (0, _react.useEffect)(debouncedAnalyticsCallback, [debouncedAnalyticsCallback]);
@@ -55,7 +55,7 @@ var CustomErrorMessage = function CustomErrorMessage(_ref3) {
       size: "xlarge"
     }),
     message: _messages.asyncPopupSelectMessages.errorMessage,
-    testId: "jlol-basic-filter-popup-select--error-message"
+    testId: "".concat(filterName, "--error-message")
   });
 };
 var _default = exports.default = CustomErrorMessage;

package/dist/cjs/ui/common/modal/popup-select/menu-list/index.js

@@ -46,7 +46,9 @@ var CustomMenuList = function CustomMenuList(_ref) {
   };
   var renderChildren = function renderChildren() {
     if (isLoading) {
-      return /*#__PURE__*/_react.default.createElement(_loadingMessage.default, null);
+      return /*#__PURE__*/_react.default.createElement(_loadingMessage.default, {
+        filterName: filterName
+      });
     }
     if (isError) {
       return /*#__PURE__*/_react.default.createElement(_errorMessage.default, {
@@ -59,7 +61,7 @@ var CustomMenuList = function CustomMenuList(_ref) {
         filterName: filterName
       });
     }
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, shouldDisplayShowMore && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, shouldDisplayShowMore && handleShowMore && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
       xcss: showMoreButtonBoxStyles
     }, /*#__PURE__*/_react.default.createElement(_showMoreButton.default, {
       onShowMore: handleShowMore,

package/dist/cjs/ui/common/modal/popup-select/menu-list/loadingMessage.js

@@ -9,13 +9,14 @@ var _react = _interopRequireDefault(require("react"));
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 var _messages = require("./messages");
 var _selectMessage = _interopRequireDefault(require("./selectMessage"));
-var CustomDropdownLoadingMessage = function CustomDropdownLoadingMessage() {
+var CustomDropdownLoadingMessage = function CustomDropdownLoadingMessage(_ref) {
+  var filterName = _ref.filterName;
   return /*#__PURE__*/_react.default.createElement(_selectMessage.default, {
     icon: /*#__PURE__*/_react.default.createElement(_spinner.default, {
       size: "large"
     }),
     message: _messages.asyncPopupSelectMessages.loadingMessage,
-    testId: "jlol-basic-filter-popup-select--loading-message"
+    testId: "".concat(filterName, "--loading-message")
   });
 };
 var _default = exports.default = CustomDropdownLoadingMessage;

package/dist/cjs/ui/common/modal/popup-select/menu-list/noOptionsMessage.js

@@ -12,7 +12,7 @@ var _useDebounce = require("use-debounce");
 var _questionCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/question-circle"));
 var _colors = require("@atlaskit/theme/colors");
 var _analytics = require("../../../../../analytics");
-var _asyncPopupSelect = require("../../../../jira-issues-modal/basic-filters/ui/async-popup-select");
+var _constants = require("../constants");
 var _messages = require("./messages");
 var _selectMessage = _interopRequireDefault(require("./selectMessage"));
 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); }
@@ -32,7 +32,7 @@ var CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
       fireEvent('ui.emptyResult.shown.basicSearchDropdown', {
         filterName: filterName
       });
-    }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
+    }, _constants.SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     debouncedAnalyticsCallback = _useDebouncedCallback2[0];
   (0, _react.useEffect)(debouncedAnalyticsCallback, [debouncedAnalyticsCallback]);
@@ -43,7 +43,7 @@ var CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
       label: ""
     }),
     message: _messages.asyncPopupSelectMessages.noOptionsMessage,
-    testId: "jlol-basic-filter-popup-select--no-options-message"
+    testId: "".concat(filterName, "--no-options-message")
   });
 };
 var _default = exports.default = CustomNoOptionsMessage;

package/dist/cjs/ui/common/modal/popup-select/menu-list/showMoreButton.js

@@ -30,7 +30,7 @@ var ShowMoreButton = function ShowMoreButton(_ref) {
   return /*#__PURE__*/_react.default.createElement(_button.default, {
     onClick: handleShowMore,
     appearance: "link",
-    testId: "jlol-basic-filter-popup-select--show-more-button"
+    testId: "".concat(filterName, "--show-more-button")
   }, formatMessage(_messages.asyncPopupSelectMessages.showMoreMessage));
 };
 var _default = exports.default = ShowMoreButton;

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

@@ -84,7 +84,10 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     viewMode = _props$viewMode === void 0 ? 'table' : _props$viewMode,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
-    initialVisibleColumnKeys = props.visibleColumnKeys;
+    initialVisibleColumnKeys = props.visibleColumnKeys,
+    _props$disableDisplay = props.disableDisplayDropdown,
+    disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
+    overrideParameters = props.overrideParameters;
   var _useState = (0, _react.useState)(undefined),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     availableSites = _useState2[0],
@@ -124,9 +127,15 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       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: isParametersSet ? parameters : undefined,
+      parameters: parametersToSend,
       fieldKeys: visibleColumnKeys
     }),
     reset = _useDatasourceTableSt.reset,
@@ -381,7 +390,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: _objectSpread(_objectSpread({}, parameters), {}, {
+        parameters: _objectSpread(_objectSpread({}, parametersToSend), {}, {
           cloudId: cloudId
         }),
         views: [{
@@ -402,7 +411,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
         }]
       }, confluenceSearchUrl), consumerEvent);
     }
-  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parametersToSend, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var handleViewModeChange = function handleViewModeChange(selectedMode) {
     userInteractionActions.current.add(_types.DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -438,7 +447,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     selectedSite: selectedConfluenceSite,
     testId: "confluence-search-datasource-modal--site-selector",
     label: siteSelectorLabel
-  })), !hasNoConfluenceSites && (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
+  })), !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, {

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.SEARCH_DEBOUNCE_MS = void 0;
+exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -14,11 +14,11 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _reactIntlNext = require("react-intl-next");
 var _useDebounce = require("use-debounce");
 var _popupSelect = require("../../../../common/modal/popup-select");
+var _constants = require("../../../../common/modal/popup-select/constants");
 var _useFilterOptions2 = require("../../hooks/useFilterOptions");
 var _messages = require("./messages");
 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; }
-var SEARCH_DEBOUNCE_MS = exports.SEARCH_DEBOUNCE_MS = 350;
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
     site = _ref.site,
@@ -56,7 +56,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       fetchFilterOptions({
         searchString: searchString
       });
-    }, SEARCH_DEBOUNCE_MS),
+    }, _constants.SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
   var handleInputChange = (0, _react.useCallback)( /*#__PURE__*/function () {
@@ -114,11 +114,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var isEmpty = status === 'resolved' && filterOptionsLength === 0;
   var popupSelectOptions = isLoading || isError ? [] : filterOptions; // if not set to [], then on loading, no loading UI will be shown
   var areAllResultsLoaded = filterOptionsLength === totalCount;
+  var filterName = "jlol-basic-filter-".concat(filterType);
   var shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptionsLength > 0; // footer should not disappear when there is an inline spinner for loading more data
   var shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
   var triggerButtonLabel = formatMessage(_messages.asyncPopupSelectMessages["".concat(filterType, "Label")]);
   return /*#__PURE__*/_react.default.createElement(_popupSelect.FilterPopupSelect, {
-    filterName: "jlol-basic-filter-".concat(filterType),
+    filterName: filterName,
     status: status,
     showLoading: isLoading,
     showHydrating: isJQLHydrating,
@@ -132,7 +133,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     onSelectionChange: handleOptionSelection,
     onMenuOpen: handleMenuOpen,
     menuListProps: {
-      filterName: filterType,
+      filterName: filterName,
       isError: isError,
       isEmpty: isEmpty,
       isLoading: isLoading,

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

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraSearchContainer = exports.FILTER_SELECTION_DEBOUNCE_MS = exports.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
+exports.JiraSearchContainer = exports.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -18,6 +18,7 @@ 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 _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");
@@ -40,7 +41,6 @@ var basicSearchInputContainerStyles = (0, _primitives.xcss)({
 });
 var DEFAULT_JQL_QUERY = exports.DEFAULT_JQL_QUERY = 'ORDER BY created DESC';
 var ALLOWED_ORDER_BY_KEYS = exports.ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
-var FILTER_SELECTION_DEBOUNCE_MS = exports.FILTER_SELECTION_DEBOUNCE_MS = 500;
 var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,
@@ -178,7 +178,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         basicFilterSelections: filterSelections,
         isQueryComplex: isCurrentQueryComplex
       });
-    }, FILTER_SELECTION_DEBOUNCE_MS),
+    }, _constants.FILTER_SELECTION_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
   var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterType, options) {

package/dist/es2019/ui/common/modal/popup-select/constants.js

@@ -0,0 +1,2 @@
+export const FILTER_SELECTION_DEBOUNCE_MS = 500;
+export const SEARCH_DEBOUNCE_MS = 350;

package/dist/es2019/ui/common/modal/popup-select/footer.js

@@ -16,10 +16,11 @@ const footerPaginationInfoStyles = xcss({
 });
 const PopupFooter = ({
   currentDisplayCount,
-  totalCount
+  totalCount,
+  filterName
 }) => {
   return /*#__PURE__*/React.createElement(Flex, {
-    testId: "jlol-basic-filter-popup-select--footer",
+    testId: `${filterName}--footer`,
     direction: "row",
     alignItems: "center",
     justifyContent: "end",

package/dist/es2019/ui/common/modal/popup-select/formatOptionLabel.js

@@ -32,7 +32,7 @@ const IconOptionLabel = ({
   };
   return /*#__PURE__*/React.createElement(AvatarOptionLabel, {
     data: avatarOptionLabelData,
-    testId: "jlol-basic-filter-popup-select-option--icon-label"
+    testId: "basic-filter-popup-select-option--icon-label"
   });
 };
 const LozengeOptionLabel = ({
@@ -40,7 +40,7 @@ const LozengeOptionLabel = ({
 }) => {
   return /*#__PURE__*/React.createElement(Lozenge, {
     appearance: data.appearance,
-    testId: "jlol-basic-filter-popup-select-option--lozenge"
+    testId: "basic-filter-popup-select-option--lozenge"
   }, /*#__PURE__*/React.createElement(Box, {
     xcss: [commonLabelStyles]
   }, data.label));
@@ -51,7 +51,7 @@ const AvatarOptionLabel = ({
 }) => {
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
-    testId: testId || 'jlol-basic-filter-popup-select-option--avatar'
+    testId: testId || 'basic-filter-popup-select-option--avatar'
   }, data.isGroup ? /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     justifyContent: "center",
@@ -64,8 +64,7 @@ const AvatarOptionLabel = ({
     src: data.avatar,
     size: "xsmall"
   }), /*#__PURE__*/React.createElement(Box, {
-    xcss: [commonLabelStyles, avatarOptionLabelStyles],
-    testId: "nidhin"
+    xcss: [commonLabelStyles, avatarOptionLabelStyles]
   }, data.label));
 };
 const formatOptionLabel = data => {

package/dist/es2019/ui/common/modal/popup-select/index.js

@@ -168,7 +168,8 @@ export const FilterPopupSelect = ({
     })),
     footer: shouldShowFooter && /*#__PURE__*/React.createElement(PopupFooter, {
       currentDisplayCount: options.length,
-      totalCount: totalCount
+      totalCount: totalCount,
+      filterName: filterName
     })
   });
 };

package/dist/es2019/ui/common/modal/popup-select/menu-list/errorMessage.js

@@ -3,7 +3,7 @@ import { useDebouncedCallback } from 'use-debounce';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
 import { N500 } from '@atlaskit/theme/colors';
 import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
-import { SEARCH_DEBOUNCE_MS } from '../../../../jira-issues-modal/basic-filters/ui/async-popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../constants';
 import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const getErrorReasonType = errors => {
@@ -42,7 +42,7 @@ const CustomErrorMessage = ({
       size: "xlarge"
     }),
     message: asyncPopupSelectMessages.errorMessage,
-    testId: "jlol-basic-filter-popup-select--error-message"
+    testId: `${filterName}--error-message`
   });
 };
 export default CustomErrorMessage;

package/dist/es2019/ui/common/modal/popup-select/menu-list/index.js

@@ -37,7 +37,9 @@ const CustomMenuList = ({
   }));
   const renderChildren = () => {
     if (isLoading) {
-      return /*#__PURE__*/React.createElement(CustomDropdownLoadingMessage, null);
+      return /*#__PURE__*/React.createElement(CustomDropdownLoadingMessage, {
+        filterName: filterName
+      });
     }
     if (isError) {
       return /*#__PURE__*/React.createElement(CustomErrorMessage, {
@@ -50,7 +52,7 @@ const CustomMenuList = ({
         filterName: filterName
       });
     }
-    return /*#__PURE__*/React.createElement(React.Fragment, null, children, shouldDisplayShowMore && /*#__PURE__*/React.createElement(Box, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, children, shouldDisplayShowMore && handleShowMore && /*#__PURE__*/React.createElement(Box, {
       xcss: showMoreButtonBoxStyles
     }, /*#__PURE__*/React.createElement(ShowMoreButton, {
       onShowMore: handleShowMore,

package/dist/es2019/ui/common/modal/popup-select/menu-list/loadingMessage.js

@@ -2,13 +2,15 @@ import React from 'react';
 import Spinner from '@atlaskit/spinner';
 import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
-const CustomDropdownLoadingMessage = () => {
+const CustomDropdownLoadingMessage = ({
+  filterName
+}) => {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {
     icon: /*#__PURE__*/React.createElement(Spinner, {
       size: "large"
     }),
     message: asyncPopupSelectMessages.loadingMessage,
-    testId: "jlol-basic-filter-popup-select--loading-message"
+    testId: `${filterName}--loading-message`
   });
 };
 export default CustomDropdownLoadingMessage;

package/dist/es2019/ui/common/modal/popup-select/menu-list/noOptionsMessage.js

@@ -3,7 +3,7 @@ import { useDebouncedCallback } from 'use-debounce';
 import QuestionCircleIcon from '@atlaskit/icon/glyph/question-circle';
 import { N500 } from '@atlaskit/theme/colors';
 import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
-import { SEARCH_DEBOUNCE_MS } from '../../../../jira-issues-modal/basic-filters/ui/async-popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../constants';
 import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const CustomNoOptionsMessage = ({
@@ -32,7 +32,7 @@ const CustomNoOptionsMessage = ({
       label: ""
     }),
     message: asyncPopupSelectMessages.noOptionsMessage,
-    testId: "jlol-basic-filter-popup-select--no-options-message"
+    testId: `${filterName}--no-options-message`
   });
 };
 export default CustomNoOptionsMessage;

package/dist/es2019/ui/common/modal/popup-select/menu-list/showMoreButton.js

@@ -23,7 +23,7 @@ const ShowMoreButton = ({
   return /*#__PURE__*/React.createElement(Button, {
     onClick: handleShowMore,
     appearance: "link",
-    testId: "jlol-basic-filter-popup-select--show-more-button"
+    testId: `${filterName}--show-more-button`
   }, formatMessage(asyncPopupSelectMessages.showMoreMessage));
 };
 export default ShowMoreButton;

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

@@ -69,7 +69,9 @@ export const PlainConfluenceSearchConfigModal = props => {
     viewMode = 'table',
     parameters: initialParameters,
     url: urlBeingEdited,
-    visibleColumnKeys: initialVisibleColumnKeys
+    visibleColumnKeys: initialVisibleColumnKeys,
+    disableDisplayDropdown = false,
+    overrideParameters
   } = props;
   const [availableSites, setAvailableSites] = useState(undefined);
   const [currentViewMode, setCurrentViewMode] = useState(viewMode);
@@ -90,6 +92,15 @@ export const PlainConfluenceSearchConfigModal = props => {
     searchString
   }), [cloudId, initialParameters, searchString /** Add more parameters when more filters are added */]);
   const isParametersSet = useMemo(() => !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(v => v !== undefined).length > 1, [cloudId, parameters]);
+  const parametersToSend = useMemo(() => {
+    if (!isParametersSet) {
+      return undefined;
+    }
+    return {
+      ...parameters,
+      ...(overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {})
+    };
+  }, [parameters, overrideParameters, isParametersSet]);
   const {
     reset,
     status,
@@ -104,7 +115,7 @@ export const PlainConfluenceSearchConfigModal = props => {
     destinationObjectTypes
   } = useDatasourceTableState({
     datasourceId,
-    parameters: isParametersSet ? parameters : undefined,
+    parameters: parametersToSend,
     fieldKeys: visibleColumnKeys
   });
   const {
@@ -321,7 +332,7 @@ export const PlainConfluenceSearchConfigModal = props => {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
         parameters: {
-          ...parameters,
+          ...parametersToSend,
           cloudId
         },
         views: [{
@@ -344,7 +355,7 @@ export const PlainConfluenceSearchConfigModal = props => {
         }]
       }, confluenceSearchUrl), consumerEvent);
     }
-  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parametersToSend, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   const handleViewModeChange = selectedMode => {
     userInteractionActions.current.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -380,7 +391,7 @@ export const PlainConfluenceSearchConfigModal = props => {
     selectedSite: selectedConfluenceSite,
     testId: "confluence-search-datasource-modal--site-selector",
     label: siteSelectorLabel
-  })), !hasNoConfluenceSites && jsx(DisplayViewDropDown, {
+  })), !hasNoConfluenceSites && !disableDisplayDropdown && jsx(DisplayViewDropDown, {
     onViewModeChange: handleViewModeChange,
     viewMode: currentViewMode
   })), jsx(ModalBody, null, !hasNoConfluenceSites ? jsx(Fragment, null, jsx(Box, {

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -3,9 +3,9 @@ import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
 import { FilterPopupSelect } from '../../../../common/modal/popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../../../../common/modal/popup-select/constants';
 import { useFilterOptions } from '../../hooks/useFilterOptions';
 import { asyncPopupSelectMessages } from './messages';
-export const SEARCH_DEBOUNCE_MS = 350;
 const AsyncPopupSelect = ({
   filterType,
   site,
@@ -82,11 +82,12 @@ const AsyncPopupSelect = ({
   const isEmpty = status === 'resolved' && filterOptionsLength === 0;
   const popupSelectOptions = isLoading || isError ? [] : filterOptions; // if not set to [], then on loading, no loading UI will be shown
   const areAllResultsLoaded = filterOptionsLength === totalCount;
+  const filterName = `jlol-basic-filter-${filterType}`;
   const shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptionsLength > 0; // footer should not disappear when there is an inline spinner for loading more data
   const shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
   const triggerButtonLabel = formatMessage(asyncPopupSelectMessages[`${filterType}Label`]);
   return /*#__PURE__*/React.createElement(FilterPopupSelect, {
-    filterName: `jlol-basic-filter-${filterType}`,
+    filterName: filterName,
     status: status,
     showLoading: isLoading,
     showHydrating: isJQLHydrating,
@@ -100,7 +101,7 @@ const AsyncPopupSelect = ({
     onSelectionChange: handleOptionSelection,
     onMenuOpen: handleMenuOpen,
     menuListProps: {
-      filterName: filterType,
+      filterName,
       isError,
       isEmpty,
       isLoading,

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

@@ -8,6 +8,7 @@ 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 { 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';
@@ -25,7 +26,6 @@ const basicSearchInputContainerStyles = xcss({
 });
 export const DEFAULT_JQL_QUERY = 'ORDER BY created DESC';
 export const ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
-export const FILTER_SELECTION_DEBOUNCE_MS = 500;
 export const JiraSearchContainer = props => {
   const {
     isSearching,

package/dist/esm/ui/common/modal/popup-select/constants.js

@@ -0,0 +1,2 @@
+export var FILTER_SELECTION_DEBOUNCE_MS = 500;
+export var SEARCH_DEBOUNCE_MS = 350;

package/dist/esm/ui/common/modal/popup-select/footer.js

@@ -16,9 +16,10 @@ var footerPaginationInfoStyles = xcss({
 });
 var PopupFooter = function PopupFooter(_ref) {
   var currentDisplayCount = _ref.currentDisplayCount,
-    totalCount = _ref.totalCount;
+    totalCount = _ref.totalCount,
+    filterName = _ref.filterName;
   return /*#__PURE__*/React.createElement(Flex, {
-    testId: "jlol-basic-filter-popup-select--footer",
+    testId: "".concat(filterName, "--footer"),
     direction: "row",
     alignItems: "center",
     justifyContent: "end",