@atlaskit/link-datasource 1.26.1 → 1.26.3

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

@@ -133,6 +133,8 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
     extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
     destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
   var selectedConfluenceSite = (0, _react.useMemo)(function () {
     if (cloudId) {
@@ -149,6 +151,9 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       })) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
     }
   }, [availableSites, cloudId]);
+  (0, _react.useEffect)(function () {
+    fireEvent('screen.datasourceModalDialog.viewed', {});
+  }, [fireEvent]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
@@ -182,7 +187,11 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
                 return a.displayName.localeCompare(b.displayName);
               });
               setAvailableSites(sortedAvailableSites);
-            case 5:
+              fireEvent('ui.modal.ready.datasource', {
+                instancesCount: sortedAvailableSites.length,
+                schemasCount: null
+              });
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -193,7 +202,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       };
     }();
     void fetchSiteDisplayNames();
-  }, []);
+  }, [fireEvent]);
   (0, _react.useEffect)(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;

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

@@ -6,33 +6,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.SEARCH_DEBOUNCE_MS = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _reactIntlNext = require("react-intl-next");
 var _useDebounce = require("use-debounce");
-var _select = require("@atlaskit/select");
-var _analytics = require("../../../../../analytics");
+var _popupSelect = require("../../../../common/modal/popup-select");
 var _useFilterOptions2 = require("../../hooks/useFilterOptions");
-var _menuList = _interopRequireDefault(require("../menu-list"));
-var _control = _interopRequireDefault(require("./control"));
-var _dropdownIndicator = _interopRequireDefault(require("./dropdownIndicator"));
-var _footer = _interopRequireDefault(require("./footer"));
-var _formatOptionLabel = _interopRequireDefault(require("./formatOptionLabel"));
 var _messages = require("./messages");
-var _trigger = _interopRequireDefault(require("./trigger"));
-var _excluded = ["isOpen"];
 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; }
-// Needed to disable filtering from react-select
-var noFilterOptions = function noFilterOptions() {
-  return true;
-};
 var SEARCH_DEBOUNCE_MS = exports.SEARCH_DEBOUNCE_MS = 350;
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
@@ -45,8 +30,6 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useState = (0, _react.useState)(''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     searchTerm = _useState2[0],
@@ -55,15 +38,9 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     selectedOptions = _useState4[0],
     setSelectedOptions = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    sortedOptions = _useState6[0],
-    setSortedOptions = _useState6[1];
   var _ref2 = site || {},
     cloudId = _ref2.cloudId;
   var currentSiteCloudId = (0, _react.useRef)(cloudId || '');
-  var sortPaginatedResults = (0, _react.useRef)(false); // this is to track pagination for sorting purpose
-
   var _useFilterOptions = (0, _useFilterOptions2.useFilterOptions)({
       filterType: filterType,
       site: site
@@ -83,123 +60,44 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
   var handleInputChange = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newSearchTerm, actionMeta) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newSearchTerm) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (actionMeta.action === 'input-change' && newSearchTerm !== searchTerm) {
-              setSearchTerm(newSearchTerm);
-              handleDebouncedFetchFilterOptions(newSearchTerm);
-            }
-          case 1:
+            setSearchTerm(newSearchTerm);
+            handleDebouncedFetchFilterOptions(newSearchTerm);
+          case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function (_x, _x2) {
+    return function (_x) {
       return _ref3.apply(this, arguments);
     };
-  }(), [handleDebouncedFetchFilterOptions, searchTerm]);
+  }(), [handleDebouncedFetchFilterOptions]);
   var handleOptionSelection = (0, _react.useCallback)(function (newValue) {
     onSelectionChange(filterType, newValue);
   }, [filterType, onSelectionChange]);
-  var sortOptionsOnPopupOpen = (0, _react.useCallback)(function () {
-    if (selectedOptions.length === 0) {
-      return setSortedOptions(filterOptions);
-    }
-    var nonSelectedOptions = filterOptions.filter(function (option) {
-      return !selectedOptions.find(function (selectedOption) {
-        return selectedOption.value === option.value;
-      });
-    });
-    var newOptions = [].concat((0, _toConsumableArray2.default)(selectedOptions), (0, _toConsumableArray2.default)(nonSelectedOptions));
-    if (!(0, _isEqual.default)(newOptions, sortedOptions)) {
-      setSortedOptions(newOptions);
-    }
-  }, [selectedOptions, filterOptions, sortedOptions]);
-  var sortOptionsOnResolve = (0, _react.useCallback)(function () {
-    // when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
-    if (searchTerm) {
-      sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
-      return setSortedOptions(filterOptions);
-    }
-
-    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
-    if (sortedOptions.length === 0) {
-      return sortOptionsOnPopupOpen();
-    }
-
-    // this block handles the pagination, where on pagination, we will just append newOptions to the current list
-    if (sortPaginatedResults.current) {
-      var newOptions = filterOptions.filter(function (option) {
-        return !sortedOptions.find(function (sortedOption) {
-          return sortedOption.value === option.value;
-        });
-      });
-      if (newOptions.length > 0) {
-        setSortedOptions([].concat((0, _toConsumableArray2.default)(sortedOptions), (0, _toConsumableArray2.default)(newOptions)));
-      }
-      sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
-      return;
-    }
-    sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
-    sortOptionsOnPopupOpen();
-  }, [filterOptions, searchTerm, sortOptionsOnPopupOpen, sortedOptions]);
   var handleShowMore = (0, _react.useCallback)(function () {
     if (pageCursor) {
-      sortPaginatedResults.current = true;
       fetchFilterOptions({
         pageCursor: pageCursor,
         searchString: searchTerm
       });
-      fireEvent('ui.button.clicked.basicSearchDropdown', {
-        filterType: filterType,
-        type: 'showMore'
-      });
     }
-  }, [fetchFilterOptions, filterType, fireEvent, pageCursor, searchTerm]);
+  }, [fetchFilterOptions, pageCursor, searchTerm]);
   var handleMenuOpen = (0, _react.useCallback)(function () {
     if (status === 'empty' || status === 'rejected') {
       // if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown
       fetchFilterOptions({
         searchString: searchTerm
       });
-    } else if (status === 'resolved') {
-      sortOptionsOnPopupOpen();
     }
-    fireEvent('ui.dropdown.opened.basicSearchDropdown', {
-      filterType: filterType,
-      selectionCount: selectedOptions.length
-    });
-  }, [fetchFilterOptions, filterType, fireEvent, searchTerm, selectedOptions.length, sortOptionsOnPopupOpen, status]);
-  var handleMenuClose = (0, _react.useCallback)(function () {
-    /**
-     * Clearing the search is to ensure that the sortOptionsOnPopupOpen logic does not mess up.
-     * Without this, when the user opens, sortOptionsOnPopupOpen will inject the selected options to the list and the list count and values will be off
-     */
-    if (searchTerm) {
-      handleInputChange('', {
-        action: 'input-change',
-        prevInputValue: searchTerm
-      });
-    }
-    fireEvent('ui.dropdown.closed.basicSearchDropdown', {
-      filterType: filterType,
-      selectionCount: selectedOptions.length
-    });
-  }, [filterType, fireEvent, handleInputChange, searchTerm, selectedOptions.length]);
-  (0, _react.useEffect)(function () {
-    if (status === 'resolved') {
-      sortOptionsOnResolve();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
-
+  }, [fetchFilterOptions, searchTerm, status]);
   (0, _react.useEffect)(function () {
     if (cloudId && currentSiteCloudId.current !== cloudId) {
       currentSiteCloudId.current = cloudId;
-      setSortedOptions([]);
       setSearchTerm('');
       resetHook();
     }
@@ -214,29 +112,27 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var isLoading = status === 'loading' || status === 'empty';
   var isLoadingMore = status === 'loadingMore';
   var isEmpty = status === 'resolved' && filterOptionsLength === 0;
-  var popupSelectOptions = isLoading || isError ? [] : sortedOptions; // if not set to [], then on loading, no loading UI will be shown
+  var popupSelectOptions = isLoading || isError ? [] : filterOptions; // if not set to [], then on loading, no loading UI will be shown
   var areAllResultsLoaded = filterOptionsLength === totalCount;
   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;
-  return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
-    isMulti: true,
-    maxMenuWidth: 300,
-    minMenuWidth: 300,
-    testId: "jlol-basic-filter-popup-select",
-    inputId: "jlol-basic-filter-popup-select--input"
-    /*
-      this threshold controls the display of the search control (input field for search)
-      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
-      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
-    */,
-    searchThreshold: -1,
-    inputValue: searchTerm,
-    closeMenuOnSelect: false,
-    hideSelectedOptions: false,
-    isLoading: isLoading,
-    placeholder: formatMessage(_messages.asyncPopupSelectMessages.selectPlaceholder),
+  var triggerButtonLabel = formatMessage(_messages.asyncPopupSelectMessages["".concat(filterType, "Label")]);
+  return /*#__PURE__*/_react.default.createElement(_popupSelect.FilterPopupSelect, {
+    filterName: "jlol-basic-filter-".concat(filterType),
+    status: status,
+    showLoading: isLoading,
+    showHydrating: isJQLHydrating,
+    isDisabled: isDisabled,
+    totalCount: totalCount,
+    shouldShowFooter: shouldShowFooter,
+    selectedOptions: selectedOptions,
+    options: popupSelectOptions,
+    buttonLabel: triggerButtonLabel,
+    onInputChange: handleInputChange,
+    onSelectionChange: handleOptionSelection,
+    onMenuOpen: handleMenuOpen,
     menuListProps: {
-      filterType: filterType,
+      filterName: filterType,
       isError: isError,
       isEmpty: isEmpty,
       isLoading: isLoading,
@@ -244,39 +140,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       handleShowMore: handleShowMore,
       errors: errors,
       showMore: shouldDisplayShowMoreButton
-    },
-    components: {
-      Option: _select.CheckboxOption,
-      Control: _control.default,
-      MenuList: _menuList.default,
-      DropdownIndicator: _dropdownIndicator.default,
-      LoadingIndicator: undefined,
-      // disables the three ... indicator in the searchbox when picker is loading
-      IndicatorSeparator: undefined // disables the | separator between search input and icon
-    },
-    options: popupSelectOptions,
-    value: selectedOptions,
-    filterOption: noFilterOptions,
-    formatOptionLabel: _formatOptionLabel.default,
-    onChange: handleOptionSelection,
-    onInputChange: handleInputChange,
-    onOpen: handleMenuOpen,
-    onClose: handleMenuClose,
-    target: function target(_ref4) {
-      var isOpen = _ref4.isOpen,
-        triggerProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
-      return /*#__PURE__*/_react.default.createElement(_trigger.default, (0, _extends2.default)({}, triggerProps, {
-        filterType: filterType,
-        selectedOptions: selectedOptions,
-        isSelected: isOpen,
-        isDisabled: isDisabled,
-        isLoading: isJQLHydrating
-      }));
-    },
-    footer: shouldShowFooter && /*#__PURE__*/_react.default.createElement(_footer.default, {
-      currentDisplayCount: popupSelectOptions.length,
-      totalCount: totalCount
-    })
+    }
   });
 };
 var _default = exports.default = AsyncPopupSelect;

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

@@ -6,16 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.asyncPopupSelectMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = (0, _reactIntlNext.defineMessages)({
-  selectPlaceholder: {
-    id: 'linkDataSource.basic-filter.dropdown.select.placeholder',
-    description: 'Placeholder text to be displayed for the search input box.',
-    defaultMessage: 'Search'
-  },
-  paginationDetails: {
-    id: 'linkDataSource.basic-filter.footer.pagination-details',
-    description: 'Text to indicate page count and total count information.',
-    defaultMessage: '{currentDisplayCount} of {totalCount}'
-  },
   projectLabel: {
     id: 'linkDataSource.basic-filter.project.label',
     description: 'Label to be displayed for project filter dropdown button.',
@@ -35,10 +25,5 @@ var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = (0, _reactIntl
     id: 'linkDataSource.basic-filter.assignee.label',
     description: 'Label to be displayed for assignee filter dropdown button.',
     defaultMessage: 'Assignee'
-  },
-  showMoreMessage: {
-    id: 'linkDataSource.basic-filter.showMoreButton',
-    defaultMessage: 'Show more',
-    description: 'The text to show more options in dropdown'
   }
 });

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

@@ -227,7 +227,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearch: handleSearch,
     searchTerm: basicSearchTerm,
     placeholder: _messages.basicSearchInputMessages.basicTextSearchLabel,
-    testId: "jira-datasource-modal"
+    testId: "jira-datasource-modal",
+    fullWidth: !showBasicFilters
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
     jql: searchBarJql,
     site: site,

package/dist/es2019/ui/common/modal/basic-search-input/index.js

@@ -1,10 +1,9 @@
 /** @jsx jsx */
-import { useMemo } from 'react';
+
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { LoadingButton } from '@atlaskit/button';
 import SearchIcon from '@atlaskit/icon/glyph/editor/search';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Textfield from '@atlaskit/textfield';
 import { useDatasourceAnalyticsEvents } from '../../../../analytics';
 import { basicSearchInputMessages } from './messages';
@@ -42,15 +41,8 @@ export const BasicSearchInput = ({
     e.preventDefault();
     handleSearchWithAnalytics();
   };
-  const showBasicFilters = useMemo(() => {
-    if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
-      return true;
-    }
-    return false;
-  }, []);
-  const isFullWidth = fullWidth || !showBasicFilters;
   return jsx("form", {
-    css: isFullWidth ? formStyles : formWithMaxWidthStyles,
+    css: fullWidth ? formStyles : formWithMaxWidthStyles,
     onSubmit: handleFormSubmit
   }, jsx(Textfield, {
     elemAfterInput: jsx(LoadingButton, {

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

@@ -0,0 +1,170 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import isEqual from 'lodash/isEqual';
+import { useIntl } from 'react-intl-next';
+import { CheckboxOption, PopupSelect } from '@atlaskit/select';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
+import CustomControl from './control';
+import CustomDropdownIndicator from './dropdownIndicator';
+import PopupFooter from './footer';
+import formatOptionLabel from './formatOptionLabel';
+import CustomMenuList from './menu-list';
+import { asyncPopupSelectMessages } from './messages';
+import PopupTrigger from './trigger';
+// Needed to disable filtering from react-select
+const noFilterOptions = () => true;
+export const FilterPopupSelect = ({
+  filterName,
+  totalCount,
+  status,
+  buttonLabel,
+  showLoading = false,
+  isDisabled = false,
+  showHydrating = false,
+  shouldShowFooter = true,
+  menuListProps,
+  options,
+  selectedOptions,
+  onSelectionChange,
+  onInputChange,
+  onMenuClose,
+  onMenuOpen
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
+  const [searchTerm, setSearchTerm] = useState('');
+  const [sortedOptions, setSortedOptions] = useState([]);
+  const sortPaginatedResults = useRef(false); // this is to track pagination for sorting purpose
+
+  const sortOptionsOnPopupOpen = useCallback(() => {
+    if (selectedOptions.length === 0) {
+      return setSortedOptions(options);
+    }
+    const nonSelectedOptions = options.filter(option => !selectedOptions.find(selectedOption => selectedOption.value === option.value));
+    const newOptions = [...selectedOptions, ...nonSelectedOptions];
+    if (!isEqual(newOptions, sortedOptions)) {
+      setSortedOptions(newOptions);
+    }
+  }, [selectedOptions, options, sortedOptions]);
+  const sortOptionsOnResolve = useCallback(() => {
+    // when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
+    if (searchTerm) {
+      sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
+      return setSortedOptions(options);
+    }
+
+    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
+    if (sortedOptions.length === 0) {
+      return sortOptionsOnPopupOpen();
+    }
+
+    // this block handles the pagination, where on pagination, we will just append newOptions to the current list
+    if (sortPaginatedResults.current) {
+      const newOptions = options.filter(option => !sortedOptions.find(sortedOption => sortedOption.value === option.value));
+      if (newOptions.length > 0) {
+        setSortedOptions([...sortedOptions, ...newOptions]);
+      }
+      sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
+      return;
+    }
+    sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
+    sortOptionsOnPopupOpen();
+  }, [options, searchTerm, sortOptionsOnPopupOpen, sortedOptions]);
+  const handleMenuOpen = useCallback(() => {
+    if (status === 'resolved') {
+      sortOptionsOnPopupOpen();
+    }
+    fireEvent('ui.dropdown.opened.basicSearchDropdown', {
+      filterName,
+      selectionCount: selectedOptions.length
+    });
+    onMenuOpen === null || onMenuOpen === void 0 ? void 0 : onMenuOpen();
+  }, [filterName, fireEvent, onMenuOpen, selectedOptions.length, sortOptionsOnPopupOpen, status]);
+  const handleMenuClose = useCallback(() => {
+    /**
+     * Clearing the search is to ensure that the sortOptionsOnPopupOpen logic does not mess up.
+     * Without this, when the user opens, sortOptionsOnPopupOpen will inject the selected options to the list and the list count and values will be off
+     */
+    if (searchTerm) {
+      setSearchTerm('');
+    }
+    onMenuClose === null || onMenuClose === void 0 ? void 0 : onMenuClose();
+    fireEvent('ui.dropdown.closed.basicSearchDropdown', {
+      filterName,
+      selectionCount: selectedOptions.length
+    });
+  }, [filterName, fireEvent, onMenuClose, searchTerm, selectedOptions.length]);
+  const handleInputChange = useCallback(async (newSearchTerm, actionMeta) => {
+    if (actionMeta.action === 'input-change' && newSearchTerm !== searchTerm) {
+      setSearchTerm(newSearchTerm);
+      onInputChange(newSearchTerm, actionMeta);
+    }
+  }, [onInputChange, searchTerm]);
+  useEffect(() => {
+    if (status === 'resolved') {
+      sortOptionsOnResolve();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
+
+  useEffect(() => {
+    if (status === 'loadingMore') {
+      sortPaginatedResults.current = true;
+    }
+  }, [status]);
+  return /*#__PURE__*/React.createElement(PopupSelect, {
+    isMulti: true,
+    maxMenuWidth: 300,
+    minMenuWidth: 300,
+    testId: `${filterName}-popup-select`,
+    inputId: `${filterName}-popup-select--input`
+    /*
+      this threshold controls the display of the search control (input field for search)
+      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
+      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
+    */,
+    searchThreshold: -1,
+    inputValue: searchTerm,
+    closeMenuOnSelect: false,
+    hideSelectedOptions: false,
+    isLoading: showLoading,
+    placeholder: formatMessage(asyncPopupSelectMessages.selectPlaceholder),
+    menuListProps: menuListProps,
+    components: {
+      Option: CheckboxOption,
+      Control: CustomControl,
+      MenuList: CustomMenuList,
+      DropdownIndicator: CustomDropdownIndicator,
+      LoadingIndicator: undefined,
+      // disables the three ... indicator in the searchbox when picker is loading
+      IndicatorSeparator: undefined // disables the | separator between search input and icon
+    },
+    options: sortedOptions,
+    value: selectedOptions,
+    filterOption: noFilterOptions,
+    formatOptionLabel: formatOptionLabel,
+    onChange: onSelectionChange,
+    onInputChange: handleInputChange,
+    onOpen: handleMenuOpen,
+    onClose: handleMenuClose,
+    target: ({
+      isOpen,
+      ...triggerProps
+    }) => /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, triggerProps, {
+      label: buttonLabel,
+      selectedOptions: selectedOptions,
+      isSelected: isOpen,
+      isDisabled: isDisabled,
+      isLoading: showHydrating,
+      testId: filterName
+    })),
+    footer: shouldShowFooter && /*#__PURE__*/React.createElement(PopupFooter, {
+      currentDisplayCount: options.length,
+      totalCount: totalCount
+    })
+  });
+};

package/dist/es2019/ui/{jira-issues-modal/basic-filters/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 '../async-popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../../../../jira-issues-modal/basic-filters/ui/async-popup-select';
 import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const getErrorReasonType = errors => {
@@ -17,7 +17,7 @@ const getErrorReasonType = errors => {
   return 'unknown';
 };
 const CustomErrorMessage = ({
-  filterType,
+  filterName,
   errors
 }) => {
   const {
@@ -30,7 +30,7 @@ const CustomErrorMessage = ({
    */
   const [debouncedAnalyticsCallback] = useDebouncedCallback(() => {
     fireEvent('ui.error.shown.basicSearchDropdown', {
-      filterType,
+      filterName,
       reason: getErrorReasonType(errors)
     });
   }, SEARCH_DEBOUNCE_MS);

package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/index.js

@@ -2,10 +2,10 @@ import React from 'react';
 import { Box, Flex, xcss } from '@atlaskit/primitives';
 import { components } from '@atlaskit/select';
 import Spinner from '@atlaskit/spinner';
-import ShowMoreButton from '../async-popup-select/showMoreButton';
 import CustomErrorMessage from './errorMessage';
 import CustomDropdownLoadingMessage from './loadingMessage';
 import CustomNoOptionsMessage from './noOptionsMessage';
+import ShowMoreButton from './showMoreButton';
 const inlineSpinnerStyles = xcss({
   paddingTop: 'space.075'
 });
@@ -18,7 +18,7 @@ const CustomMenuList = ({
   ...props
 }) => {
   const {
-    filterType,
+    filterName,
     isLoading,
     isLoadingMore,
     isError,
@@ -41,19 +41,20 @@ const CustomMenuList = ({
     }
     if (isError) {
       return /*#__PURE__*/React.createElement(CustomErrorMessage, {
-        filterType: filterType,
+        filterName: filterName,
         errors: errors
       });
     }
     if (isEmpty) {
       return /*#__PURE__*/React.createElement(CustomNoOptionsMessage, {
-        filterType: filterType
+        filterName: filterName
       });
     }
     return /*#__PURE__*/React.createElement(React.Fragment, null, children, shouldDisplayShowMore && /*#__PURE__*/React.createElement(Box, {
       xcss: showMoreButtonBoxStyles
     }, /*#__PURE__*/React.createElement(ShowMoreButton, {
-      onShowMore: handleShowMore
+      onShowMore: handleShowMore,
+      filterName: filterName
     })), isLoadingMoreData && /*#__PURE__*/React.createElement(InlineSpinner, null));
   };
   return /*#__PURE__*/React.createElement(components.MenuList, props, renderChildren());

package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/messages.js

@@ -14,5 +14,10 @@ export const asyncPopupSelectMessages = defineMessages({
     id: 'linkDataSource.basic-filter.error-message',
     defaultMessage: 'Something went wrong',
     description: 'The text for when an error occurs when loading options'
+  },
+  showMoreMessage: {
+    id: 'linkDataSource.basic-filter.showMoreButton',
+    defaultMessage: 'Show more',
+    description: 'The text to show more options in dropdown'
   }
 });

package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/noOptionsMessage.js

@@ -3,11 +3,11 @@ 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 '../async-popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../../../../jira-issues-modal/basic-filters/ui/async-popup-select';
 import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const CustomNoOptionsMessage = ({
-  filterType
+  filterName
 }) => {
   const {
     fireEvent
@@ -21,7 +21,7 @@ const CustomNoOptionsMessage = ({
    */
   const [debouncedAnalyticsCallback] = useDebouncedCallback(() => {
     fireEvent('ui.emptyResult.shown.basicSearchDropdown', {
-      filterType
+      filterName
     });
   }, SEARCH_DEBOUNCE_MS);
   useEffect(debouncedAnalyticsCallback, [debouncedAnalyticsCallback]);