@atlaskit/link-datasource 1.27.3 → 1.28.0

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

@@ -84,7 +84,10 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     viewMode = _props$viewMode === void 0 ? 'table' : _props$viewMode,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
-    initialVisibleColumnKeys = props.visibleColumnKeys;
+    initialVisibleColumnKeys = props.visibleColumnKeys,
+    _props$disableDisplay = props.disableDisplayDropdown,
+    disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
+    overrideParameters = props.overrideParameters;
   var _useState = (0, _react.useState)(undefined),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     availableSites = _useState2[0],
@@ -105,6 +108,10 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
     visibleColumnKeys = _useState10[0],
     setVisibleColumnKeys = _useState10[1];
+  var _useState11 = (0, _react.useState)(),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    lastModified = _useState12[0],
+    setLastModified = _useState12[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
@@ -117,16 +124,24 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     return _objectSpread(_objectSpread({}, initialParameters), {}, {
       cloudId: cloudId,
       searchString: searchString
+    }, lastModified && {
+      lastModified: lastModified
     });
-  }, [cloudId, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  }, [cloudId, lastModified, initialParameters, searchString /** Add more parameters when more filters are added */]);
   var isParametersSet = (0, _react.useMemo)(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
     }).length > 1;
   }, [cloudId, parameters]);
+  var parametersToSend = (0, _react.useMemo)(function () {
+    if (!isParametersSet) {
+      return undefined;
+    }
+    return _objectSpread(_objectSpread({}, parameters), overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
+  }, [parameters, overrideParameters, isParametersSet]);
   var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
       datasourceId: datasourceId,
-      parameters: isParametersSet ? parameters : undefined,
+      parameters: parametersToSend,
       fieldKeys: visibleColumnKeys
     }),
     reset = _useDatasourceTableSt.reset,
@@ -218,17 +233,17 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages.confluenceSearchModalMessages.insertIssuesTitleManySites : _messages.confluenceSearchModalMessages.insertIssuesTitle;
-  var _useState11 = (0, _react.useState)(initialColumnCustomSizes),
-    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    columnCustomSizes = _useState12[0],
-    setColumnCustomSizes = _useState12[1];
+  var _useState13 = (0, _react.useState)(initialColumnCustomSizes),
+    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+    columnCustomSizes = _useState14[0],
+    setColumnCustomSizes = _useState14[1];
   var onColumnResize = (0, _react.useCallback)(function (key, width) {
     setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, (0, _defineProperty2.default)({}, key, width)));
   }, [columnCustomSizes]);
-  var _useState13 = (0, _react.useState)(initialWrappedColumnKeys),
-    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    wrappedColumnKeys = _useState14[0],
-    setWrappedColumnKeys = _useState14[1];
+  var _useState15 = (0, _react.useState)(initialWrappedColumnKeys),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    wrappedColumnKeys = _useState16[0],
+    setWrappedColumnKeys = _useState16[1];
   var onWrappedColumnChange = (0, _react.useCallback)(function (key, isWrapped) {
     var set = new Set(wrappedColumnKeys);
     if (isWrapped) {
@@ -381,7 +396,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: _objectSpread(_objectSpread({}, parameters), {}, {
+        parameters: _objectSpread(_objectSpread({}, parametersToSend), {}, {
           cloudId: cloudId
         }),
         views: [{
@@ -402,14 +417,20 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
         }]
       }, confluenceSearchUrl), consumerEvent);
     }
-  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parametersToSend, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var handleViewModeChange = function handleViewModeChange(selectedMode) {
     userInteractionActions.current.add(_types.DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
   };
-  var onSearch = (0, _react.useCallback)(function (newSearchString) {
+  var onSearch = (0, _react.useCallback)(function (newSearchString, filters) {
     searchCount.current++;
     userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
+    if (filters !== null && filters !== void 0 && filters.lastModified) {
+      var lastModifiedValue = filters.lastModified.find(function (range) {
+        return range.value;
+      });
+      setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+    }
     setSearchString(newSearchString);
     reset({
       shouldForceRequest: true
@@ -438,7 +459,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     selectedSite: selectedConfluenceSite,
     testId: "confluence-search-datasource-modal--site-selector",
     label: siteSelectorLabel
-  })), !hasNoConfluenceSites && (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
+  })), !hasNoConfluenceSites && !disableDisplayDropdown && (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
     onViewModeChange: handleViewModeChange,
     viewMode: currentViewMode
   })), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoConfluenceSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_primitives.Box, {

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -178,6 +178,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
     testId: "datasource-table-view-skeleton",
     isCompact: true
   }), (0, _react2.jsx)(_tableFooter.TableFooter, {
+    datasourceId: datasourceId,
     itemCount: isDataReady ? totalCount : undefined,
     onRefresh: onRefresh,
     isLoading: !isDataReady || status === 'loading',

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

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

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

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraSearchContainer = exports.FILTER_SELECTION_DEBOUNCE_MS = exports.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
+exports.JiraSearchContainer = exports.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -18,6 +18,7 @@ var _primitives = require("@atlaskit/primitives");
 var _analytics = require("../../../analytics");
 var _basicSearchInput = require("../../common/modal/basic-search-input");
 var _messages = require("../../common/modal/basic-search-input/messages");
+var _constants = require("../../common/modal/popup-select/constants");
 var _basicFilters = require("../basic-filters");
 var _useHydrateJqlQuery2 = require("../basic-filters/hooks/useHydrateJqlQuery");
 var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
@@ -40,7 +41,6 @@ var basicSearchInputContainerStyles = (0, _primitives.xcss)({
 });
 var DEFAULT_JQL_QUERY = exports.DEFAULT_JQL_QUERY = 'ORDER BY created DESC';
 var ALLOWED_ORDER_BY_KEYS = exports.ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
-var FILTER_SELECTION_DEBOUNCE_MS = exports.FILTER_SELECTION_DEBOUNCE_MS = 500;
 var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,
@@ -178,7 +178,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         basicFilterSelections: filterSelections,
         isQueryComplex: isCurrentQueryComplex
       });
-    }, FILTER_SELECTION_DEBOUNCE_MS),
+    }, _constants.FILTER_SELECTION_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
   var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterType, options) {

package/dist/cjs/ui/table-footer/index.js

@@ -14,9 +14,12 @@ var _reactIntlNext = require("react-intl-next");
 var _button = _interopRequireDefault(require("@atlaskit/button"));
 var _heading = _interopRequireDefault(require("@atlaskit/heading"));
 var _refresh = _interopRequireDefault(require("@atlaskit/icon/glyph/refresh"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
+var _assetsModal = require("../assets-modal");
 var _messages = require("./messages");
+var _poweredByJsmAssets = require("./powered-by-jsm-assets");
 var _syncInfo = require("./sync-info");
 /** @jsx jsx */
 
@@ -49,7 +52,8 @@ var SyncTextWrapper = _styled.default.div({
   fontSize: '12px'
 });
 var TableFooter = exports.TableFooter = function TableFooter(_ref) {
-  var itemCount = _ref.itemCount,
+  var datasourceId = _ref.datasourceId,
+    itemCount = _ref.itemCount,
     onRefresh = _ref.onRefresh,
     isLoading = _ref.isLoading,
     url = _ref.url;
@@ -88,7 +92,9 @@ var TableFooter = exports.TableFooter = function TableFooter(_ref) {
     values: {
       itemCount: itemCount
     }
-  }))))), (0, _react2.jsx)(SyncWrapper, null, onRefresh && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(SyncTextWrapper, {
+  }))))), (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_objects_add_jsm_promotional_tag') && datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? (0, _react2.jsx)(_poweredByJsmAssets.PoweredByJSMAssets, {
+    text: intl.formatMessage(_messages.footerMessages.powerByJSM)
+  }) : null, (0, _react2.jsx)(SyncWrapper, null, onRefresh && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.footerMessages.loadingText) : (0, _react2.jsx)(_syncInfo.SyncInfo, {
     lastSyncTime: lastSyncTime

package/dist/cjs/ui/table-footer/messages.js

@@ -20,5 +20,10 @@ var footerMessages = exports.footerMessages = (0, _reactIntlNext.defineMessages)
     id: 'linkDataSource.table-footer.refresh',
     description: 'Label for refresh icon',
     defaultMessage: 'Refresh'
+  },
+  powerByJSM: {
+    id: 'linkDataSource.table-footer.power-by-jsm',
+    description: 'Displayed on the issue like table footer to increase JSM Assets visibility',
+    defaultMessage: 'Powered by Assets in Jira Service Management'
   }
 });

package/dist/cjs/ui/table-footer/powered-by-jsm-assets/index.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PoweredByJSMAssets = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _logo = require("@atlaskit/logo");
+var _primitives = require("@atlaskit/primitives");
+var _analytics = require("../../../analytics");
+var jsmTextStyles = (0, _primitives.xcss)({
+  fontSize: 'small',
+  color: 'color.text.subtle',
+  marginLeft: "var(--ds-space-075, 6px)",
+  ':hover': {
+    color: 'color.link.pressed'
+  }
+});
+var jsmContainerStyles = (0, _primitives.xcss)({
+  display: 'flex',
+  flexDirection: 'row-reverse'
+});
+var PoweredByJSMAssets = exports.PoweredByJSMAssets = function PoweredByJSMAssets(props) {
+  var ASSETS_LINK = '/jira/servicedesk/assets';
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    xcss: jsmContainerStyles,
+    padding: "space.150"
+  }, /*#__PURE__*/_react.default.createElement("a", {
+    "data-testid": 'powered-by-jsm-assets-link',
+    onClick: function onClick() {
+      return fireEvent('ui.link.clicked.poweredBy', {
+        componentHierarchy: 'datasourceTable',
+        extensionKey: 'jsm-cmdb-gateway'
+      });
+    },
+    href: ASSETS_LINK,
+    rel: "noreferrer",
+    target: "_blank",
+    style: {
+      display: 'inline-flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_logo.JiraServiceManagementIcon, {
+    size: "xsmall",
+    appearance: "brand",
+    label: props.text
+  }), /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    xcss: jsmTextStyles
+  }, props.text)));
+};

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

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

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

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

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import Avatar from '@atlaskit/avatar';
 import PeopleGroupIcon from '@atlaskit/icon/glyph/people-group';
 import Lozenge from '@atlaskit/lozenge';
@@ -32,7 +32,7 @@ const IconOptionLabel = ({
   };
   return /*#__PURE__*/React.createElement(AvatarOptionLabel, {
     data: avatarOptionLabelData,
-    testId: "jlol-basic-filter-popup-select-option--icon-label"
+    testId: "basic-filter-popup-select-option--icon-label"
   });
 };
 const LozengeOptionLabel = ({
@@ -40,7 +40,7 @@ const LozengeOptionLabel = ({
 }) => {
   return /*#__PURE__*/React.createElement(Lozenge, {
     appearance: data.appearance,
-    testId: "jlol-basic-filter-popup-select-option--lozenge"
+    testId: "basic-filter-popup-select-option--lozenge"
   }, /*#__PURE__*/React.createElement(Box, {
     xcss: [commonLabelStyles]
   }, data.label));
@@ -51,7 +51,7 @@ const AvatarOptionLabel = ({
 }) => {
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
-    testId: testId || 'jlol-basic-filter-popup-select-option--avatar'
+    testId: testId || 'basic-filter-popup-select-option--avatar'
   }, data.isGroup ? /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     justifyContent: "center",
@@ -64,11 +64,13 @@ const AvatarOptionLabel = ({
     src: data.avatar,
     size: "xsmall"
   }), /*#__PURE__*/React.createElement(Box, {
-    xcss: [commonLabelStyles, avatarOptionLabelStyles],
-    testId: "nidhin"
+    xcss: [commonLabelStyles, avatarOptionLabelStyles]
   }, data.label));
 };
 const formatOptionLabel = data => {
+  if (data.optionType === 'defaultOption') {
+    return /*#__PURE__*/React.createElement(Fragment, null);
+  }
   if (data.optionType === 'lozengeLabel') {
     return /*#__PURE__*/React.createElement(LozengeOptionLabel, {
       data: data

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

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

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

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

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

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

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

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

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

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

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

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

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.js

@@ -0,0 +1,7 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { forwardRef } from 'react';
+import { PopupComponentContainer } from './styled';
+export const PopupComponent = /*#__PURE__*/forwardRef((props, ref) => /*#__PURE__*/React.createElement(PopupComponentContainer, _extends({}, props, {
+  "data-testId": 'confluence-search-datasource-popup-container',
+  ref: ref
+})));

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.js

@@ -0,0 +1,68 @@
+import React, { useCallback, useState } from 'react';
+import { FormattedMessage, useIntl } from 'react-intl-next';
+import Popup from '@atlaskit/popup';
+import { layers } from '@atlaskit/theme/constants';
+import { CLOLBasicFilters } from '../../types';
+import { dateRangeMessages } from './messages';
+import { PopupComponent } from './PopupComponent';
+import { CustomDropdown, CustomDropdownItem } from './styled';
+import { PopupTrigger } from './trigger';
+const lastModifiedValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
+const defaultOptionValue = 'anyTime';
+const filterName = CLOLBasicFilters.lastModified;
+export const DateRangePicker = ({
+  onSelectionChange
+}) => {
+  const [currentOption, setCurrentOption] = useState(null);
+  const [isPickerOpen, setIsPickerOpen] = useState(false);
+  const {
+    formatMessage
+  } = useIntl();
+  const onClickFilterOption = useCallback(option => {
+    setCurrentOption(option);
+    setIsPickerOpen(false);
+    onSelectionChange(filterName, [{
+      optionType: 'defaultOption',
+      label: option,
+      value: option
+    }]);
+  }, [onSelectionChange]);
+  const handleTogglePopup = useCallback(() => {
+    setIsPickerOpen(!isPickerOpen);
+  }, [isPickerOpen]);
+  return /*#__PURE__*/React.createElement(Popup, {
+    isOpen: isPickerOpen,
+    onClose: handleTogglePopup,
+    popupComponent: PopupComponent,
+    zIndex: layers.modal(),
+    content: () => {
+      return /*#__PURE__*/React.createElement(CustomDropdown, null, lastModifiedValues.map(option => /*#__PURE__*/React.createElement(CustomDropdownItem, {
+        key: option
+        //want to show Anytime as selected if none of the other options are selected
+        ,
+        isSelected: currentOption ? option === currentOption : option === defaultOptionValue,
+        onClick: () => onClickFilterOption(option)
+      }, /*#__PURE__*/React.createElement(FormattedMessage, getCurrentOptionLabel(option)))));
+    },
+    placement: "bottom-start",
+    trigger: triggerProps => /*#__PURE__*/React.createElement(PopupTrigger, {
+      triggerProps: triggerProps,
+      optionSelected: !!currentOption,
+      label: formatMessage(dateRangeMessages.dateRangeTitle),
+      selectedLabel: formatMessage(getCurrentOptionLabel(currentOption)),
+      onClickButton: handleTogglePopup
+    })
+  });
+};
+const getCurrentOptionLabel = option => {
+  const mapping = {
+    anyTime: 'dateRangeAnyTime',
+    today: 'dateRangeToday',
+    yesterday: 'dateRangeYesterday',
+    past7Days: 'dateRangeLastWeek',
+    past30Days: 'dateRangeLastMonth',
+    pastYear: 'dateRangeLastYear',
+    custom: 'dateRangeCustom'
+  };
+  return option ? dateRangeMessages[mapping[option]] : dateRangeMessages[mapping['anyTime']];
+};

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/messages.js

@@ -0,0 +1,43 @@
+import { defineMessages } from 'react-intl-next';
+export const dateRangeMessages = defineMessages({
+  dateRangeTitle: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.title',
+    defaultMessage: 'Last updated',
+    description: 'Filter by the date content was modified'
+  },
+  dateRangeAnyTime: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.any.time',
+    defaultMessage: 'Anytime',
+    description: 'Option to show content from any time'
+  },
+  dateRangeToday: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.today',
+    defaultMessage: 'Today',
+    description: 'Date range of content modified today'
+  },
+  dateRangeYesterday: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.yesterday',
+    defaultMessage: 'Yesterday',
+    description: 'Date range of content modified yesterday'
+  },
+  dateRangeLastWeek: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.last.week',
+    defaultMessage: 'Past 7 days',
+    description: 'Date range of content modified in the last 7 days'
+  },
+  dateRangeLastMonth: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.last.month',
+    defaultMessage: 'Past 30 days',
+    description: 'Date range of content modified in the last 30 days'
+  },
+  dateRangeLastYear: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.last.year',
+    defaultMessage: 'Past year',
+    description: 'Date range of content modified in the last 365 days'
+  },
+  dateRangeCustom: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.custom',
+    defaultMessage: 'Custom',
+    description: 'Custom date range'
+  }
+});