@atlaskit/link-datasource 1.26.1 → 1.26.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.26.3
+
+### Patch Changes
+
+- [#88851](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88851) [`236a86f49825`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/236a86f49825) - The changes here extracts the popup dropdown component into the common folder to be used by mulitple datasource providers, along with adding feature flag for CLOL basic filter rollout.
+
+## 1.26.2
+
+### Patch Changes
+
+- [#89277](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89277) [`9dc291ef49c4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9dc291ef49c4) - Add analytics events for when confluence config modal is viewed and is ready for interaction
+
 ## 1.26.1
 
 ### Patch Changes

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

@@ -5,24 +5,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BasicSearchInput = void 0;
-var _react = require("react");
-var _react2 = require("@emotion/react");
+var _react = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _button = require("@atlaskit/button");
 var _search = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/search"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
 var _analytics = require("../../../../analytics");
 var _messages = require("./messages");
 /** @jsx jsx */
 
-var searchButtonStyles = (0, _react2.css)({
+var searchButtonStyles = (0, _react.css)({
   marginRight: "var(--ds-space-075, 6px)"
 });
-var formStyles = (0, _react2.css)({
+var formStyles = (0, _react.css)({
   flex: 1
 });
-var formWithMaxWidthStyles = (0, _react2.css)({
+var formWithMaxWidthStyles = (0, _react.css)({
   flex: 1,
   maxWidth: 250
 });
@@ -47,21 +45,14 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
     e.preventDefault();
     handleSearchWithAnalytics();
   };
-  var showBasicFilters = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
-      return true;
-    }
-    return false;
-  }, []);
-  var isFullWidth = fullWidth || !showBasicFilters;
-  return (0, _react2.jsx)("form", {
-    css: isFullWidth ? formStyles : formWithMaxWidthStyles,
+  return (0, _react.jsx)("form", {
+    css: fullWidth ? formStyles : formWithMaxWidthStyles,
     onSubmit: handleFormSubmit
-  }, (0, _react2.jsx)(_textfield.default, {
-    elemAfterInput: (0, _react2.jsx)(_button.LoadingButton, {
+  }, (0, _react.jsx)(_textfield.default, {
+    elemAfterInput: (0, _react.jsx)(_button.LoadingButton, {
       appearance: "primary",
       css: searchButtonStyles,
-      iconBefore: (0, _react2.jsx)(_search.default, {
+      iconBefore: (0, _react.jsx)(_search.default, {
         label: formatMessage(_messages.basicSearchInputMessages.basicTextSearchLabel),
         size: "medium"
       }),

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

@@ -0,0 +1,217 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FilterPopupSelect = 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 _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+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 _select = require("@atlaskit/select");
+var _analytics = require("../../../../analytics");
+var _control = _interopRequireDefault(require("./control"));
+var _dropdownIndicator = _interopRequireDefault(require("./dropdownIndicator"));
+var _footer = _interopRequireDefault(require("./footer"));
+var _formatOptionLabel = _interopRequireDefault(require("./formatOptionLabel"));
+var _menuList = _interopRequireDefault(require("./menu-list"));
+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 FilterPopupSelect = exports.FilterPopupSelect = function FilterPopupSelect(_ref) {
+  var filterName = _ref.filterName,
+    totalCount = _ref.totalCount,
+    status = _ref.status,
+    buttonLabel = _ref.buttonLabel,
+    _ref$showLoading = _ref.showLoading,
+    showLoading = _ref$showLoading === void 0 ? false : _ref$showLoading,
+    _ref$isDisabled = _ref.isDisabled,
+    isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
+    _ref$showHydrating = _ref.showHydrating,
+    showHydrating = _ref$showHydrating === void 0 ? false : _ref$showHydrating,
+    _ref$shouldShowFooter = _ref.shouldShowFooter,
+    shouldShowFooter = _ref$shouldShowFooter === void 0 ? true : _ref$shouldShowFooter,
+    menuListProps = _ref.menuListProps,
+    options = _ref.options,
+    selectedOptions = _ref.selectedOptions,
+    onSelectionChange = _ref.onSelectionChange,
+    onInputChange = _ref.onInputChange,
+    onMenuClose = _ref.onMenuClose,
+    onMenuOpen = _ref.onMenuOpen;
+  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],
+    setSearchTerm = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    sortedOptions = _useState4[0],
+    setSortedOptions = _useState4[1];
+  var sortPaginatedResults = (0, _react.useRef)(false); // this is to track pagination for sorting purpose
+
+  var sortOptionsOnPopupOpen = (0, _react.useCallback)(function () {
+    if (selectedOptions.length === 0) {
+      return setSortedOptions(options);
+    }
+    var nonSelectedOptions = options.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, options, 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(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) {
+      var newOptions = options.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();
+  }, [options, searchTerm, sortOptionsOnPopupOpen, sortedOptions]);
+  var handleMenuOpen = (0, _react.useCallback)(function () {
+    if (status === 'resolved') {
+      sortOptionsOnPopupOpen();
+    }
+    fireEvent('ui.dropdown.opened.basicSearchDropdown', {
+      filterName: filterName,
+      selectionCount: selectedOptions.length
+    });
+    onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
+  }, [filterName, fireEvent, onMenuOpen, 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) {
+      setSearchTerm('');
+    }
+    onMenuClose === null || onMenuClose === void 0 || onMenuClose();
+    fireEvent('ui.dropdown.closed.basicSearchDropdown', {
+      filterName: filterName,
+      selectionCount: selectedOptions.length
+    });
+  }, [filterName, fireEvent, onMenuClose, searchTerm, selectedOptions.length]);
+  var handleInputChange = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newSearchTerm, actionMeta) {
+      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);
+              onInputChange(newSearchTerm, actionMeta);
+            }
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [onInputChange, searchTerm]);
+  (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
+
+  (0, _react.useEffect)(function () {
+    if (status === 'loadingMore') {
+      sortPaginatedResults.current = true;
+    }
+  }, [status]);
+  return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
+    isMulti: true,
+    maxMenuWidth: 300,
+    minMenuWidth: 300,
+    testId: "".concat(filterName, "-popup-select"),
+    inputId: "".concat(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(_messages.asyncPopupSelectMessages.selectPlaceholder),
+    menuListProps: menuListProps,
+    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: sortedOptions,
+    value: selectedOptions,
+    filterOption: noFilterOptions,
+    formatOptionLabel: _formatOptionLabel.default,
+    onChange: onSelectionChange,
+    onInputChange: handleInputChange,
+    onOpen: handleMenuOpen,
+    onClose: handleMenuClose,
+    target: function target(_ref3) {
+      var isOpen = _ref3.isOpen,
+        triggerProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
+      return /*#__PURE__*/_react.default.createElement(_trigger.default, (0, _extends2.default)({}, triggerProps, {
+        label: buttonLabel,
+        selectedOptions: selectedOptions,
+        isSelected: isOpen,
+        isDisabled: isDisabled,
+        isLoading: showHydrating,
+        testId: filterName
+      }));
+    },
+    footer: shouldShowFooter && /*#__PURE__*/_react.default.createElement(_footer.default, {
+      currentDisplayCount: options.length,
+      totalCount: totalCount
+    })
+  });
+};

package/dist/cjs/ui/{jira-issues-modal/basic-filters/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("../async-popup-select");
+var _asyncPopupSelect = require("../../../../jira-issues-modal/basic-filters/ui/async-popup-select");
 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); }
@@ -30,7 +30,7 @@ var getErrorReasonType = function getErrorReasonType(errors) {
   return 'unknown';
 };
 var CustomErrorMessage = function CustomErrorMessage(_ref3) {
-  var filterType = _ref3.filterType,
+  var filterName = _ref3.filterName,
     errors = _ref3.errors;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
@@ -41,7 +41,7 @@ var CustomErrorMessage = function CustomErrorMessage(_ref3) {
    */
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function () {
       fireEvent('ui.error.shown.basicSearchDropdown', {
-        filterType: filterType,
+        filterName: filterName,
         reason: getErrorReasonType(errors)
       });
     }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),

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

@@ -10,10 +10,10 @@ var _react = _interopRequireDefault(require("react"));
 var _primitives = require("@atlaskit/primitives");
 var _select = require("@atlaskit/select");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
-var _showMoreButton = _interopRequireDefault(require("../async-popup-select/showMoreButton"));
 var _errorMessage = _interopRequireDefault(require("./errorMessage"));
 var _loadingMessage = _interopRequireDefault(require("./loadingMessage"));
 var _noOptionsMessage = _interopRequireDefault(require("./noOptionsMessage"));
+var _showMoreButton = _interopRequireDefault(require("./showMoreButton"));
 var _excluded = ["children"];
 var inlineSpinnerStyles = (0, _primitives.xcss)({
   paddingTop: 'space.075'
@@ -26,7 +26,7 @@ var CustomMenuList = function CustomMenuList(_ref) {
   var children = _ref.children,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _props$selectProps$me = props.selectProps.menuListProps,
-    filterType = _props$selectProps$me.filterType,
+    filterName = _props$selectProps$me.filterName,
     isLoading = _props$selectProps$me.isLoading,
     isLoadingMore = _props$selectProps$me.isLoadingMore,
     isError = _props$selectProps$me.isError,
@@ -50,19 +50,20 @@ var CustomMenuList = function CustomMenuList(_ref) {
     }
     if (isError) {
       return /*#__PURE__*/_react.default.createElement(_errorMessage.default, {
-        filterType: filterType,
+        filterName: filterName,
         errors: errors
       });
     }
     if (isEmpty) {
       return /*#__PURE__*/_react.default.createElement(_noOptionsMessage.default, {
-        filterType: filterType
+        filterName: filterName
       });
     }
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, shouldDisplayShowMore && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
       xcss: showMoreButtonBoxStyles
     }, /*#__PURE__*/_react.default.createElement(_showMoreButton.default, {
-      onShowMore: handleShowMore
+      onShowMore: handleShowMore,
+      filterName: filterName
     })), isLoadingMoreData && /*#__PURE__*/_react.default.createElement(InlineSpinner, null));
   };
   return /*#__PURE__*/_react.default.createElement(_select.components.MenuList, props, renderChildren());

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

@@ -20,5 +20,10 @@ var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = (0, _reactIntl
     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/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/noOptionsMessage.js

@@ -12,13 +12,13 @@ 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("../async-popup-select");
+var _asyncPopupSelect = require("../../../../jira-issues-modal/basic-filters/ui/async-popup-select");
 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); }
 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 CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
-  var filterType = _ref.filterType;
+  var filterName = _ref.filterName;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
 
@@ -30,7 +30,7 @@ var CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
    */
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function () {
       fireEvent('ui.emptyResult.shown.basicSearchDropdown', {
-        filterType: filterType
+        filterName: filterName
       });
     }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),

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

@@ -0,0 +1,36 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _button = _interopRequireDefault(require("@atlaskit/button"));
+var _analytics = require("../../../../../analytics");
+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 ShowMoreButton = function ShowMoreButton(_ref) {
+  var onShowMore = _ref.onShowMore,
+    filterName = _ref.filterName;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var handleShowMore = (0, _react.useCallback)(function () {
+    fireEvent('ui.button.clicked.basicSearchDropdown', {
+      filterName: filterName,
+      type: 'showMore'
+    });
+    onShowMore();
+  }, [filterName, fireEvent, onShowMore]);
+  return /*#__PURE__*/_react.default.createElement(_button.default, {
+    onClick: handleShowMore,
+    appearance: "link",
+    testId: "jlol-basic-filter-popup-select--show-more-button"
+  }, formatMessage(_messages.asyncPopupSelectMessages.showMoreMessage));
+};
+var _default = exports.default = ShowMoreButton;

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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}'
+  }
+});

package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.js

@@ -9,13 +9,11 @@ exports.default = exports.LoadingStateAnimationWrapper = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _reactIntlNext = require("react-intl-next");
 var _badge = _interopRequireDefault(require("@atlaskit/badge"));
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _primitives = require("@atlaskit/primitives");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
-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 triggerButtonLabelStyles = (0, _primitives.xcss)({
@@ -42,25 +40,26 @@ var LoadingStateAnimationWrapper = exports.LoadingStateAnimationWrapper = _style
   }
 });
 var PopupTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var filterType = _ref.filterType,
-    isSelected = _ref.isSelected,
+  var isSelected = _ref.isSelected,
     isDisabled = _ref.isDisabled,
     isLoading = _ref.isLoading,
-    selectedOptions = _ref.selectedOptions;
+    selectedOptions = _ref.selectedOptions,
+    testId = _ref.testId,
+    label = _ref.label;
   var _ref2 = selectedOptions || [],
     _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
     firstOption = _ref3[0];
   var hasOptions = selectedOptions && selectedOptions.length > 0;
   var showButtonLoading = !isDisabled && isLoading;
-  var testId = "jlol-basic-filter-".concat(filterType, "-trigger");
+  var tiggerButtonTestId = "".concat(testId, "-trigger");
   var LoadingButton = (0, _react.useCallback)(function () {
     return /*#__PURE__*/_react.default.createElement(LoadingStateAnimationWrapper, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
       iconAfter: /*#__PURE__*/_react.default.createElement(_spinner.default, {
         size: 'xsmall'
       }),
-      testId: "".concat(testId, "--loading-button")
-    }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.asyncPopupSelectMessages["".concat(filterType, "Label")])));
-  }, [filterType, testId]);
+      testId: "".concat(tiggerButtonTestId, "--loading-button")
+    }, label));
+  }, [label, tiggerButtonTestId]);
   var DefaultButton = (0, _react.useCallback)(function () {
     return /*#__PURE__*/_react.default.createElement(_standardButton.default, {
       appearance: "default",
@@ -69,16 +68,16 @@ var PopupTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       iconAfter: /*#__PURE__*/_react.default.createElement(_chevronDown.default, {
         label: ""
       }),
-      testId: "".concat(testId, "--button")
+      testId: "".concat(tiggerButtonTestId, "--button")
     }, /*#__PURE__*/_react.default.createElement(_primitives.Flex, null, /*#__PURE__*/_react.default.createElement(_primitives.Box, {
       xcss: triggerButtonLabelStyles
-    }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.asyncPopupSelectMessages["".concat(filterType, "Label")]), firstOption && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
+    }, label, firstOption && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
       xcss: badgeStyles,
       alignItems: "center"
     }, /*#__PURE__*/_react.default.createElement(_badge.default, {
       appearance: "primary"
     }, "+", selectedOptions.length - 1))));
-  }, [filterType, firstOption, hasOptions, isDisabled, isSelected, selectedOptions, testId]);
+  }, [firstOption, hasOptions, isDisabled, isSelected, label, selectedOptions, tiggerButtonTestId]);
 
   /**
    * We had an issue with the popup component referencing a stale DOM ref for the trigger button.
@@ -86,7 +85,7 @@ var PopupTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
    */
   return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     ref: ref,
-    testId: testId
+    testId: tiggerButtonTestId
   }, showButtonLoading ? /*#__PURE__*/_react.default.createElement(LoadingButton, null) : /*#__PURE__*/_react.default.createElement(DefaultButton, null));
 });
 var _default = exports.default = PopupTrigger;

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

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
+var _react = _interopRequireDefault(require("react"));
+var _primitives = require("@atlaskit/primitives");
+var basicFilterContainerStyles = (0, _primitives.xcss)({
+  paddingLeft: 'space.100'
+});
+var BasicFilterContainer = function BasicFilterContainer(_ref) {
+  (0, _objectDestructuringEmpty2.default)(_ref);
+  return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
+    xcss: basicFilterContainerStyles,
+    gap: "space.100",
+    testId: "clol-basic-filter-container"
+  }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
+};
+var _default = exports.default = BasicFilterContainer;

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

@@ -8,10 +8,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _primitives = require("@atlaskit/primitives");
 var _basicSearchInput = require("../../common/modal/basic-search-input");
+var _basicFilters = _interopRequireDefault(require("../basic-filters"));
 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 basicSearchInputContainerStyles = (0, _primitives.xcss)({
+  flexGrow: 1
+});
 var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   var cloudId = _ref.cloudId,
     initialSearchValue = _ref.initialSearchValue,
@@ -35,14 +41,23 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
       currentCloudId.current = cloudId;
     }
   }, [cloudId]);
-  return /*#__PURE__*/_react.default.createElement(_basicSearchInput.BasicSearchInput, {
+  var showBasicFilters = (0, _react.useMemo)(function () {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-clol-basic-filters')) {
+      return true;
+    }
+    return false;
+  }, []);
+  return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
+    alignItems: "center",
+    xcss: basicSearchInputContainerStyles
+  }, /*#__PURE__*/_react.default.createElement(_basicSearchInput.BasicSearchInput, {
     testId: "confluence-search-datasource-modal",
     isSearching: isSearching,
     onChange: handleSearchChange,
     onSearch: onSearch,
     searchTerm: searchBarSearchString,
     placeholder: _messages.searchMessages.searchLabel,
-    fullWidth: true
-  });
+    fullWidth: !showBasicFilters
+  }), showBasicFilters && /*#__PURE__*/_react.default.createElement(_basicFilters.default, null));
 };
 var _default = exports.default = ConfluenceSearchContainer;