@atlaskit/link-datasource 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/link-datasource
 
+## 2.0.3
+
+### Patch Changes
+
+-   [#95350](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/95350)
+    [`74dd827156ba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/74dd827156ba) -
+    Remove usages of showServerActions and showActions and replace with actionOptions
+-   Updated dependencies
+
+## 2.0.2
+
+### Patch Changes
+
+-   [#97698](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97698)
+    [`1c7b378c0d3b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1c7b378c0d3b) -
+    [HOT-108999] We had an incident where the cursor jumps back a character in table headers for any
+    language triggering composition on an empty line.This was fixed in a patch bump of
+    prosemirror-view. https://github.com/ProseMirror/prosemirror-view/compare/1.33.4...1.33.5
+-   [#95809](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/95809)
+    [`45495daadf0a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/45495daadf0a) -
+    Hydrates the last modified basic filter so values are pre-populated on edit mode.
+-   Updated dependencies
+
 ## 2.0.1
 
 ### Patch Changes

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

@@ -15,7 +15,6 @@ var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/error"));
 var _popup = _interopRequireDefault(require("@atlaskit/popup"));
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
-var _types = require("../../types");
 var _messages = require("./messages");
 var _PopupComponent = require("./PopupComponent");
 var _styled = require("./styled");
@@ -25,95 +24,83 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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 lastModifiedValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
+var dateRangeValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
 var defaultOptionValue = 'anyTime';
 var DateRangePicker = exports.DateRangePicker = function DateRangePicker(_ref) {
   var onSelectionChange = _ref.onSelectionChange,
     selection = _ref.selection;
-  var _useState = (0, _react.useState)(selection === null || selection === void 0 ? void 0 : selection.value),
+  var _ref2 = selection || {},
+    selectedValue = _ref2.value,
+    fromDate = _ref2.from,
+    toDate = _ref2.to;
+  var todayDate = new Date().toISOString();
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    locale = _useIntl.locale,
+    formatMessage = _useIntl.formatMessage,
+    formatDate = _useIntl.formatDate;
+  var _useState = (0, _react.useState)(selectedValue),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     currentOption = _useState2[0],
     setCurrentOption = _useState2[1];
-  var _useState3 = (0, _react.useState)((0, _utils.getInvalidDateRange)(selection === null || selection === void 0 ? void 0 : selection.from, selection === null || selection === void 0 ? void 0 : selection.to)),
+  var _useState3 = (0, _react.useState)(fromDate),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    invalidDateRange = _useState4[0],
-    setInvalidDateRange = _useState4[1];
-  var customFromDate = (0, _react.useRef)(selection === null || selection === void 0 ? void 0 : selection.from);
-  var customToDate = (0, _react.useRef)(selection === null || selection === void 0 ? void 0 : selection.to);
-  var _useState5 = (0, _react.useState)(false),
+    customFromDate = _useState4[0],
+    setCustomFromDate = _useState4[1];
+  var _useState5 = (0, _react.useState)(toDate),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    isPickerOpen = _useState6[0],
-    setIsPickerOpen = _useState6[1];
-  var _useIntl = (0, _reactIntlNext.useIntl)(),
-    locale = _useIntl.locale,
-    formatMessage = _useIntl.formatMessage,
-    formatDate = _useIntl.formatDate;
-  var isCustomSelected = currentOption === 'custom' || (selection === null || selection === void 0 ? void 0 : selection.value) === 'custom';
-  var maxDate = new Date().toISOString();
-  (0, _react.useEffect)(function () {
-    if (isPickerOpen) {
-      customFromDate.current = selection === null || selection === void 0 ? void 0 : selection.from;
-      customToDate.current = selection === null || selection === void 0 ? void 0 : selection.to;
-    }
-  }, [isPickerOpen, selection === null || selection === void 0 ? void 0 : selection.from, selection === null || selection === void 0 ? void 0 : selection.to]);
-  var handleFromOnChange = function handleFromOnChange(date) {
-    customFromDate.current = date;
-    setInvalidDateRange((0, _utils.getInvalidDateRange)(customFromDate.current, customToDate.current));
-  };
-  var handleToOnChange = function handleToOnChange(date) {
-    customToDate.current = date;
-    setInvalidDateRange((0, _utils.getInvalidDateRange)(customFromDate.current, customToDate.current));
-  };
+    customToDate = _useState6[0],
+    setCustomToDate = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    isPickerOpen = _useState8[0],
+    setIsPickerOpen = _useState8[1];
+  var isCustomSelected = currentOption === 'custom';
+  var invalidDateRange = (0, _utils.useInvalidDateRange)(customFromDate, customToDate);
   var handleClickUpdateDateRange = function handleClickUpdateDateRange() {
-    var label = 'custom';
-    if (customFromDate.current && !customToDate.current) {
-      label = customFromDate.current;
-    } else if (customToDate.current && !customFromDate.current) {
-      label = customToDate.current;
-    }
-    onSelectionChange(_types.CLOLBasicFilters.lastModified, {
-      optionType: 'dateRange',
-      label: label,
+    onSelectionChange({
       value: 'custom',
-      from: customFromDate.current,
-      to: customToDate.current
+      from: customFromDate,
+      to: customToDate
     });
     setIsPickerOpen(false);
   };
   var handleClickFilterOption = (0, _react.useCallback)(function (option) {
     setCurrentOption(option);
-    onSelectionChange(_types.CLOLBasicFilters.lastModified, {
-      optionType: 'dateRange',
-      label: option,
+    onSelectionChange({
       value: option
     });
     if (option !== 'custom') {
       setIsPickerOpen(false);
     }
   }, [onSelectionChange]);
-  var handleTogglePopup = (0, _react.useCallback)(function () {
-    // If users click out of popup, we let selection prop define the current option when opened again until user sets state
-    setCurrentOption(undefined);
-    setIsPickerOpen(!isPickerOpen);
-  }, [isPickerOpen]);
+  var handlePickerToggle = function handlePickerToggle() {
+    if (isPickerOpen) {
+      setCustomToDate(toDate);
+      setCustomFromDate(fromDate);
+      setIsPickerOpen(false);
+      return;
+    }
+    setIsPickerOpen(true);
+    return;
+  };
   return /*#__PURE__*/_react.default.createElement(_popup.default, {
     isOpen: isPickerOpen,
-    onClose: handleTogglePopup,
+    onClose: handlePickerToggle,
     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.CustomDropdown, null, dateRangeValues.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: selection !== null && selection !== void 0 && selection.value ? option === selection.value : option === defaultOptionValue,
+          isSelected: selectedValue ? option === selectedValue : option === defaultOptionValue,
           onClick: function onClick() {
             return handleClickFilterOption(option);
           }
         }, (0, _utils.getDropdownLabel)(option, formatMessage));
       }), isPickerOpen && isCustomSelected && /*#__PURE__*/_react.default.createElement(_styled.CustomDateWrapper, null, /*#__PURE__*/_react.default.createElement(_styled.DatePickersWrapper, null, /*#__PURE__*/_react.default.createElement(_datetimePicker.DatePicker, {
-        maxDate: maxDate,
+        maxDate: todayDate,
         innerProps: {
           style: {
             width: 140
@@ -121,8 +108,11 @@ var DateRangePicker = exports.DateRangePicker = function DateRangePicker(_ref) {
         },
         testId: "date-from-picker",
         dateFormat: "D MMM YYYY",
-        onChange: handleFromOnChange,
-        defaultValue: selection === null || selection === void 0 ? void 0 : selection.from,
+        onChange: setCustomFromDate,
+        onDelete: function onDelete() {
+          return setCustomFromDate(undefined);
+        },
+        defaultValue: fromDate,
         placeholder: formatMessage(_messages.dateRangeMessages.dateRangeFrom),
         isInvalid: Boolean(invalidDateRange),
         locale: locale,
@@ -136,7 +126,7 @@ var DateRangePicker = exports.DateRangePicker = function DateRangePicker(_ref) {
           }
         }
       }), /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeToLabel), /*#__PURE__*/_react.default.createElement(_datetimePicker.DatePicker, {
-        maxDate: maxDate,
+        maxDate: todayDate,
         innerProps: {
           style: {
             width: 140
@@ -144,8 +134,11 @@ var DateRangePicker = exports.DateRangePicker = function DateRangePicker(_ref) {
         },
         testId: "date-to-picker",
         dateFormat: "D MMM YYYY",
-        onChange: handleToOnChange,
-        defaultValue: selection === null || selection === void 0 ? void 0 : selection.to,
+        onChange: setCustomToDate,
+        onDelete: function onDelete() {
+          return setCustomToDate(undefined);
+        },
+        defaultValue: toDate,
         placeholder: formatMessage(_messages.dateRangeMessages.dateRangeTo),
         isInvalid: Boolean(invalidDateRange),
         locale: locale,
@@ -170,12 +163,14 @@ var DateRangePicker = exports.DateRangePicker = function DateRangePicker(_ref) {
     },
     placement: "bottom-start",
     trigger: function trigger(triggerProps) {
+      var labelText = (0, _utils.getCurrentOptionLabel)(formatDate, formatMessage, selectedValue, toDate, fromDate);
+      var isSelected = !!selectedValue || isPickerOpen;
       return /*#__PURE__*/_react.default.createElement(_trigger.PopupTrigger, {
         triggerProps: triggerProps,
-        isSelected: !!(selection !== null && selection !== void 0 && selection.value) || isPickerOpen,
+        isSelected: isSelected,
         labelPrefix: formatMessage(_messages.dateRangeMessages.dateRangeTitle),
-        selectedLabel: (0, _utils.getCurrentOptionLabel)(formatDate, formatMessage, selection),
-        onClick: handleTogglePopup
+        selectedLabel: labelText,
+        onClick: handlePickerToggle
       });
     }
   });

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

@@ -13,7 +13,7 @@ var PopupComponentContainer = exports.PopupComponentContainer = _styled.default.
   display: 'block',
   flex: '1 1 auto',
   overflow: 'visible',
-  borderRadius: "var(--ds-border-radius-200, 3px)",
+  borderRadius: "var(--ds-border-radius-100, 4px)",
   background: "var(--ds-background-input, ".concat(_colors.N0, ")"),
   ':focus': {
     outline: 'none'
@@ -23,7 +23,7 @@ var PopupComponentContainer = exports.PopupComponentContainer = _styled.default.
 var CustomDropdown = exports.CustomDropdown = _styled.default.div({
   width: '340px',
   background: "var(--ds-background-input, ".concat(_colors.N0, ")"),
-  borderRadius: "var(--ds-border-radius-200, 3px)",
+  borderRadius: "var(--ds-border-radius-100, 4px)",
   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: _constants.layers.modal()
 });
@@ -62,7 +62,7 @@ var SelectDateRangeButton = exports.SelectDateRangeButton = _styled.default.butt
   width: '70px',
   height: '40px',
   marginTop: "var(--ds-space-150, 12px)",
-  borderRadius: "var(--ds-border-radius-200, 3px)",
+  borderRadius: "var(--ds-border-radius-100, 4px)",
   '&:hover': {
     background: "var(--ds-background-accent-gray-subtler, ".concat(_colors.N30, ")"),
     cursor: 'pointer'
@@ -71,7 +71,7 @@ var SelectDateRangeButton = exports.SelectDateRangeButton = _styled.default.butt
 var DateRangeErrorMessage = exports.DateRangeErrorMessage = _styled.default.div({
   display: 'flex',
   lineHeight: 1.3333,
-  marginTop: "var(--ds-space-050, 4px)",
-  fontSize: '12px',
+  marginTop: "var(--ds-space-050, 2px)",
+  fontSize: "var(--ds-font-size-075, 12px)",
   color: "var(--ds-text-danger, ".concat(_colors.R400, ")")
 });

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

@@ -1,14 +1,16 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getInvalidDateRange = exports.getDropdownLabel = exports.getCurrentOptionLabel = void 0;
-var _react = _interopRequireDefault(require("react"));
+exports.useInvalidDateRange = exports.getDropdownLabel = exports.getCurrentOptionLabel = void 0;
+var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _dateTime = require("../../../../../ui/issue-like-table/render-type/date-time");
 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 getDropdownLabel = exports.getDropdownLabel = function getDropdownLabel() {
   var option = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'anyTime';
   var formatMessage = arguments.length > 1 ? arguments[1] : undefined;
@@ -23,13 +25,13 @@ var getDropdownLabel = exports.getDropdownLabel = function getDropdownLabel() {
   };
   return formatMessage(_messages.dateRangeMessages[mapping[option]]);
 };
-var getCurrentOptionLabel = exports.getCurrentOptionLabel = function getCurrentOptionLabel(formatDate, formatMessage, selection) {
-  var selectedOption = selection === null || selection === void 0 ? void 0 : selection.value;
+var getCurrentOptionLabel = exports.getCurrentOptionLabel = function getCurrentOptionLabel(formatDate, formatMessage, value, to, from) {
+  var selectedOption = value;
   if (selectedOption === 'custom') {
-    var hasFromDate = !!(selection !== null && selection !== void 0 && selection.from);
-    var hasToDate = !!(selection !== null && selection !== void 0 && selection.to);
-    var formattedFromDate = (0, _dateTime.getFormattedDate)((selection === null || selection === void 0 ? void 0 : selection.from) || '', 'date', formatDate);
-    var formattedToDate = (0, _dateTime.getFormattedDate)((selection === null || selection === void 0 ? void 0 : selection.to) || '', 'date', formatDate);
+    var hasFromDate = !!from;
+    var hasToDate = !!to;
+    var formattedFromDate = (0, _dateTime.getFormattedDate)(from || '', 'date', formatDate);
+    var formattedToDate = (0, _dateTime.getFormattedDate)(to || '', 'date', formatDate);
     if (hasFromDate && !hasToDate) {
       return formatMessage(_messages.dateRangeMessages.dateRangeAfterLabel, {
         date: formattedFromDate
@@ -46,21 +48,23 @@ var getCurrentOptionLabel = exports.getCurrentOptionLabel = function getCurrentO
   }
   return getDropdownLabel(selectedOption, formatMessage);
 };
-var getInvalidDateRange = exports.getInvalidDateRange = function getInvalidDateRange(from, to) {
-  if (!from && !to) {
+var useInvalidDateRange = exports.useInvalidDateRange = function useInvalidDateRange(from, to) {
+  return (0, _react.useMemo)(function () {
+    if (!from && !to) {
+      return null;
+    }
+    var dateFrom = new Date("".concat(from).concat(from ? 'T00:00:00' : ''));
+    var dateTo = new Date("".concat(to).concat(to ? 'T00:00:00' : ''));
+    var now = new Date();
+    if (dateFrom > now) {
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeCustomInvalidDateAfterToday);
+    }
+    if (dateFrom > dateTo) {
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeCustomInvalidDateAfterEnd);
+    }
+    if (dateTo > now) {
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeCustomInvalidToDateAfterToday);
+    }
     return null;
-  }
-  var dateFrom = new Date("".concat(from).concat(from ? 'T00:00:00' : ''));
-  var dateTo = new Date("".concat(to).concat(to ? 'T00:00:00' : ''));
-  var now = new Date();
-  if (dateFrom > now) {
-    return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeCustomInvalidDateAfterToday);
-  }
-  if (dateFrom > dateTo) {
-    return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeCustomInvalidDateAfterEnd);
-  }
-  if (dateTo > now) {
-    return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.dateRangeMessages.dateRangeCustomInvalidToDateAfterToday);
-  }
-  return null;
+  }, [from, to]);
 };

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

@@ -71,9 +71,14 @@ var useBasicFilterHydration = exports.useBasicFilterHydration = function useBasi
       return _ref.apply(this, arguments);
     };
   }(), [getUsersFromAccountIDs]);
+  var reset = (0, _react.useCallback)(function () {
+    setStatus('empty');
+    setUsers([]);
+  }, []);
   return {
     hydrateUsersFromAccountIds: hydrateUsersFromAccountIds,
     status: status,
-    users: users
+    users: users,
+    reset: reset
   };
 };

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

@@ -5,11 +5,15 @@ 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 = _interopRequireDefault(require("react"));
 var _primitives = require("@atlaskit/primitives");
 var _dateRangePicker = require("./filters/date-range-picker");
 var _editedOrCreatedBy = _interopRequireDefault(require("./filters/edited-or-created-by"));
+var _types = require("./types");
+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 basicFilterContainerStyles = (0, _primitives.xcss)({
   paddingLeft: 'space.100'
 });
@@ -25,8 +29,11 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
     _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
     lastModifiedValue = _ref3[0];
   var lastModifiedSelection = (lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.optionType) === 'dateRange' ? lastModifiedValue : undefined;
-  var onDateRangePickerChange = function onDateRangePickerChange(filterType, updatedOption) {
-    onChange(filterType, [updatedOption]);
+  var onDateRangePickerChange = function onDateRangePickerChange(updatedOption) {
+    onChange(_types.CLOLBasicFilters.lastModified, _objectSpread({
+      optionType: 'dateRange',
+      label: updatedOption.value
+    }, updatedOption));
   };
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,

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

@@ -16,7 +16,6 @@ var _basicSearchInput = require("../../common/modal/basic-search-input");
 var _constants = require("../../common/modal/popup-select/constants");
 var _basicFilters = _interopRequireDefault(require("../basic-filters"));
 var _useBasicFilterHydration = require("../basic-filters/hooks/useBasicFilterHydration");
-var _types = require("../basic-filters/types");
 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; }
@@ -26,24 +25,43 @@ var basicSearchInputContainerStyles = (0, _primitives.xcss)({
   flexGrow: 1
 });
 var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
-  var cloudId = _ref.cloudId,
-    initialSearchValue = _ref.initialSearchValue,
-    initialFilterSelection = _ref.initialFilterSelection,
+  var _ref$parameters = _ref.parameters,
+    cloudId = _ref$parameters.cloudId,
+    initialSearchValue = _ref$parameters.searchString,
+    lastModified = _ref$parameters.lastModified,
+    lastModifiedFrom = _ref$parameters.lastModifiedFrom,
+    lastModifiedTo = _ref$parameters.lastModifiedTo,
+    contributorAccountIds = _ref$parameters.contributorAccountIds,
     isSearching = _ref.isSearching,
     onSearch = _ref.onSearch;
   var _useBasicFilterHydrat = (0, _useBasicFilterHydration.useBasicFilterHydration)(),
     hydrateUsersFromAccountIds = _useBasicFilterHydrat.hydrateUsersFromAccountIds,
     users = _useBasicFilterHydrat.users,
-    status = _useBasicFilterHydrat.status;
+    status = _useBasicFilterHydrat.status,
+    resetHydrationHook = _useBasicFilterHydrat.reset;
   var currentCloudId = (0, _react.useRef)(cloudId);
-  var _useState = (0, _react.useState)(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : ''),
+  var _useState = (0, _react.useState)(contributorAccountIds !== null && contributorAccountIds !== void 0 ? contributorAccountIds : []),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    searchBarSearchString = _useState2[0],
-    setSearchBarSearchString = _useState2[1];
-  var _useState3 = (0, _react.useState)({}),
+    initialContributorAccountIds = _useState2[0],
+    setInitialContributorAccountIds = _useState2[1];
+  var _useState3 = (0, _react.useState)(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : ''),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    filterSelections = _useState4[0],
-    setFilterSelections = _useState4[1];
+    searchBarSearchString = _useState4[0],
+    setSearchBarSearchString = _useState4[1];
+  var _useState5 = (0, _react.useState)(function () {
+      return lastModified ? {
+        lastModified: [{
+          optionType: 'dateRange',
+          label: lastModified,
+          value: lastModified,
+          from: lastModifiedFrom,
+          to: lastModifiedTo
+        }]
+      } : {};
+    }),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    filterSelections = _useState6[0],
+    setFilterSelections = _useState6[1];
   var handleSearchChange = (0, _react.useCallback)(function (e) {
     var rawSearch = e.currentTarget.value;
     setSearchBarSearchString(rawSearch);
@@ -54,7 +72,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
   var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterType, options) {
-    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, (0, _defineProperty2.default)({}, filterType, options));
+    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, (0, _defineProperty2.default)({}, filterType, Array.isArray(options) ? options : [options]));
     setFilterSelections(updatedSelection);
     debouncedBasicFilterSelectionChange(updatedSelection);
   }, [debouncedBasicFilterSelectionChange, filterSelections]);
@@ -63,11 +81,13 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6827913
   (0, _react.useEffect)(function () {
     if (currentCloudId.current !== cloudId) {
+      setInitialContributorAccountIds([]);
+      resetHydrationHook();
       setSearchBarSearchString('');
       setFilterSelections({});
       currentCloudId.current = cloudId;
     }
-  }, [cloudId]);
+  }, [cloudId, resetHydrationHook]);
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
@@ -75,19 +95,19 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     return false;
   }, []);
   (0, _react.useEffect)(function () {
-    var accountIds = initialFilterSelection === null || initialFilterSelection === void 0 ? void 0 : initialFilterSelection[_types.CLOLBasicFilters.editedOrCreatedBy];
-    var hasAccountIds = accountIds && accountIds.length > 0;
+    var hasAccountIds = (initialContributorAccountIds === null || initialContributorAccountIds === void 0 ? void 0 : initialContributorAccountIds.length) > 0;
     if (hasAccountIds && status === 'empty' && showBasicFilters) {
-      hydrateUsersFromAccountIds(accountIds);
+      hydrateUsersFromAccountIds(initialContributorAccountIds);
     }
-  }, [hydrateUsersFromAccountIds, initialFilterSelection, showBasicFilters, status]);
+  }, [hydrateUsersFromAccountIds, initialContributorAccountIds, showBasicFilters, status]);
   (0, _react.useEffect)(function () {
     if (status === 'resolved') {
       setFilterSelections({
+        lastModified: filterSelections.lastModified,
         editedOrCreatedBy: users
       });
     }
-  }, [users, status]);
+  }, [users, status, filterSelections.lastModified]);
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     alignItems: "center",
     xcss: basicSearchInputContainerStyles

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

@@ -125,28 +125,16 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   var searchCount = (0, _react.useRef)(0);
   var userInteractionActions = (0, _react.useRef)(new Set());
   var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
-
-  // TODO: further refactoring in EDM-9573
-  // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   var parameters = (0, _react.useMemo)(function () {
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialParameters), {}, {
-      cloudId: cloudId,
-      searchString: searchString
-    }, ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified) || (lastModified === null || lastModified === void 0 ? void 0 : lastModified.value)) && {
-      lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value
-    }), ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedFrom) || (lastModified === null || lastModified === void 0 ? void 0 : lastModified.from)) && {
-      lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from
-    }), ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedTo) || (lastModified === null || lastModified === void 0 ? void 0 : lastModified.to)) && {
-      lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to
-    }), ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0) && {
-      contributorAccountIds: contributorAccountIds
+    return _objectSpread(_objectSpread({}, initialParameters), {}, {
+      cloudId: cloudId || '',
+      searchString: searchString,
+      lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
+      lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
+      lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
+      contributorAccountIds: (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0 ? contributorAccountIds : undefined
     });
   }, [initialParameters, cloudId, searchString, lastModified, contributorAccountIds]);
-  var initialFilterSelection = (0, _react.useMemo)(function () {
-    return {
-      editedOrCreatedBy: (initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []
-    };
-  }, [initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds]);
   var isParametersSet = (0, _react.useMemo)(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -468,9 +456,9 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
     if (filters) {
       var editedOrCreatedBy = filters.editedOrCreatedBy,
-        _lastModified = filters.lastModified;
-      if (_lastModified) {
-        var updatedDateRangeOption = _lastModified.find(function (range) {
+        lastModifiedList = filters.lastModified;
+      if (lastModifiedList) {
+        var updatedDateRangeOption = lastModifiedList.find(function (range) {
           return range.value;
         });
         if ((updatedDateRangeOption === null || updatedDateRangeOption === void 0 ? void 0 : updatedDateRangeOption.optionType) === 'dateRange') {
@@ -522,11 +510,9 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   })), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoConfluenceSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_primitives.Box, {
     xcss: inputContainerStyles
   }, (0, _react2.jsx)(_confluenceSearchContainer.default, {
-    cloudId: cloudId,
     isSearching: status === 'loading',
     onSearch: onSearch,
-    initialSearchValue: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString,
-    initialFilterSelection: initialFilterSelection
+    parameters: parameters
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
     title: _messages.confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: _messages.confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,

package/dist/cjs/ui/issue-like-table/render-type/link/index.js

@@ -37,8 +37,7 @@ var LinkRenderType = function LinkRenderType(_ref) {
   }, [style]);
   var anchor = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react.default.createElement(_hoverCard.HoverCard, {
-      url: url,
-      showServerActions: true
+      url: url
     }, /*#__PURE__*/_react.default.createElement(_linkUrl.default, {
       href: url,
       style: _objectSpread(_objectSpread({}, linkStyle), {}, {