@atlaskit/link-datasource 1.27.2 → 1.27.4

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/issue-like-table/empty-state/type.js

@@ -6,11 +6,11 @@ import Epic16Icon from '@atlaskit/icon-object/glyph/epic/16';
 import Issue16Icon from '@atlaskit/icon-object/glyph/issue/16';
 import Story16Icon from '@atlaskit/icon-object/glyph/story/16';
 import Task16Icon from '@atlaskit/icon-object/glyph/task/16';
-const IconWrapper = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: left;
-`;
+const IconWrapper = styled.div({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'left'
+});
 export default (({
   type
 }) => {

package/dist/es2019/ui/issue-like-table/render-type/icon/index.js

@@ -1,11 +1,11 @@
 import React from 'react';
 import styled from '@emotion/styled';
 import Image from '@atlaskit/image';
-const IconWrapper = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: left;
-`;
+const IconWrapper = styled.div({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'left'
+});
 export const ICON_TYPE_TEST_ID = 'link-datasource-render-type--icon';
 const IconRenderType = ({
   label,

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/assets-modal/search-container/styled.js

@@ -1,11 +1,25 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 import styled from '@emotion/styled';
-export var FormRowContainer = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  align-items: center;\n  display: flex;\n  gap: ", ";\n  flex-grow: 1;\n  width: 100%;\n"])), function (props) {
-  return props.isNarrowGap ? "var(--ds-space-100, 8px)" : "var(--ds-space-200, 16px)";
+export var FormRowContainer = styled.div(function (props) {
+  return {
+    alignItems: 'center',
+    display: 'flex',
+    gap: props.isNarrowGap ? "var(--ds-space-100, 8px)" : "var(--ds-space-200, 16px)",
+    flexGrow: 1,
+    width: '100%'
+  };
+});
+export var FormContainer = styled.form({
+  display: 'grid',
+  rowGap: "var(--ds-space-200, 16px)",
+  width: '100%'
 });
-export var FormContainer = styled.form(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: grid;\n  row-gap: ", ";\n  width: 100%;\n"])), "var(--ds-space-200, 16px)");
 
 // Override the top margin of fields
-export var FieldContainer = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  flex: 1;\n  margin-top: ", ";\n"])), "var(--ds-space-negative-100, -8px)");
-export var SchemaSelectContainer = styled.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 100%;\n  max-width: 386px;\n"])));
+export var FieldContainer = styled.div({
+  flex: 1,
+  marginTop: "var(--ds-space-negative-100, -8px)"
+});
+export var SchemaSelectContainer = styled.div({
+  width: '100%',
+  maxWidth: '386px'
+});

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",

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

@@ -29,14 +29,14 @@ var IconOptionLabel = function IconOptionLabel(_ref) {
   };
   return /*#__PURE__*/React.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.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));
@@ -46,7 +46,7 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
     testId = _ref3.testId;
   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",
@@ -59,8 +59,7 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
     src: data.avatar,
     size: "xsmall"
   }), /*#__PURE__*/React.createElement(Box, {
-    xcss: [commonLabelStyles, avatarOptionLabelStyles],
-    testId: "nidhin"
+    xcss: [commonLabelStyles, avatarOptionLabelStyles]
   }, data.label));
 };
 var formatOptionLabel = function formatOptionLabel(data) {

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

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

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

@@ -4,7 +4,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';
 var getErrorReasonType = function getErrorReasonType(errors) {
@@ -45,7 +45,7 @@ var CustomErrorMessage = function CustomErrorMessage(_ref3) {
       size: "xlarge"
     }),
     message: asyncPopupSelectMessages.errorMessage,
-    testId: "jlol-basic-filter-popup-select--error-message"
+    testId: "".concat(filterName, "--error-message")
   });
 };
 export default CustomErrorMessage;

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

@@ -39,7 +39,9 @@ var CustomMenuList = function CustomMenuList(_ref) {
   };
   var renderChildren = function renderChildren() {
     if (isLoading) {
-      return /*#__PURE__*/React.createElement(CustomDropdownLoadingMessage, null);
+      return /*#__PURE__*/React.createElement(CustomDropdownLoadingMessage, {
+        filterName: filterName
+      });
     }
     if (isError) {
       return /*#__PURE__*/React.createElement(CustomErrorMessage, {
@@ -52,7 +54,7 @@ var CustomMenuList = function CustomMenuList(_ref) {
         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/esm/ui/common/modal/popup-select/menu-list/loadingMessage.js

@@ -2,13 +2,14 @@ import React from 'react';
 import Spinner from '@atlaskit/spinner';
 import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
-var CustomDropdownLoadingMessage = function CustomDropdownLoadingMessage() {
+var CustomDropdownLoadingMessage = function CustomDropdownLoadingMessage(_ref) {
+  var filterName = _ref.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: "".concat(filterName, "--loading-message")
   });
 };
 export default CustomDropdownLoadingMessage;

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

@@ -4,7 +4,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';
 var CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
@@ -33,7 +33,7 @@ var CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
       label: ""
     }),
     message: asyncPopupSelectMessages.noOptionsMessage,
-    testId: "jlol-basic-filter-popup-select--no-options-message"
+    testId: "".concat(filterName, "--no-options-message")
   });
 };
 export default CustomNoOptionsMessage;

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

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

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

@@ -75,7 +75,10 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     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 = useState(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     availableSites = _useState2[0],
@@ -115,9 +118,15 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       return v !== undefined;
     }).length > 1;
   }, [cloudId, parameters]);
+  var parametersToSend = useMemo(function () {
+    if (!isParametersSet) {
+      return undefined;
+    }
+    return _objectSpread(_objectSpread({}, parameters), overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
+  }, [parameters, overrideParameters, isParametersSet]);
   var _useDatasourceTableSt = useDatasourceTableState({
       datasourceId: datasourceId,
-      parameters: isParametersSet ? parameters : undefined,
+      parameters: parametersToSend,
       fieldKeys: visibleColumnKeys
     }),
     reset = _useDatasourceTableSt.reset,
@@ -372,7 +381,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: _objectSpread(_objectSpread({}, parameters), {}, {
+        parameters: _objectSpread(_objectSpread({}, parametersToSend), {}, {
           cloudId: cloudId
         }),
         views: [{
@@ -393,7 +402,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
         }]
       }, 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(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -429,7 +438,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     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/esm/ui/issue-like-table/empty-state/type.js

@@ -1,5 +1,3 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
 import React from 'react';
 import styled from '@emotion/styled';
 import Bug16Icon from '@atlaskit/icon-object/glyph/bug/16';
@@ -8,7 +6,11 @@ import Epic16Icon from '@atlaskit/icon-object/glyph/epic/16';
 import Issue16Icon from '@atlaskit/icon-object/glyph/issue/16';
 import Story16Icon from '@atlaskit/icon-object/glyph/story/16';
 import Task16Icon from '@atlaskit/icon-object/glyph/task/16';
-var IconWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  justify-content: left;\n"])));
+var IconWrapper = styled.div({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'left'
+});
 export default (function (_ref) {
   var type = _ref.type;
   var TypeIcon = function TypeIcon() {

package/dist/esm/ui/issue-like-table/render-type/icon/index.js

@@ -1,9 +1,11 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
 import React from 'react';
 import styled from '@emotion/styled';
 import Image from '@atlaskit/image';
-var IconWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  justify-content: left;\n"])));
+var IconWrapper = styled.div({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'left'
+});
 export var ICON_TYPE_TEST_ID = 'link-datasource-render-type--icon';
 var IconRenderType = function IconRenderType(_ref) {
   var label = _ref.label,

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

@@ -6,9 +6,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 var SEARCH_DEBOUNCE_MS = 350;
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
     site = _ref.site,
@@ -104,11 +104,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(asyncPopupSelectMessages["".concat(filterType, "Label")]);
   return /*#__PURE__*/React.createElement(FilterPopupSelect, {
-    filterName: "jlol-basic-filter-".concat(filterType),
+    filterName: filterName,
     status: status,
     showLoading: isLoading,
     showHydrating: isJQLHydrating,
@@ -122,7 +123,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     onSelectionChange: handleOptionSelection,
     onMenuOpen: handleMenuOpen,
     menuListProps: {
-      filterName: filterType,
+      filterName: filterName,
       isError: isError,
       isEmpty: isEmpty,
       isLoading: isLoading,

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

@@ -14,6 +14,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';
@@ -31,7 +32,6 @@ var basicSearchInputContainerStyles = xcss({
 });
 export var DEFAULT_JQL_QUERY = 'ORDER BY created DESC';
 export var ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
-export var FILTER_SELECTION_DEBOUNCE_MS = 500;
 export var JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,

package/dist/types/ui/common/modal/popup-select/constants.d.ts

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

package/dist/types/ui/common/modal/popup-select/footer.d.ts

@@ -2,6 +2,7 @@
 export interface PopupFooterProps {
     currentDisplayCount: number;
     totalCount: number;
+    filterName: string;
 }
-declare const PopupFooter: ({ currentDisplayCount, totalCount }: PopupFooterProps) => JSX.Element;
+declare const PopupFooter: ({ currentDisplayCount, totalCount, filterName, }: PopupFooterProps) => JSX.Element;
 export default PopupFooter;

package/dist/types/ui/common/modal/popup-select/index.d.ts

@@ -2,7 +2,7 @@
 import { InputActionMeta, ValueType } from '@atlaskit/select';
 import { CustomMenuListProps } from './menu-list';
 import { SelectOption } from './types';
-export declare const FilterPopupSelect: ({ filterName, totalCount, status, buttonLabel, showLoading, isDisabled, showHydrating, shouldShowFooter, menuListProps, options, selectedOptions, onSelectionChange, onInputChange, onMenuClose, onMenuOpen, }: {
+export interface FilterPopupSelectProps {
     buttonLabel: string;
     totalCount: number;
     filterName: string;
@@ -16,6 +16,7 @@ export declare const FilterPopupSelect: ({ filterName, totalCount, status, butto
     selectedOptions: ValueType<SelectOption, true>;
     onSelectionChange: (newValue: ValueType<SelectOption, true>) => void;
     onInputChange: (newValue: string, actionMeta: InputActionMeta) => void;
-    onMenuOpen?: (() => void) | undefined;
-    onMenuClose?: (() => void) | undefined;
-}) => JSX.Element;
+    onMenuOpen?: () => void;
+    onMenuClose?: () => void;
+}
+export declare const FilterPopupSelect: ({ filterName, totalCount, status, buttonLabel, showLoading, isDisabled, showHydrating, shouldShowFooter, menuListProps, options, selectedOptions, onSelectionChange, onInputChange, onMenuClose, onMenuOpen, }: FilterPopupSelectProps) => JSX.Element;

package/dist/types/ui/common/modal/popup-select/menu-list/index.d.ts

@@ -7,7 +7,7 @@ export type CustomMenuListProps = {
     isLoadingMore?: boolean;
     isEmpty?: boolean;
     showMore?: boolean;
-    handleShowMore: () => void;
+    handleShowMore?: () => void;
     filterName: string;
     errors?: unknown[];
 };

package/dist/types/ui/common/modal/popup-select/menu-list/loadingMessage.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const CustomDropdownLoadingMessage: () => JSX.Element;
+declare const CustomDropdownLoadingMessage: ({ filterName, }: {
+    filterName: string;
+}) => JSX.Element;
 export default CustomDropdownLoadingMessage;

package/dist/types/ui/confluence-search-modal/types.d.ts

@@ -1,6 +1,8 @@
 import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
 import { ConfigModalProps } from '../../common/types';
 export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
+    disableDisplayDropdown?: boolean;
+    overrideParameters?: Pick<ConfluenceSearchDatasourceParameters, 'entityTypes'>;
 }
 export type ConfluenceSearchDatasourceParameters = {
     cloudId: string;

package/dist/types/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts

@@ -1,6 +1,7 @@
 import { IntlShape } from 'react-intl-next';
 import type { Site } from '../../../../common/types';
-import { AvatarLabelOption, BasicFilterFieldType, SelectOption } from '../types';
+import { AvatarLabelOption, SelectOption } from '../../../common/modal/popup-select/types';
+import { BasicFilterFieldType } from '../types';
 interface FilterOptionsProps {
     filterType: BasicFilterFieldType;
     site?: Site;

package/dist/types/ui/jira-issues-modal/basic-filters/types.d.ts

@@ -1,24 +1,5 @@
+import { SelectOption } from '../../common/modal/popup-select/types';
 export type BasicFilterFieldType = 'project' | 'assignee' | 'type' | 'status';
-export interface OptionBase {
-    label: string;
-    value: string;
-}
-export type IconLabelOption = OptionBase & {
-    optionType: 'iconLabel';
-    icon: string;
-};
-export type LozengeLabelOption = OptionBase & {
-    optionType: 'lozengeLabel';
-    appearance?: LozengeAppearance;
-};
-export type LozengeAppearance = 'default' | 'inprogress' | 'moved' | 'new' | 'removed' | 'success';
-export type AvatarLabelOption = OptionBase & {
-    optionType: 'avatarLabel';
-    avatar?: string;
-    isSquare?: boolean;
-    isGroup?: boolean;
-};
-export type SelectOption = IconLabelOption | LozengeLabelOption | AvatarLabelOption;
 export type SelectedOptionsMap = {
     [key in BasicFilterFieldType]?: SelectOption[];
 };

package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { Site } from '../../../../../common/types';
-import { BasicFilterFieldType, SelectOption } from '../../types';
+import { SelectOption } from '../../../../common/modal/popup-select/types';
+import { BasicFilterFieldType } from '../../types';
 export interface AsyncPopupSelectProps {
     filterType: BasicFilterFieldType;
     selection: SelectOption[];
@@ -9,6 +10,5 @@ export interface AsyncPopupSelectProps {
     isDisabled?: boolean;
     site?: Site;
 }
-export declare const SEARCH_DEBOUNCE_MS = 350;
 declare const AsyncPopupSelect: ({ filterType, site, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { Site } from '../../../../common/types';
-import type { BasicFilterFieldType, SelectedOptionsMap, SelectOption } from '../types';
+import { SelectOption } from '../../../common/modal/popup-select/types';
+import type { BasicFilterFieldType, SelectedOptionsMap } from '../types';
 export declare const availableBasicFilterTypes: BasicFilterFieldType[];
 export interface BasicFilterContainerProps {
     jql: string;

package/dist/types/ui/jira-issues-modal/basic-filters/utils/transformers.d.ts

@@ -1,4 +1,5 @@
-import { FieldValuesResponse, HydrateResponse, SelectedOptionsMap, SelectOption } from '../types';
+import { SelectOption } from '../../../common/modal/popup-select/types';
+import { FieldValuesResponse, HydrateResponse, SelectedOptionsMap } from '../types';
 export declare function mapHydrateResponseData({ data }: HydrateResponse): SelectedOptionsMap;
 export declare function mapFieldValuesToFilterOptions({ data, siteUrl, }: FieldValuesResponse & {
     siteUrl?: string;

package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -4,7 +4,6 @@ import { SelectedOptionsMap } from '../basic-filters/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
 export declare const DEFAULT_JQL_QUERY = "ORDER BY created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
-export declare const FILTER_SELECTION_DEBOUNCE_MS = 500;
 export interface SearchContainerProps {
     isSearching?: boolean;
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {

package/dist/types-ts4.5/ui/common/modal/popup-select/constants.d.ts

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