@atlaskit/link-datasource 1.28.0 → 1.28.2

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

@@ -9,9 +9,11 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _useDebounce = require("use-debounce");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _basicSearchInput = require("../../common/modal/basic-search-input");
+var _constants = require("../../common/modal/popup-select/constants");
 var _basicFilters = _interopRequireDefault(require("../basic-filters"));
 var _messages = require("./messages");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -39,21 +41,26 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     var rawSearch = e.currentTarget.value;
     setSearchBarSearchString(rawSearch);
   }, []);
+  var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (filterValues) {
+      onSearch(searchBarSearchString, filterValues);
+    }, _constants.FILTER_SELECTION_DEBOUNCE_MS),
+    _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));
+    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
   (0, _react.useEffect)(function () {
     if (currentCloudId.current !== cloudId) {
       setSearchBarSearchString('');
+      setFilterSelections({});
       currentCloudId.current = cloudId;
     }
   }, [cloudId]);
-  var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterType, options) {
-    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, (0, _defineProperty2.default)({}, filterType, options));
-    setFilterSelections(updatedSelection);
-    //TODO: move to debounce fn in https://product-fabric.atlassian.net/browse/EDM-9485
-    onSearch(searchBarSearchString, updatedSelection);
-  }, [filterSelections, onSearch, searchBarSearchString]);
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
@@ -72,6 +79,8 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     placeholder: _messages.searchMessages.searchLabel,
     fullWidth: !showBasicFilters
   }), showBasicFilters && /*#__PURE__*/_react.default.createElement(_basicFilters.default, {
+    cloudId: cloudId,
+    selections: filterSelections,
     onChange: handleBasicFilterSelectionChange
   }));
 };

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

@@ -108,10 +108,14 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
     visibleColumnKeys = _useState10[0],
     setVisibleColumnKeys = _useState10[1];
-  var _useState11 = (0, _react.useState)(),
+  var _useState11 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     lastModified = _useState12[0],
     setLastModified = _useState12[1];
+  var _useState13 = (0, _react.useState)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
+    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+    contributorAccountIds = _useState14[0],
+    setContributorAccountIds = _useState14[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
@@ -121,13 +125,15 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   // 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({}, initialParameters), {}, {
+    return _objectSpread(_objectSpread(_objectSpread({}, initialParameters), {}, {
       cloudId: cloudId,
       searchString: searchString
-    }, lastModified && {
+    }, ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified) || lastModified) && {
       lastModified: lastModified
+    }), ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0) && {
+      contributorAccountIds: contributorAccountIds
     });
-  }, [cloudId, lastModified, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  }, [cloudId, lastModified, contributorAccountIds, initialParameters, searchString /** Add more parameters when more filters are added */]);
   var isParametersSet = (0, _react.useMemo)(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -191,6 +197,8 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   var onSiteSelection = (0, _react.useCallback)(function (site) {
     userInteractionActions.current.add(_types.DatasourceAction.INSTANCE_UPDATED);
     setSearchString(undefined);
+    setLastModified(undefined);
+    setContributorAccountIds([]);
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true
@@ -233,17 +241,17 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages.confluenceSearchModalMessages.insertIssuesTitleManySites : _messages.confluenceSearchModalMessages.insertIssuesTitle;
-  var _useState13 = (0, _react.useState)(initialColumnCustomSizes),
-    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    columnCustomSizes = _useState14[0],
-    setColumnCustomSizes = _useState14[1];
+  var _useState15 = (0, _react.useState)(initialColumnCustomSizes),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    columnCustomSizes = _useState16[0],
+    setColumnCustomSizes = _useState16[1];
   var onColumnResize = (0, _react.useCallback)(function (key, width) {
     setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, (0, _defineProperty2.default)({}, key, width)));
   }, [columnCustomSizes]);
-  var _useState15 = (0, _react.useState)(initialWrappedColumnKeys),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    wrappedColumnKeys = _useState16[0],
-    setWrappedColumnKeys = _useState16[1];
+  var _useState17 = (0, _react.useState)(initialWrappedColumnKeys),
+    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+    wrappedColumnKeys = _useState18[0],
+    setWrappedColumnKeys = _useState18[1];
   var onWrappedColumnChange = (0, _react.useCallback)(function (key, isWrapped) {
     var set = new Set(wrappedColumnKeys);
     if (isWrapped) {
@@ -425,11 +433,21 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   var onSearch = (0, _react.useCallback)(function (newSearchString, filters) {
     searchCount.current++;
     userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
-    if (filters !== null && filters !== void 0 && filters.lastModified) {
-      var lastModifiedValue = filters.lastModified.find(function (range) {
-        return range.value;
-      });
-      setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+    if (filters) {
+      var editedOrCreatedBy = filters.editedOrCreatedBy,
+        _lastModified = filters.lastModified;
+      if (_lastModified) {
+        var lastModifiedValue = _lastModified.find(function (range) {
+          return range.value;
+        });
+        setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+      }
+      if (editedOrCreatedBy) {
+        var accountIds = editedOrCreatedBy.map(function (user) {
+          return user.value;
+        });
+        setContributorAccountIds(accountIds);
+      }
     }
     setSearchString(newSearchString);
     reset({

package/dist/es2019/services/mocks.js

@@ -125,4 +125,155 @@ export const mockFieldValuesResponse = {
       }
     }
   }
+};
+export const mockUserRecommendationsResponse = {
+  recommendedUsers: [{
+    entityType: 'USER',
+    id: '5ffe1efc34847e0069446bf8',
+    name: 'Atlassian Assist (staging)',
+    avatarUrl: '',
+    nickname: 'Atlassian Assist (staging)',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '62df272c3aaeedcae755c533',
+    name: 'Atlas for Jira (staging)',
+    avatarUrl: '',
+    nickname: 'Atlas for Jira (staging)',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '6232be743eacc50071fe13ba',
+    name: 'Stephen',
+    email: 'sdemontfort+10@atlassian.com',
+    avatarUrl: '',
+    nickname: 'Stephen',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-GB',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '608b253e2911000071b6e6d6',
+    name: 'Pranay Test 1773',
+    email: 'pmarella+1773@atlassian.com',
+    avatarUrl: '',
+    nickname: 'Pranay Test 1773',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '6202a8cfc4e2c9006ae620b1',
+    name: 'Jacob Test3',
+    email: 'jbrunson+test3@atlassian.com',
+    avatarUrl: '',
+    nickname: 'Jacob Test3',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '61428180ff23ba00717b7d78',
+    name: 'Test Themes',
+    avatarUrl: '',
+    nickname: 'Test Themes',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '5d9e2c300d44fc0dca5428bb',
+    name: 'Confluence Connect Test - AP methods',
+    avatarUrl: '',
+    nickname: 'Confluence Connect Test - AP methods',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '655363:1276a696-f0d0-4f3a-a022-636723eb5148',
+    name: 'Confluence Google Drive',
+    avatarUrl: '',
+    nickname: 'Confluence Google Drive',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '712020:413e43c0-7202-4016-a318-a004892e7f8c',
+    name: 'arthur chen nth user',
+    avatarUrl: '',
+    nickname: 'arthur chen nth user',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '712020:9219bf5f-0358-4782-99dc-bc73258b2ddc',
+    name: 'jeff mellis',
+    avatarUrl: '',
+    nickname: 'jeff mellis',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }]
 };

package/dist/es2019/services/useBasicFilterAGG.js

@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from 'react';
 import { request } from '@atlaskit/linking-common';
-import { fieldValuesQuery, hydrateJQLQuery } from './utils';
+import { fieldValuesQuery, hydrateJQLQuery, userQuery } from './utils';
 const AGG_BASE_URL = '/gateway/api/graphql';
 export const useBasicFilterAGG = () => {
   const requestCall = useCallback(async body => request('post', AGG_BASE_URL, body, {
@@ -32,8 +32,13 @@ export const useBasicFilterAGG = () => {
     operationName: 'fieldValues',
     query: fieldValuesQuery
   }), [requestCall]);
+  const getCurrentUserInfo = useCallback(() => requestCall({
+    operationName: 'userQuery',
+    query: userQuery
+  }), [requestCall]);
   return useMemo(() => ({
     getHydratedJQL,
-    getFieldValues
-  }), [getHydratedJQL, getFieldValues]);
+    getFieldValues,
+    getCurrentUserInfo
+  }), [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
 };

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

@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import Avatar from '@atlaskit/avatar';
 import PeopleGroupIcon from '@atlaskit/icon/glyph/people-group';
 import Lozenge from '@atlaskit/lozenge';
@@ -68,9 +68,6 @@ const AvatarOptionLabel = ({
   }, data.label));
 };
 const formatOptionLabel = data => {
-  if (data.optionType === 'defaultOption') {
-    return /*#__PURE__*/React.createElement(Fragment, null);
-  }
   if (data.optionType === 'lozengeLabel') {
     return /*#__PURE__*/React.createElement(LozengeOptionLabel, {
       data: data
@@ -81,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'
@@ -39,13 +38,13 @@ const PopupTrigger = /*#__PURE__*/forwardRef(({
   const [firstOption] = selectedOptions || [];
   const hasOptions = selectedOptions && selectedOptions.length > 0;
   const showButtonLoading = !isDisabled && isLoading;
-  const tiggerButtonTestId = `${testId}-trigger`;
+  const triggerButtonTestId = `${testId}-trigger`;
   const LoadingButton = useCallback(() => /*#__PURE__*/React.createElement(LoadingStateAnimationWrapper, null, /*#__PURE__*/React.createElement(Button, {
     iconAfter: /*#__PURE__*/React.createElement(Spinner, {
       size: 'xsmall'
     }),
-    testId: `${tiggerButtonTestId}--loading-button`
-  }, label)), [label, tiggerButtonTestId]);
+    testId: `${triggerButtonTestId}--loading-button`
+  }, label)), [label, triggerButtonTestId]);
   const DefaultButton = useCallback(() => /*#__PURE__*/React.createElement(Button, {
     appearance: "default",
     isSelected: isSelected || hasOptions,
@@ -53,7 +52,7 @@ const PopupTrigger = /*#__PURE__*/forwardRef(({
     iconAfter: /*#__PURE__*/React.createElement(ChevronDownIcon, {
       label: ""
     }),
-    testId: `${tiggerButtonTestId}--button`
+    testId: `${triggerButtonTestId}--button`
   }, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Box, {
     xcss: triggerButtonLabelStyles
   }, label, firstOption && /*#__PURE__*/React.createElement(React.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/React.createElement(Flex, {
@@ -61,7 +60,7 @@ const PopupTrigger = /*#__PURE__*/forwardRef(({
     alignItems: "center"
   }, /*#__PURE__*/React.createElement(Badge, {
     appearance: "primary"
-  }, "+", selectedOptions.length - 1)))), [firstOption, hasOptions, isDisabled, isSelected, label, selectedOptions, tiggerButtonTestId]);
+  }, "+", selectedOptions.length - 1)))), [firstOption, hasOptions, isDisabled, isSelected, label, selectedOptions, triggerButtonTestId]);
 
   /**
    * We had an issue with the popup component referencing a stale DOM ref for the trigger button.
@@ -69,7 +68,7 @@ const PopupTrigger = /*#__PURE__*/forwardRef(({
    */
   return /*#__PURE__*/React.createElement(Box, {
     ref: ref,
-    testId: tiggerButtonTestId
+    testId: triggerButtonTestId
   }, showButtonLoading ? /*#__PURE__*/React.createElement(LoadingButton, null) : /*#__PURE__*/React.createElement(DefaultButton, null));
 });
 export default PopupTrigger;

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