@atlaskit/link-datasource 1.27.3 → 1.28.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.28.0
+
+### Minor Changes
+
+- [#90515](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/90515) [`cc097687c554`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cc097687c554) - [ux] Add Powered by Assets Label to the Assets LOL
+
+## 1.27.4
+
+### Patch Changes
+
+- [#91584](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91584) [`4d0c2f61a927`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d0c2f61a927) - The changes here updates the testIds in the common filter component along with some code refactoring
+
 ## 1.27.3
 
 ### Patch Changes

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

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

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

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

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

@@ -1,15 +1,18 @@
 "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 = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
 var _peopleGroup = _interopRequireDefault(require("@atlaskit/icon/glyph/people-group"));
 var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
 var _primitives = require("@atlaskit/primitives");
+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 commonLabelStyles = (0, _primitives.xcss)({
   overflow: 'hidden',
   textOverflow: 'ellipsis'
@@ -36,14 +39,14 @@ var IconOptionLabel = function IconOptionLabel(_ref) {
   };
   return /*#__PURE__*/_react.default.createElement(AvatarOptionLabel, {
     data: avatarOptionLabelData,
-    testId: "jlol-basic-filter-popup-select-option--icon-label"
+    testId: "basic-filter-popup-select-option--icon-label"
   });
 };
 var LozengeOptionLabel = function LozengeOptionLabel(_ref2) {
   var data = _ref2.data;
   return /*#__PURE__*/_react.default.createElement(_lozenge.default, {
     appearance: data.appearance,
-    testId: "jlol-basic-filter-popup-select-option--lozenge"
+    testId: "basic-filter-popup-select-option--lozenge"
   }, /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     xcss: [commonLabelStyles]
   }, data.label));
@@ -53,7 +56,7 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
     testId = _ref3.testId;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     alignItems: "center",
-    testId: testId || 'jlol-basic-filter-popup-select-option--avatar'
+    testId: testId || 'basic-filter-popup-select-option--avatar'
   }, data.isGroup ? /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     alignItems: "center",
     justifyContent: "center",
@@ -66,11 +69,13 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
     src: data.avatar,
     size: "xsmall"
   }), /*#__PURE__*/_react.default.createElement(_primitives.Box, {
-    xcss: [commonLabelStyles, avatarOptionLabelStyles],
-    testId: "nidhin"
+    xcss: [commonLabelStyles, avatarOptionLabelStyles]
   }, data.label));
 };
 var formatOptionLabel = function formatOptionLabel(data) {
+  if (data.optionType === 'defaultOption') {
+    return /*#__PURE__*/_react.default.createElement(_react.Fragment, null);
+  }
   if (data.optionType === 'lozengeLabel') {
     return /*#__PURE__*/_react.default.createElement(LozengeOptionLabel, {
       data: data

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PopupComponent = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireWildcard(require("react"));
+var _styled = require("./styled");
+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 PopupComponent = exports.PopupComponent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  return /*#__PURE__*/_react.default.createElement(_styled.PopupComponentContainer, (0, _extends2.default)({}, props, {
+    "data-testId": 'confluence-search-datasource-popup-container',
+    ref: ref
+  }));
+});

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

@@ -0,0 +1,89 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DateRangePicker = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _popup = _interopRequireDefault(require("@atlaskit/popup"));
+var _constants = require("@atlaskit/theme/constants");
+var _types = require("../../types");
+var _messages = require("./messages");
+var _PopupComponent = require("./PopupComponent");
+var _styled = require("./styled");
+var _trigger = require("./trigger");
+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 lastModifiedValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
+var defaultOptionValue = 'anyTime';
+var filterName = _types.CLOLBasicFilters.lastModified;
+var DateRangePicker = exports.DateRangePicker = function DateRangePicker(_ref) {
+  var onSelectionChange = _ref.onSelectionChange;
+  var _useState = (0, _react.useState)(null),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    currentOption = _useState2[0],
+    setCurrentOption = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isPickerOpen = _useState4[0],
+    setIsPickerOpen = _useState4[1];
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var onClickFilterOption = (0, _react.useCallback)(function (option) {
+    setCurrentOption(option);
+    setIsPickerOpen(false);
+    onSelectionChange(filterName, [{
+      optionType: 'defaultOption',
+      label: option,
+      value: option
+    }]);
+  }, [onSelectionChange]);
+  var handleTogglePopup = (0, _react.useCallback)(function () {
+    setIsPickerOpen(!isPickerOpen);
+  }, [isPickerOpen]);
+  return /*#__PURE__*/_react.default.createElement(_popup.default, {
+    isOpen: isPickerOpen,
+    onClose: handleTogglePopup,
+    popupComponent: _PopupComponent.PopupComponent,
+    zIndex: _constants.layers.modal(),
+    content: function content() {
+      return /*#__PURE__*/_react.default.createElement(_styled.CustomDropdown, null, lastModifiedValues.map(function (option) {
+        return /*#__PURE__*/_react.default.createElement(_styled.CustomDropdownItem, {
+          key: option
+          //want to show Anytime as selected if none of the other options are selected
+          ,
+          isSelected: currentOption ? option === currentOption : option === defaultOptionValue,
+          onClick: function onClick() {
+            return onClickFilterOption(option);
+          }
+        }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, getCurrentOptionLabel(option)));
+      }));
+    },
+    placement: "bottom-start",
+    trigger: function trigger(triggerProps) {
+      return /*#__PURE__*/_react.default.createElement(_trigger.PopupTrigger, {
+        triggerProps: triggerProps,
+        optionSelected: !!currentOption,
+        label: formatMessage(_messages.dateRangeMessages.dateRangeTitle),
+        selectedLabel: formatMessage(getCurrentOptionLabel(currentOption)),
+        onClickButton: handleTogglePopup
+      });
+    }
+  });
+};
+var getCurrentOptionLabel = function getCurrentOptionLabel(option) {
+  var mapping = {
+    anyTime: 'dateRangeAnyTime',
+    today: 'dateRangeToday',
+    yesterday: 'dateRangeYesterday',
+    past7Days: 'dateRangeLastWeek',
+    past30Days: 'dateRangeLastMonth',
+    pastYear: 'dateRangeLastYear',
+    custom: 'dateRangeCustom'
+  };
+  return option ? _messages.dateRangeMessages[mapping[option]] : _messages.dateRangeMessages[mapping['anyTime']];
+};

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

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.dateRangeMessages = void 0;
+var _reactIntlNext = require("react-intl-next");
+var dateRangeMessages = exports.dateRangeMessages = (0, _reactIntlNext.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'
+  }
+});

package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/styled.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SelectDateRangeButton = exports.PopupComponentContainer = exports.DateRangeErrorMessage = exports.DatePickersWrapper = exports.CustomDropdownItem = exports.CustomDropdown = exports.CustomDateWrapper = void 0;
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _colors = require("@atlaskit/theme/colors");
+var PopupComponentContainer = exports.PopupComponentContainer = _styled.default.div({
+  boxSizing: 'border-box',
+  display: 'block',
+  flex: '1 1 auto',
+  overflow: 'visible',
+  background: "var(--ds-background-input, ".concat(_colors.N0, ")"),
+  ':focus': {
+    outline: 'none'
+  },
+  boxShadow: "var(--ds-shadow-overlay, 0px 0px 1px 0px rgba(9, 30, 66, 0.31), 0px 3px 5px 0px rgba(9, 30, 66, 0.20))"
+});
+var CustomDropdown = exports.CustomDropdown = _styled.default.div({
+  width: '360px',
+  background: "var(--ds-background-input, ".concat(_colors.N0, ")"),
+  borderRadius: '3px',
+  boxShadow: "var(--ds-shadow-overlay, 0px 0px 1px 0px rgba(9, 30, 66, 0.31), 0px 3px 5px 0px rgba(9, 30, 66, 0.20))",
+  zIndex: '900'
+});
+var CustomDropdownItem = exports.CustomDropdownItem = _styled.default.div(function (props) {
+  return {
+    height: '36px',
+    width: '100%',
+    display: 'flex',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    paddingLeft: props.isSelected ? '15px' : '16px',
+    boxSizing: 'border-box',
+    color: props.isSelected ? "var(--ds-text-selected, ".concat(_colors.B400, ")") : 'inherit',
+    background: props.isSelected ? "var(--ds-background-accent-blue-subtlest, ".concat(_colors.B50, ")") : 'transparent',
+    borderLeft: props.isSelected ? "2px solid ".concat("var(--ds-text-selected, ".concat(_colors.B400, ")")) : 'none',
+    '&:hover': {
+      background: props.isSelected ? "var(--ds-background-accent-blue-subtlest, ".concat(_colors.B50, ")") : "var(--ds-background-input-hovered, ".concat(_colors.N20, ")"),
+      cursor: 'default'
+    }
+  };
+});
+var CustomDateWrapper = exports.CustomDateWrapper = _styled.default.div({
+  padding: "var(--ds-space-150, 12px)",
+  boxSizing: 'border-box'
+});
+var DatePickersWrapper = exports.DatePickersWrapper = _styled.default.div({
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  width: '100%'
+});
+var SelectDateRangeButton = exports.SelectDateRangeButton = _styled.default.button({
+  background: "var(--ds-background-accent-gray-subtler, ".concat(_colors.N20, ")"),
+  border: 'none',
+  font: 'inherit',
+  width: '70px',
+  height: '40px',
+  marginTop: "var(--ds-space-150, 12px)",
+  borderRadius: '3px',
+  '&:hover': {
+    background: "var(--ds-background-accent-gray-subtler, ".concat(_colors.N30, ")"),
+    cursor: 'pointer'
+  }
+});
+var DateRangeErrorMessage = exports.DateRangeErrorMessage = _styled.default.div({
+  display: 'flex',
+  lineHeight: 1.3333,
+  marginTop: "var(--ds-space-050, 4px)",
+  fontSize: '12px',
+  color: "var(--ds-text-danger, ".concat(_colors.R400, ")")
+});

package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PopupTrigger = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireDefault(require("react"));
+var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
+var PopupTrigger = exports.PopupTrigger = function PopupTrigger(_ref) {
+  var triggerProps = _ref.triggerProps,
+    optionSelected = _ref.optionSelected,
+    label = _ref.label,
+    selectedLabel = _ref.selectedLabel,
+    onClickButton = _ref.onClickButton;
+  return /*#__PURE__*/_react.default.createElement(_standardButton.default, (0, _extends2.default)({}, triggerProps, {
+    testId: 'confluence-search-modal--date-range-button',
+    onClick: onClickButton,
+    isSelected: optionSelected,
+    iconAfter: /*#__PURE__*/_react.default.createElement("span", {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/_react.default.createElement(_chevronDown.default, {
+      size: "medium",
+      label: ""
+    }))
+  }), label, selectedLabel ? ": ".concat(selectedLabel) : '');
+};

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

@@ -5,18 +5,20 @@ 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 _dateRangePicker = require("./filters/date-range-picker");
 var basicFilterContainerStyles = (0, _primitives.xcss)({
   paddingLeft: 'space.100'
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
-  (0, _objectDestructuringEmpty2.default)(_ref);
+  var onChange = _ref.onChange;
   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));
+  }, /*#__PURE__*/_react.default.createElement(_dateRangePicker.DateRangePicker, {
+    onSelectionChange: onChange
+  }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
 };
 var _default = exports.default = BasicFilterContainer;

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

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CLOLBasicFilters = void 0;
+var CLOLBasicFilters = exports.CLOLBasicFilters = /*#__PURE__*/function (CLOLBasicFilters) {
+  CLOLBasicFilters["editedOrCreatedBy"] = "editedOrCreatedBy";
+  CLOLBasicFilters["lastModified"] = "lastModified";
+  return CLOLBasicFilters;
+}({});

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -15,6 +16,8 @@ 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; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var basicSearchInputContainerStyles = (0, _primitives.xcss)({
   flexGrow: 1
 });
@@ -28,6 +31,10 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     searchBarSearchString = _useState2[0],
     setSearchBarSearchString = _useState2[1];
+  var _useState3 = (0, _react.useState)({}),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    filterSelections = _useState4[0],
+    setFilterSelections = _useState4[1];
   var handleSearchChange = (0, _react.useCallback)(function (e) {
     var rawSearch = e.currentTarget.value;
     setSearchBarSearchString(rawSearch);
@@ -41,6 +48,12 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
       currentCloudId.current = cloudId;
     }
   }, [cloudId]);
+  var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterType, options) {
+    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, (0, _defineProperty2.default)({}, filterType, options));
+    setFilterSelections(updatedSelection);
+    //TODO: move to debounce fn in https://product-fabric.atlassian.net/browse/EDM-9485
+    onSearch(searchBarSearchString, updatedSelection);
+  }, [filterSelections, onSearch, searchBarSearchString]);
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
@@ -58,6 +71,8 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     searchTerm: searchBarSearchString,
     placeholder: _messages.searchMessages.searchLabel,
     fullWidth: !showBasicFilters
-  }), showBasicFilters && /*#__PURE__*/_react.default.createElement(_basicFilters.default, null));
+  }), showBasicFilters && /*#__PURE__*/_react.default.createElement(_basicFilters.default, {
+    onChange: handleBasicFilterSelectionChange
+  }));
 };
 var _default = exports.default = ConfluenceSearchContainer;