@atlaskit/link-datasource 2.0.1 → 2.0.3

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

@@ -2,108 +2,95 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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) { _defineProperty(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; }
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import { DatePicker } from '@atlaskit/datetime-picker';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
 import Popup from '@atlaskit/popup';
 import { R400 } from '@atlaskit/theme/colors';
 import { layers } from '@atlaskit/theme/constants';
-import { CLOLBasicFilters } from '../../types';
 import { dateRangeMessages } from './messages';
 import { PopupComponent } from './PopupComponent';
 import { CustomDateWrapper, CustomDropdown, CustomDropdownItem, DatePickersWrapper, DateRangeErrorMessage, SelectDateRangeButton } from './styled';
 import { PopupTrigger } from './trigger';
-import { getCurrentOptionLabel, getDropdownLabel, getInvalidDateRange } from './utils';
-var lastModifiedValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
+import { getCurrentOptionLabel, getDropdownLabel, useInvalidDateRange } from './utils';
+var dateRangeValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
 var defaultOptionValue = 'anyTime';
 export var DateRangePicker = function DateRangePicker(_ref) {
   var onSelectionChange = _ref.onSelectionChange,
     selection = _ref.selection;
-  var _useState = 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 = useIntl(),
+    locale = _useIntl.locale,
+    formatMessage = _useIntl.formatMessage,
+    formatDate = _useIntl.formatDate;
+  var _useState = useState(selectedValue),
     _useState2 = _slicedToArray(_useState, 2),
     currentOption = _useState2[0],
     setCurrentOption = _useState2[1];
-  var _useState3 = useState(getInvalidDateRange(selection === null || selection === void 0 ? void 0 : selection.from, selection === null || selection === void 0 ? void 0 : selection.to)),
+  var _useState3 = useState(fromDate),
     _useState4 = _slicedToArray(_useState3, 2),
-    invalidDateRange = _useState4[0],
-    setInvalidDateRange = _useState4[1];
-  var customFromDate = useRef(selection === null || selection === void 0 ? void 0 : selection.from);
-  var customToDate = useRef(selection === null || selection === void 0 ? void 0 : selection.to);
-  var _useState5 = useState(false),
+    customFromDate = _useState4[0],
+    setCustomFromDate = _useState4[1];
+  var _useState5 = useState(toDate),
     _useState6 = _slicedToArray(_useState5, 2),
-    isPickerOpen = _useState6[0],
-    setIsPickerOpen = _useState6[1];
-  var _useIntl = 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();
-  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(getInvalidDateRange(customFromDate.current, customToDate.current));
-  };
-  var handleToOnChange = function handleToOnChange(date) {
-    customToDate.current = date;
-    setInvalidDateRange(getInvalidDateRange(customFromDate.current, customToDate.current));
-  };
+    customToDate = _useState6[0],
+    setCustomToDate = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isPickerOpen = _useState8[0],
+    setIsPickerOpen = _useState8[1];
+  var isCustomSelected = currentOption === 'custom';
+  var invalidDateRange = 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(CLOLBasicFilters.lastModified, {
-      optionType: 'dateRange',
-      label: label,
+    onSelectionChange({
       value: 'custom',
-      from: customFromDate.current,
-      to: customToDate.current
+      from: customFromDate,
+      to: customToDate
     });
     setIsPickerOpen(false);
   };
   var handleClickFilterOption = useCallback(function (option) {
     setCurrentOption(option);
-    onSelectionChange(CLOLBasicFilters.lastModified, {
-      optionType: 'dateRange',
-      label: option,
+    onSelectionChange({
       value: option
     });
     if (option !== 'custom') {
       setIsPickerOpen(false);
     }
   }, [onSelectionChange]);
-  var handleTogglePopup = 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.createElement(Popup, {
     isOpen: isPickerOpen,
-    onClose: handleTogglePopup,
+    onClose: handlePickerToggle,
     popupComponent: PopupComponent,
     zIndex: layers.modal(),
     content: function content() {
-      return /*#__PURE__*/React.createElement(CustomDropdown, null, lastModifiedValues.map(function (option) {
+      return /*#__PURE__*/React.createElement(CustomDropdown, null, dateRangeValues.map(function (option) {
         return /*#__PURE__*/React.createElement(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);
           }
         }, getDropdownLabel(option, formatMessage));
       }), isPickerOpen && isCustomSelected && /*#__PURE__*/React.createElement(CustomDateWrapper, null, /*#__PURE__*/React.createElement(DatePickersWrapper, null, /*#__PURE__*/React.createElement(DatePicker, {
-        maxDate: maxDate,
+        maxDate: todayDate,
         innerProps: {
           style: {
             width: 140
@@ -111,8 +98,11 @@ export var 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(dateRangeMessages.dateRangeFrom),
         isInvalid: Boolean(invalidDateRange),
         locale: locale,
@@ -126,7 +116,7 @@ export var DateRangePicker = function DateRangePicker(_ref) {
           }
         }
       }), /*#__PURE__*/React.createElement(FormattedMessage, dateRangeMessages.dateRangeToLabel), /*#__PURE__*/React.createElement(DatePicker, {
-        maxDate: maxDate,
+        maxDate: todayDate,
         innerProps: {
           style: {
             width: 140
@@ -134,8 +124,11 @@ export var 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(dateRangeMessages.dateRangeTo),
         isInvalid: Boolean(invalidDateRange),
         locale: locale,
@@ -160,12 +153,14 @@ export var DateRangePicker = function DateRangePicker(_ref) {
     },
     placement: "bottom-start",
     trigger: function trigger(triggerProps) {
+      var labelText = getCurrentOptionLabel(formatDate, formatMessage, selectedValue, toDate, fromDate);
+      var isSelected = !!selectedValue || isPickerOpen;
       return /*#__PURE__*/React.createElement(PopupTrigger, {
         triggerProps: triggerProps,
-        isSelected: !!(selection !== null && selection !== void 0 && selection.value) || isPickerOpen,
+        isSelected: isSelected,
         labelPrefix: formatMessage(dateRangeMessages.dateRangeTitle),
-        selectedLabel: getCurrentOptionLabel(formatDate, formatMessage, selection),
-        onClick: handleTogglePopup
+        selectedLabel: labelText,
+        onClick: handlePickerToggle
       });
     }
   });

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

@@ -6,7 +6,7 @@ export var PopupComponentContainer = styled.div({
   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(N0, ")"),
   ':focus': {
     outline: 'none'
@@ -16,7 +16,7 @@ export var PopupComponentContainer = styled.div({
 export var CustomDropdown = styled.div({
   width: '340px',
   background: "var(--ds-background-input, ".concat(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: layers.modal()
 });
@@ -55,7 +55,7 @@ export var SelectDateRangeButton = styled.button({
   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(N30, ")"),
     cursor: 'pointer'
@@ -64,7 +64,7 @@ export var SelectDateRangeButton = styled.button({
 export var DateRangeErrorMessage = styled.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(R400, ")")
 });

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import { getFormattedDate } from '../../../../../ui/issue-like-table/render-type/date-time';
 import { dateRangeMessages } from './messages';
@@ -16,13 +16,13 @@ export var getDropdownLabel = function getDropdownLabel() {
   };
   return formatMessage(dateRangeMessages[mapping[option]]);
 };
-export var getCurrentOptionLabel = function getCurrentOptionLabel(formatDate, formatMessage, selection) {
-  var selectedOption = selection === null || selection === void 0 ? void 0 : selection.value;
+export var 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 = getFormattedDate((selection === null || selection === void 0 ? void 0 : selection.from) || '', 'date', formatDate);
-    var formattedToDate = getFormattedDate((selection === null || selection === void 0 ? void 0 : selection.to) || '', 'date', formatDate);
+    var hasFromDate = !!from;
+    var hasToDate = !!to;
+    var formattedFromDate = getFormattedDate(from || '', 'date', formatDate);
+    var formattedToDate = getFormattedDate(to || '', 'date', formatDate);
     if (hasFromDate && !hasToDate) {
       return formatMessage(dateRangeMessages.dateRangeAfterLabel, {
         date: formattedFromDate
@@ -39,21 +39,23 @@ export var getCurrentOptionLabel = function getCurrentOptionLabel(formatDate, fo
   }
   return getDropdownLabel(selectedOption, formatMessage);
 };
-export var getInvalidDateRange = function getInvalidDateRange(from, to) {
-  if (!from && !to) {
+export var useInvalidDateRange = function useInvalidDateRange(from, to) {
+  return 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.createElement(FormattedMessage, dateRangeMessages.dateRangeCustomInvalidDateAfterToday);
+    }
+    if (dateFrom > dateTo) {
+      return /*#__PURE__*/React.createElement(FormattedMessage, dateRangeMessages.dateRangeCustomInvalidDateAfterEnd);
+    }
+    if (dateTo > now) {
+      return /*#__PURE__*/React.createElement(FormattedMessage, 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.createElement(FormattedMessage, dateRangeMessages.dateRangeCustomInvalidDateAfterToday);
-  }
-  if (dateFrom > dateTo) {
-    return /*#__PURE__*/React.createElement(FormattedMessage, dateRangeMessages.dateRangeCustomInvalidDateAfterEnd);
-  }
-  if (dateTo > now) {
-    return /*#__PURE__*/React.createElement(FormattedMessage, dateRangeMessages.dateRangeCustomInvalidToDateAfterToday);
-  }
-  return null;
+  }, [from, to]);
 };

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

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

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

@@ -1,8 +1,12 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+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) { _defineProperty(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; }
 import React from 'react';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { DateRangePicker } from './filters/date-range-picker';
 import EditedOrCreatedByFilter from './filters/edited-or-created-by';
+import { CLOLBasicFilters } from './types';
 var basicFilterContainerStyles = xcss({
   paddingLeft: 'space.100'
 });
@@ -18,8 +22,11 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
     _ref3 = _slicedToArray(_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(CLOLBasicFilters.lastModified, _objectSpread({
+      optionType: 'dateRange',
+      label: updatedOption.value
+    }, updatedOption));
   };
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,

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

@@ -10,30 +10,48 @@ import { BasicSearchInput } from '../../common/modal/basic-search-input';
 import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
 import BasicFilters from '../basic-filters';
 import { useBasicFilterHydration } from '../basic-filters/hooks/useBasicFilterHydration';
-import { CLOLBasicFilters } from '../basic-filters/types';
 import { searchMessages } from './messages';
 var basicSearchInputContainerStyles = 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 = useBasicFilterHydration(),
     hydrateUsersFromAccountIds = _useBasicFilterHydrat.hydrateUsersFromAccountIds,
     users = _useBasicFilterHydrat.users,
-    status = _useBasicFilterHydrat.status;
+    status = _useBasicFilterHydrat.status,
+    resetHydrationHook = _useBasicFilterHydrat.reset;
   var currentCloudId = useRef(cloudId);
-  var _useState = useState(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : ''),
+  var _useState = useState(contributorAccountIds !== null && contributorAccountIds !== void 0 ? contributorAccountIds : []),
     _useState2 = _slicedToArray(_useState, 2),
-    searchBarSearchString = _useState2[0],
-    setSearchBarSearchString = _useState2[1];
-  var _useState3 = useState({}),
+    initialContributorAccountIds = _useState2[0],
+    setInitialContributorAccountIds = _useState2[1];
+  var _useState3 = useState(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : ''),
     _useState4 = _slicedToArray(_useState3, 2),
-    filterSelections = _useState4[0],
-    setFilterSelections = _useState4[1];
+    searchBarSearchString = _useState4[0],
+    setSearchBarSearchString = _useState4[1];
+  var _useState5 = useState(function () {
+      return lastModified ? {
+        lastModified: [{
+          optionType: 'dateRange',
+          label: lastModified,
+          value: lastModified,
+          from: lastModifiedFrom,
+          to: lastModifiedTo
+        }]
+      } : {};
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    filterSelections = _useState6[0],
+    setFilterSelections = _useState6[1];
   var handleSearchChange = useCallback(function (e) {
     var rawSearch = e.currentTarget.value;
     setSearchBarSearchString(rawSearch);
@@ -44,7 +62,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
     debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
   var handleBasicFilterSelectionChange = useCallback(function (filterType, options) {
-    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, _defineProperty({}, filterType, options));
+    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, _defineProperty({}, filterType, Array.isArray(options) ? options : [options]));
     setFilterSelections(updatedSelection);
     debouncedBasicFilterSelectionChange(updatedSelection);
   }, [debouncedBasicFilterSelectionChange, filterSelections]);
@@ -53,11 +71,13 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6827913
   useEffect(function () {
     if (currentCloudId.current !== cloudId) {
+      setInitialContributorAccountIds([]);
+      resetHydrationHook();
       setSearchBarSearchString('');
       setFilterSelections({});
       currentCloudId.current = cloudId;
     }
-  }, [cloudId]);
+  }, [cloudId, resetHydrationHook]);
   var showBasicFilters = useMemo(function () {
     if (getBooleanFF('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
@@ -65,19 +85,19 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     return false;
   }, []);
   useEffect(function () {
-    var accountIds = initialFilterSelection === null || initialFilterSelection === void 0 ? void 0 : initialFilterSelection[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]);
   useEffect(function () {
     if (status === 'resolved') {
       setFilterSelections({
+        lastModified: filterSelections.lastModified,
         editedOrCreatedBy: users
       });
     }
-  }, [users, status]);
+  }, [users, status, filterSelections.lastModified]);
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     xcss: basicSearchInputContainerStyles

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

@@ -116,28 +116,16 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   var searchCount = useRef(0);
   var userInteractionActions = useRef(new Set());
   var visibleColumnCount = 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 = 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 = useMemo(function () {
-    return {
-      editedOrCreatedBy: (initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []
-    };
-  }, [initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds]);
   var isParametersSet = useMemo(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -459,9 +447,9 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     userInteractionActions.current.add(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') {
@@ -513,11 +501,9 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   })), jsx(ModalBody, null, !hasNoConfluenceSites ? jsx(Fragment, null, jsx(Box, {
     xcss: inputContainerStyles
   }, jsx(ConfluenceSearchContainer, {
-    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()) : jsx(NoInstancesView, {
     title: confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,

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

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

package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { type DateRangeOption } from '../../../../common/modal/popup-select/types';
-import { CLOLBasicFilters } from '../../types';
+export type DateRangeSelection = Pick<DateRangeOption, 'value' | 'from' | 'to'>;
 interface DateRangeProps {
-    onSelectionChange: (filterType: CLOLBasicFilters, options: DateRangeOption) => void;
-    selection?: DateRangeOption;
+    onSelectionChange: (options: DateRangeSelection) => void;
+    selection?: DateRangeSelection;
 }
 export declare const DateRangePicker: ({ onSelectionChange, selection, }: DateRangeProps) => JSX.Element;
 export {};

package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { type IntlShape } from 'react-intl-next';
-import { type DateRangeOption, type DateRangeType } from '../../../../common/modal/popup-select/types';
+import { type DateRangeType } from '../../../../common/modal/popup-select/types';
 export declare const getDropdownLabel: (option: DateRangeType | undefined, formatMessage: IntlShape['formatMessage']) => string;
-export declare const getCurrentOptionLabel: (formatDate: IntlShape['formatDate'], formatMessage: IntlShape['formatMessage'], selection?: DateRangeOption) => string;
-export declare const getInvalidDateRange: (from: string | undefined, to: string | undefined) => JSX.Element | null;
+export declare const getCurrentOptionLabel: (formatDate: IntlShape['formatDate'], formatMessage: IntlShape['formatMessage'], value?: DateRangeType, to?: string, from?: string) => string;
+export declare const useInvalidDateRange: (from?: string, to?: string) => JSX.Element | null;

package/dist/types/ui/confluence-search-modal/basic-filters/hooks/useBasicFilterHydration.d.ts

@@ -1,6 +1,7 @@
-import { CommonBasicFilterHookState, SelectOption } from '../../../common/modal/popup-select/types';
+import { type CommonBasicFilterHookState, type SelectOption } from '../../../common/modal/popup-select/types';
 export interface BasicFilterHydrationState extends Omit<CommonBasicFilterHookState, 'errors'> {
     hydrateUsersFromAccountIds: (accountIds: string[]) => void;
     users: SelectOption[];
+    reset: () => void;
 }
 export declare const useBasicFilterHydration: () => BasicFilterHydrationState;

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

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { type SelectOption } from '../../common/modal/popup-select/types';
-import { type CLOLBasicFilters, type SelectedOptionsMap } from './types';
+import { CLOLBasicFilters, type SelectedOptionsMap } from './types';
 export interface BasicFilterContainerProps {
     cloudId?: string;
     selections: SelectedOptionsMap;
-    onChange: (filterType: CLOLBasicFilters, options: SelectOption[]) => void;
+    onChange: (filterType: CLOLBasicFilters, options: SelectOption | SelectOption[]) => void;
     isHydrating?: boolean;
 }
 declare const BasicFilterContainer: ({ cloudId, onChange, selections, isHydrating, }: BasicFilterContainerProps) => JSX.Element;

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

@@ -1,14 +1,10 @@
 /// <reference types="react" />
-import { CLOLBasicFilters, type SelectedOptionsMap } from '../basic-filters/types';
-export type FilterInitialSelectionMap = {
-    [CLOLBasicFilters.editedOrCreatedBy]?: string[];
-};
+import { type SelectedOptionsMap } from '../basic-filters/types';
+import { type ConfluenceSearchDatasourceParameters } from '../types';
 interface Props {
-    cloudId?: string;
-    initialSearchValue?: string;
-    initialFilterSelection?: FilterInitialSelectionMap;
+    parameters: ConfluenceSearchDatasourceParameters;
     isSearching: boolean;
     onSearch: (searchTerm: string, filters?: SelectedOptionsMap) => void;
 }
-declare const ConfluenceSearchContainer: ({ cloudId, initialSearchValue, initialFilterSelection, isSearching, onSearch, }: Props) => JSX.Element;
+declare const ConfluenceSearchContainer: ({ parameters: { cloudId, searchString: initialSearchValue, lastModified, lastModifiedFrom, lastModifiedTo, contributorAccountIds, }, isSearching, onSearch, }: Props) => JSX.Element;
 export default ConfluenceSearchContainer;

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { type DateRangeOption } from '../../../../common/modal/popup-select/types';
-import { CLOLBasicFilters } from '../../types';
+export type DateRangeSelection = Pick<DateRangeOption, 'value' | 'from' | 'to'>;
 interface DateRangeProps {
-    onSelectionChange: (filterType: CLOLBasicFilters, options: DateRangeOption) => void;
-    selection?: DateRangeOption;
+    onSelectionChange: (options: DateRangeSelection) => void;
+    selection?: DateRangeSelection;
 }
 export declare const DateRangePicker: ({ onSelectionChange, selection, }: DateRangeProps) => JSX.Element;
 export {};

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { type IntlShape } from 'react-intl-next';
-import { type DateRangeOption, type DateRangeType } from '../../../../common/modal/popup-select/types';
+import { type DateRangeType } from '../../../../common/modal/popup-select/types';
 export declare const getDropdownLabel: (option: DateRangeType | undefined, formatMessage: IntlShape['formatMessage']) => string;
-export declare const getCurrentOptionLabel: (formatDate: IntlShape['formatDate'], formatMessage: IntlShape['formatMessage'], selection?: DateRangeOption) => string;
-export declare const getInvalidDateRange: (from: string | undefined, to: string | undefined) => JSX.Element | null;
+export declare const getCurrentOptionLabel: (formatDate: IntlShape['formatDate'], formatMessage: IntlShape['formatMessage'], value?: DateRangeType, to?: string, from?: string) => string;
+export declare const useInvalidDateRange: (from?: string, to?: string) => JSX.Element | null;