@atlaskit/link-datasource 1.27.4 → 1.28.1

package/dist/es2019/services/utils.js

@@ -117,4 +117,12 @@ export const fieldValuesQuery = `query fieldValues($cloudId: ID!, $first: Int =
       }
     }
   }
+}`;
+export const userQuery = `query userQuery {
+  me {
+    user {
+      id
+      accountId
+    }
+  }
 }`;

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

@@ -78,8 +78,11 @@ const formatOptionLabel = data => {
       data: data
     });
   }
-  return /*#__PURE__*/React.createElement(IconOptionLabel, {
-    data: data
-  });
+  if (data.optionType === 'iconLabel') {
+    return /*#__PURE__*/React.createElement(IconOptionLabel, {
+      data: data
+    });
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
 };
 export default formatOptionLabel;

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

@@ -15,7 +15,7 @@ import PopupTrigger from './trigger';
 const noFilterOptions = () => true;
 export const FilterPopupSelect = ({
   filterName,
-  totalCount,
+  totalCount = 0,
   status,
   buttonLabel,
   showLoading = false,

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

@@ -7,8 +7,7 @@ import { Box, Flex, xcss } from '@atlaskit/primitives';
 import Spinner from '@atlaskit/spinner';
 const triggerButtonLabelStyles = xcss({
   textOverflow: 'ellipsis',
-  overflow: 'hidden',
-  maxWidth: '150px'
+  overflow: 'hidden'
 });
 const badgeStyles = xcss({
   marginLeft: 'space.050'

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

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

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

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

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

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

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

@@ -0,0 +1,66 @@
+import styled from '@emotion/styled';
+import { B400, B50, N0, N20, N30, R400 } from '@atlaskit/theme/colors';
+export const PopupComponentContainer = styled.div({
+  boxSizing: 'border-box',
+  display: 'block',
+  flex: '1 1 auto',
+  overflow: 'visible',
+  background: `var(--ds-background-input, ${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))"
+});
+export const CustomDropdown = styled.div({
+  width: '360px',
+  background: `var(--ds-background-input, ${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'
+});
+export const CustomDropdownItem = styled.div(props => ({
+  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, ${B400})` : 'inherit',
+  background: props.isSelected ? `var(--ds-background-accent-blue-subtlest, ${B50})` : 'transparent',
+  borderLeft: props.isSelected ? `2px solid ${`var(--ds-text-selected, ${B400})`}` : 'none',
+  '&:hover': {
+    background: props.isSelected ? `var(--ds-background-accent-blue-subtlest, ${B50})` : `var(--ds-background-input-hovered, ${N20})`,
+    cursor: 'default'
+  }
+}));
+export const CustomDateWrapper = styled.div({
+  padding: "var(--ds-space-150, 12px)",
+  boxSizing: 'border-box'
+});
+export const DatePickersWrapper = styled.div({
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  width: '100%'
+});
+export const SelectDateRangeButton = styled.button({
+  background: `var(--ds-background-accent-gray-subtler, ${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, ${N30})`,
+    cursor: 'pointer'
+  }
+});
+export const DateRangeErrorMessage = styled.div({
+  display: 'flex',
+  lineHeight: 1.3333,
+  marginTop: "var(--ds-space-050, 4px)",
+  fontSize: '12px',
+  color: `var(--ds-text-danger, ${R400})`
+});

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

@@ -0,0 +1,26 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Button from '@atlaskit/button/standard-button';
+import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
+export const PopupTrigger = ({
+  triggerProps,
+  optionSelected,
+  label,
+  selectedLabel,
+  onClickButton
+}) => {
+  return /*#__PURE__*/React.createElement(Button, _extends({}, triggerProps, {
+    testId: 'confluence-search-modal--date-range-button',
+    onClick: onClickButton,
+    isSelected: optionSelected,
+    iconAfter: /*#__PURE__*/React.createElement("span", {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement(ChevronDownIcon, {
+      size: "medium",
+      label: ""
+    }))
+  }), label, selectedLabel ? `: ${selectedLabel}` : '');
+};

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/edited-or-created-by/index.js

@@ -0,0 +1,82 @@
+import React, { useCallback, useState } from 'react';
+import { useIntl } from 'react-intl-next';
+import { useDebouncedCallback } from 'use-debounce';
+import { FilterPopupSelect } from '../../../../common/modal/popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../../../../common/modal/popup-select/constants';
+import { useCurrentUserInfo } from '../../hooks/useCurrentUserInfo';
+import useRecommendation from '../../hooks/useRecommendation';
+import { CLOLBasicFilters } from '../../types';
+import { editedOrCreatedByMessage } from './messages';
+const filterName = `clol-basic-filter-${CLOLBasicFilters.editedOrCreatedBy}`;
+const EditedOrCreatedByFilter = ({
+  cloudId,
+  onSelectionChange,
+  selection = []
+}) => {
+  const {
+    user
+  } = useCurrentUserInfo();
+  const {
+    formatMessage
+  } = useIntl();
+  const {
+    status,
+    filterOptions,
+    fetchFilterOptions,
+    errors
+  } = useRecommendation();
+  const [searchTerm, setSearchTerm] = useState('');
+  const [handleDebouncedFetchFilterOptions] = useDebouncedCallback(searchTerm => {
+    if (cloudId && user !== null && user !== void 0 && user.accountId) {
+      fetchFilterOptions({
+        searchTerm,
+        cloudId,
+        userId: user.accountId
+      });
+    }
+  }, SEARCH_DEBOUNCE_MS);
+  const handleInputChange = useCallback(async newSearchTerm => {
+    setSearchTerm(newSearchTerm);
+    handleDebouncedFetchFilterOptions(newSearchTerm);
+  }, [handleDebouncedFetchFilterOptions]);
+  const handleOptionSelection = useCallback(newValue => {
+    onSelectionChange(CLOLBasicFilters.editedOrCreatedBy, newValue);
+  }, [onSelectionChange]);
+  const handleMenuOpen = useCallback(() => {
+    if ((status === 'empty' || status === 'rejected') && cloudId && user !== null && user !== void 0 && user.accountId) {
+      // if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown
+      fetchFilterOptions({
+        cloudId,
+        userId: user.accountId,
+        searchTerm
+      });
+    }
+  }, [fetchFilterOptions, status, cloudId, user === null || user === void 0 ? void 0 : user.accountId, searchTerm]);
+  const filterOptionsLength = filterOptions.length;
+  const isError = status === 'rejected';
+  const isLoading = status === 'loading' || status === 'empty';
+  const isEmpty = status === 'resolved' && filterOptionsLength === 0;
+  const isDisabled = !cloudId || !(user !== null && user !== void 0 && user.accountId);
+  return /*#__PURE__*/React.createElement(FilterPopupSelect, {
+    buttonLabel: formatMessage(editedOrCreatedByMessage.buttonLabel),
+    filterName: filterName,
+    isDisabled: isDisabled,
+    options: filterOptions,
+    showLoading: isLoading,
+    selectedOptions: selection,
+    onSelectionChange: handleOptionSelection,
+    onInputChange: handleInputChange,
+    showHydrating: false,
+    shouldShowFooter: false,
+    status: status,
+    onMenuOpen: handleMenuOpen,
+    menuListProps: {
+      filterName: filterName,
+      errors,
+      isLoading,
+      isError,
+      isEmpty
+    }
+  });
+};
+export default EditedOrCreatedByFilter;

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/edited-or-created-by/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export const editedOrCreatedByMessage = defineMessages({
+  buttonLabel: {
+    id: 'linkDataSource.clol-basic-filter.editedOrCreatedBy.label',
+    description: 'Label to be displayed for "Edited or created by" filter dropdown button.',
+    defaultMessage: 'Edited or created by'
+  }
+});

package/dist/es2019/ui/confluence-search-modal/basic-filters/hooks/useCurrentUserInfo.js

@@ -0,0 +1,25 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+export const useCurrentUserInfo = () => {
+  const [user, setUser] = useState();
+  const {
+    getCurrentUserInfo: getCurrentUserInfoFromAGG
+  } = useBasicFilterAGG();
+  const getCurrentUserInfo = useCallback(async () => {
+    var _user$data;
+    const user = await getCurrentUserInfoFromAGG();
+    if (user !== null && user !== void 0 && (_user$data = user.data) !== null && _user$data !== void 0 && _user$data.me.user) {
+      var _user$data2;
+      setUser((_user$data2 = user.data) === null || _user$data2 === void 0 ? void 0 : _user$data2.me.user);
+    } else {
+      setUser(undefined);
+    }
+  }, [getCurrentUserInfoFromAGG]);
+  useEffect(() => {
+    getCurrentUserInfo();
+  }, [getCurrentUserInfo]);
+  return {
+    user,
+    getCurrentUserInfo
+  };
+};

package/dist/es2019/ui/confluence-search-modal/basic-filters/hooks/useRecommendation.js

@@ -0,0 +1,74 @@
+import { useCallback, useRef, useState } from 'react';
+import { useIntl } from 'react-intl-next';
+import { getUserRecommendations } from '@atlaskit/smart-user-picker';
+const useRecommendation = () => {
+  const intl = useIntl();
+  const [filterOptions, setFilterOptions] = useState([]);
+  const [status, setStatus] = useState('empty');
+  const [errors, setErrors] = useState([]);
+  const initialData = useRef();
+  const convertRecommendationsToFilterOptions = recommendations => {
+    return recommendations.map(item => ({
+      optionType: 'avatarLabel',
+      label: item.name,
+      value: item.id,
+      avatar: item.avatarUrl
+    }));
+  };
+  const fetchFilterOptions = useCallback(async ({
+    userId,
+    cloudId,
+    searchTerm
+  }) => {
+    setStatus('loading');
+    const requestParams = {
+      context: {
+        contextType: 'contributors',
+        principalId: userId || '',
+        productAttributes: {
+          isEntitledConfluenceExternalCollaborator: true
+        },
+        productKey: 'confluence',
+        siteId: cloudId
+      },
+      includeGroups: false,
+      includeTeams: false,
+      includeUsers: true,
+      maxNumberOfResults: 10,
+      performSearchQueryOnly: false,
+      query: searchTerm
+    };
+    const {
+      current: initialResponseData
+    } = initialData;
+    const isRequestLikeInitialSearch = !searchTerm;
+    try {
+      const recommendations = isRequestLikeInitialSearch && initialResponseData ? initialResponseData : await getUserRecommendations(requestParams, intl);
+      setFilterOptions(convertRecommendationsToFilterOptions(recommendations));
+      setStatus('resolved');
+      if (!searchTerm) {
+        /**
+         * The initial dataset is used in couple of paths, eg: when a user searches and clears the search text.
+         * During these times, we dont want to fetch data again and again, hence a mini cache setup to store and provide the initial dataset
+         */
+        initialData.current = recommendations;
+      }
+    } catch (error) {
+      setStatus('rejected');
+      setErrors([error]);
+    }
+  }, [intl]);
+  const reset = useCallback(() => {
+    setStatus('empty');
+    setFilterOptions([]);
+    setErrors([]);
+  }, []);
+  return {
+    status,
+    errors,
+    filterOptions,
+    reset,
+    fetchFilterOptions
+  };
+};
+export default useRecommendation;

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

@@ -1,13 +1,28 @@
 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';
 const basicFilterContainerStyles = xcss({
   paddingLeft: 'space.100'
 });
-const BasicFilterContainer = ({}) => {
+const BasicFilterContainer = ({
+  cloudId,
+  onChange,
+  selections = {}
+}) => {
+  const {
+    editedOrCreatedBy
+  } = selections;
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
     testId: "clol-basic-filter-container"
-  }, /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement(React.Fragment, null));
+  }, /*#__PURE__*/React.createElement(EditedOrCreatedByFilter, {
+    cloudId: cloudId,
+    onSelectionChange: onChange,
+    selection: editedOrCreatedBy || []
+  }), /*#__PURE__*/React.createElement(DateRangePicker, {
+    onSelectionChange: onChange
+  }));
 };
 export default BasicFilterContainer;

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

@@ -0,0 +1,5 @@
+export let CLOLBasicFilters = /*#__PURE__*/function (CLOLBasicFilters) {
+  CLOLBasicFilters["editedOrCreatedBy"] = "editedOrCreatedBy";
+  CLOLBasicFilters["lastModified"] = "lastModified";
+  return CLOLBasicFilters;
+}({});

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

@@ -1,7 +1,9 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useDebouncedCallback } from 'use-debounce';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 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 { searchMessages } from './messages';
 const basicSearchInputContainerStyles = xcss({
@@ -15,16 +17,29 @@ const ConfluenceSearchContainer = ({
 }) => {
   const currentCloudId = useRef(cloudId);
   const [searchBarSearchString, setSearchBarSearchString] = useState(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : '');
+  const [filterSelections, setFilterSelections] = useState({});
   const handleSearchChange = useCallback(e => {
     const rawSearch = e.currentTarget.value;
     setSearchBarSearchString(rawSearch);
   }, []);
+  const [debouncedBasicFilterSelectionChange] = useDebouncedCallback(filterValues => {
+    onSearch(searchBarSearchString, filterValues);
+  }, FILTER_SELECTION_DEBOUNCE_MS);
+  const handleBasicFilterSelectionChange = useCallback((filterType, options) => {
+    const updatedSelection = {
+      ...filterSelections,
+      [filterType]: options
+    };
+    setFilterSelections(updatedSelection);
+    debouncedBasicFilterSelectionChange(updatedSelection);
+  }, [debouncedBasicFilterSelectionChange, filterSelections]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6827913
   useEffect(() => {
     if (currentCloudId.current !== cloudId) {
       setSearchBarSearchString('');
+      setFilterSelections({});
       currentCloudId.current = cloudId;
     }
   }, [cloudId]);
@@ -45,6 +60,10 @@ const ConfluenceSearchContainer = ({
     searchTerm: searchBarSearchString,
     placeholder: searchMessages.searchLabel,
     fullWidth: !showBasicFilters
-  }), showBasicFilters && /*#__PURE__*/React.createElement(BasicFilters, null));
+  }), showBasicFilters && /*#__PURE__*/React.createElement(BasicFilters, {
+    cloudId: cloudId,
+    selections: filterSelections,
+    onChange: handleBasicFilterSelectionChange
+  }));
 };
 export default ConfluenceSearchContainer;

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

@@ -78,6 +78,8 @@ export const PlainConfluenceSearchConfigModal = props => {
   const [cloudId, setCloudId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId);
   const [searchString, setSearchString] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString);
   const [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
+  const [lastModified, setLastModified] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified);
+  const [contributorAccountIds, setContributorAccountIds] = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []);
 
   // analytics related parameters
   const searchCount = useRef(0);
@@ -89,8 +91,14 @@ export const PlainConfluenceSearchConfigModal = props => {
   const parameters = useMemo(() => ({
     ...initialParameters,
     cloudId,
-    searchString
-  }), [cloudId, initialParameters, searchString /** Add more parameters when more filters are added */]);
+    searchString,
+    ...(((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified) || lastModified) && {
+      lastModified
+    }),
+    ...(((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0) && {
+      contributorAccountIds
+    })
+  }), [cloudId, lastModified, contributorAccountIds, initialParameters, searchString /** Add more parameters when more filters are added */]);
   const isParametersSet = useMemo(() => !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(v => v !== undefined).length > 1, [cloudId, parameters]);
   const parametersToSend = useMemo(() => {
     if (!isParametersSet) {
@@ -150,6 +158,8 @@ export const PlainConfluenceSearchConfigModal = props => {
   const onSiteSelection = useCallback(site => {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
     setSearchString(undefined);
+    setLastModified(undefined);
+    setContributorAccountIds([]);
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true
@@ -360,9 +370,23 @@ export const PlainConfluenceSearchConfigModal = props => {
     userInteractionActions.current.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
   };
-  const onSearch = useCallback(newSearchString => {
+  const onSearch = useCallback((newSearchString, filters) => {
     searchCount.current++;
     userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
+    if (filters) {
+      const {
+        editedOrCreatedBy,
+        lastModified
+      } = filters;
+      if (lastModified) {
+        const lastModifiedValue = lastModified.find(range => range.value);
+        setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+      }
+      if (editedOrCreatedBy) {
+        const accountIds = editedOrCreatedBy.map(user => user.value);
+        setContributorAccountIds(accountIds);
+      }
+    }
     setSearchString(newSearchString);
     reset({
       shouldForceRequest: true

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

@@ -173,6 +173,7 @@ const DatasourceTableViewWithoutAnalytics = ({
     testId: "datasource-table-view-skeleton",
     isCompact: true
   }), jsx(TableFooter, {
+    datasourceId: datasourceId,
     itemCount: isDataReady ? totalCount : undefined,
     onRefresh: onRefresh,
     isLoading: !isDataReady || status === 'loading',

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

@@ -7,9 +7,12 @@ import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import Heading from '@atlaskit/heading';
 import RefreshIcon from '@atlaskit/icon/glyph/refresh';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N0, N40, N800, N90 } from '@atlaskit/theme/colors';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
 import { footerMessages } from './messages';
+import { PoweredByJSMAssets } from './powered-by-jsm-assets';
 import { SyncInfo } from './sync-info';
 const FooterWrapper = styled.div({
   padding: `${"var(--ds-space-0, 0px)"} ${"var(--ds-space-200, 16px)"}`,
@@ -40,6 +43,7 @@ const SyncTextWrapper = styled.div({
   fontSize: '12px'
 });
 export const TableFooter = ({
+  datasourceId,
   itemCount,
   onRefresh,
   isLoading,
@@ -77,7 +81,9 @@ export const TableFooter = ({
     values: {
       itemCount
     }
-  }))))), jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
+  }))))), getBooleanFF('platform.linking-platform.datasource-assets_objects_add_jsm_promotional_tag') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
+    text: intl.formatMessage(footerMessages.powerByJSM)
+  }) : null, jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? jsx(FormattedMessage, footerMessages.loadingText) : jsx(SyncInfo, {
     lastSyncTime: lastSyncTime

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

@@ -14,5 +14,10 @@ export const footerMessages = 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'
   }
 });