@atlaskit/link-datasource 1.27.4 → 1.28.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

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'
@@ -70,6 +73,9 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
   }, 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/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;

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

@@ -108,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);
@@ -120,8 +124,10 @@ 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;
@@ -227,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) {
@@ -416,9 +422,15 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     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

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/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/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';
@@ -68,6 +68,9 @@ const AvatarOptionLabel = ({
   }, 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/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
+})));