@atlaskit/link-datasource 1.28.0 → 1.28.2

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({
@@ -20,24 +22,27 @@ const ConfluenceSearchContainer = ({
     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]);
-  const handleBasicFilterSelectionChange = useCallback((filterType, options) => {
-    const updatedSelection = {
-      ...filterSelections,
-      [filterType]: options
-    };
-    setFilterSelections(updatedSelection);
-    //TODO: move to debounce fn in https://product-fabric.atlassian.net/browse/EDM-9485
-    onSearch(searchBarSearchString, updatedSelection);
-  }, [filterSelections, onSearch, searchBarSearchString]);
   const showBasicFilters = useMemo(() => {
     if (getBooleanFF('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
@@ -56,6 +61,8 @@ const ConfluenceSearchContainer = ({
     placeholder: searchMessages.searchLabel,
     fullWidth: !showBasicFilters
   }), showBasicFilters && /*#__PURE__*/React.createElement(BasicFilters, {
+    cloudId: cloudId,
+    selections: filterSelections,
     onChange: handleBasicFilterSelectionChange
   }));
 };

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

@@ -78,7 +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();
+  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);
@@ -91,10 +92,13 @@ export const PlainConfluenceSearchConfigModal = props => {
     ...initialParameters,
     cloudId,
     searchString,
-    ...(lastModified && {
+    ...(((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, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  }), [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) {
@@ -154,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
@@ -367,9 +373,19 @@ export const PlainConfluenceSearchConfigModal = props => {
   const onSearch = useCallback((newSearchString, filters) => {
     searchCount.current++;
     userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
-    if (filters !== null && filters !== void 0 && filters.lastModified) {
-      const lastModifiedValue = filters.lastModified.find(range => range.value);
-      setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+    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({

package/dist/esm/services/mocks.js

@@ -125,4 +125,155 @@ export var mockFieldValuesResponse = {
       }
     }
   }
+};
+export var 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/esm/services/useBasicFilterAGG.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useMemo } from 'react';
 import { request } from '@atlaskit/linking-common';
-import { fieldValuesQuery, hydrateJQLQuery } from './utils';
+import { fieldValuesQuery, hydrateJQLQuery, userQuery } from './utils';
 var AGG_BASE_URL = '/gateway/api/graphql';
 export var useBasicFilterAGG = function useBasicFilterAGG() {
   var requestCall = useCallback( /*#__PURE__*/function () {
@@ -54,10 +54,17 @@ export var useBasicFilterAGG = function useBasicFilterAGG() {
       query: fieldValuesQuery
     });
   }, [requestCall]);
+  var getCurrentUserInfo = useCallback(function () {
+    return requestCall({
+      operationName: 'userQuery',
+      query: userQuery
+    });
+  }, [requestCall]);
   return useMemo(function () {
     return {
       getHydratedJQL: getHydratedJQL,
-      getFieldValues: getFieldValues
+      getFieldValues: getFieldValues,
+      getCurrentUserInfo: getCurrentUserInfo
     };
-  }, [getHydratedJQL, getFieldValues]);
+  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
 };

package/dist/esm/services/utils.js

@@ -6,4 +6,5 @@
  */
 
 export var hydrateJQLQuery = "query hydrate($cloudId: ID!, $jql: String!) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      hydrateJqlQuery(query: $jql) {\n        ... on JiraJqlHydratedQuery {\n          fields {\n            ... on JiraJqlQueryHydratedField {\n              jqlTerm\n              values {\n                ... on JiraJqlQueryHydratedValue {\n                  values {\n                    ... on JiraJqlProjectFieldValue {\n                      jqlTerm\n                      displayName\n                      project {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlStatusFieldValue {\n                      jqlTerm\n                      displayName\n                      statusCategory {\n                        colorName\n                      }\n                    }\n                    ... on JiraJqlIssueTypeFieldValue {\n                      jqlTerm\n                      displayName\n                      issueTypes {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlUserFieldValue {\n                      jqlTerm\n                      displayName\n                      user {\n                        picture\n                      }\n                    }\n                    ... on JiraJqlGroupFieldValue {\n                      jqlTerm\n                      displayName\n                      group {\n                        name\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
-export var fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+export var fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+export var userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";

package/dist/esm/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';
@@ -63,9 +63,6 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
   }, data.label));
 };
 var formatOptionLabel = function formatOptionLabel(data) {
-  if (data.optionType === 'defaultOption') {
-    return /*#__PURE__*/React.createElement(Fragment, null);
-  }
   if (data.optionType === 'lozengeLabel') {
     return /*#__PURE__*/React.createElement(LozengeOptionLabel, {
       data: data
@@ -76,8 +73,11 @@ var formatOptionLabel = function 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/esm/ui/common/modal/popup-select/index.js

@@ -23,7 +23,8 @@ var noFilterOptions = function noFilterOptions() {
 };
 export var FilterPopupSelect = function FilterPopupSelect(_ref) {
   var filterName = _ref.filterName,
-    totalCount = _ref.totalCount,
+    _ref$totalCount = _ref.totalCount,
+    totalCount = _ref$totalCount === void 0 ? 0 : _ref$totalCount,
     status = _ref.status,
     buttonLabel = _ref.buttonLabel,
     _ref$showLoading = _ref.showLoading,

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

@@ -8,8 +8,7 @@ import { Box, Flex, xcss } from '@atlaskit/primitives';
 import Spinner from '@atlaskit/spinner';
 var triggerButtonLabelStyles = xcss({
   textOverflow: 'ellipsis',
-  overflow: 'hidden',
-  maxWidth: '150px'
+  overflow: 'hidden'
 });
 var badgeStyles = xcss({
   marginLeft: 'space.050'
@@ -41,15 +40,15 @@ var PopupTrigger = /*#__PURE__*/forwardRef(function (_ref, ref) {
     firstOption = _ref3[0];
   var hasOptions = selectedOptions && selectedOptions.length > 0;
   var showButtonLoading = !isDisabled && isLoading;
-  var tiggerButtonTestId = "".concat(testId, "-trigger");
+  var triggerButtonTestId = "".concat(testId, "-trigger");
   var LoadingButton = useCallback(function () {
     return /*#__PURE__*/React.createElement(LoadingStateAnimationWrapper, null, /*#__PURE__*/React.createElement(Button, {
       iconAfter: /*#__PURE__*/React.createElement(Spinner, {
         size: 'xsmall'
       }),
-      testId: "".concat(tiggerButtonTestId, "--loading-button")
+      testId: "".concat(triggerButtonTestId, "--loading-button")
     }, label));
-  }, [label, tiggerButtonTestId]);
+  }, [label, triggerButtonTestId]);
   var DefaultButton = useCallback(function () {
     return /*#__PURE__*/React.createElement(Button, {
       appearance: "default",
@@ -58,7 +57,7 @@ var PopupTrigger = /*#__PURE__*/forwardRef(function (_ref, ref) {
       iconAfter: /*#__PURE__*/React.createElement(ChevronDownIcon, {
         label: ""
       }),
-      testId: "".concat(tiggerButtonTestId, "--button")
+      testId: "".concat(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, {
@@ -67,7 +66,7 @@ var PopupTrigger = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, /*#__PURE__*/React.createElement(Badge, {
       appearance: "primary"
     }, "+", selectedOptions.length - 1))));
-  }, [firstOption, hasOptions, isDisabled, isSelected, label, selectedOptions, tiggerButtonTestId]);
+  }, [firstOption, hasOptions, isDisabled, isSelected, label, selectedOptions, triggerButtonTestId]);
 
   /**
    * We had an issue with the popup component referencing a stale DOM ref for the trigger button.
@@ -75,7 +74,7 @@ var PopupTrigger = /*#__PURE__*/forwardRef(function (_ref, ref) {
    */
   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/esm/ui/confluence-search-modal/basic-filters/filters/edited-or-created-by/index.js

@@ -0,0 +1,100 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+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';
+var filterName = "clol-basic-filter-".concat(CLOLBasicFilters.editedOrCreatedBy);
+var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
+  var cloudId = _ref.cloudId,
+    onSelectionChange = _ref.onSelectionChange,
+    _ref$selection = _ref.selection,
+    selection = _ref$selection === void 0 ? [] : _ref$selection;
+  var _useCurrentUserInfo = useCurrentUserInfo(),
+    user = _useCurrentUserInfo.user;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var _useRecommendation = useRecommendation(),
+    status = _useRecommendation.status,
+    filterOptions = _useRecommendation.filterOptions,
+    fetchFilterOptions = _useRecommendation.fetchFilterOptions,
+    errors = _useRecommendation.errors;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchTerm = _useState2[0],
+    setSearchTerm = _useState2[1];
+  var _useDebouncedCallback = useDebouncedCallback(function (searchTerm) {
+      if (cloudId && user !== null && user !== void 0 && user.accountId) {
+        fetchFilterOptions({
+          searchTerm: searchTerm,
+          cloudId: cloudId,
+          userId: user.accountId
+        });
+      }
+    }, SEARCH_DEBOUNCE_MS),
+    _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
+    handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
+  var handleInputChange = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(newSearchTerm) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setSearchTerm(newSearchTerm);
+            handleDebouncedFetchFilterOptions(newSearchTerm);
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [handleDebouncedFetchFilterOptions]);
+  var handleOptionSelection = useCallback(function (newValue) {
+    onSelectionChange(CLOLBasicFilters.editedOrCreatedBy, newValue);
+  }, [onSelectionChange]);
+  var handleMenuOpen = useCallback(function () {
+    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: cloudId,
+        userId: user.accountId,
+        searchTerm: searchTerm
+      });
+    }
+  }, [fetchFilterOptions, status, cloudId, user === null || user === void 0 ? void 0 : user.accountId, searchTerm]);
+  var filterOptionsLength = filterOptions.length;
+  var isError = status === 'rejected';
+  var isLoading = status === 'loading' || status === 'empty';
+  var isEmpty = status === 'resolved' && filterOptionsLength === 0;
+  var 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: errors,
+      isLoading: isLoading,
+      isError: isError,
+      isEmpty: isEmpty
+    }
+  });
+};
+export default EditedOrCreatedByFilter;

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

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export var 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/esm/ui/confluence-search-modal/basic-filters/hooks/useCurrentUserInfo.js

@@ -0,0 +1,41 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback, useEffect, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+export var useCurrentUserInfo = function useCurrentUserInfo() {
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    user = _useState2[0],
+    setUser = _useState2[1];
+  var _useBasicFilterAGG = useBasicFilterAGG(),
+    getCurrentUserInfoFromAGG = _useBasicFilterAGG.getCurrentUserInfo;
+  var getCurrentUserInfo = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _user$data;
+    var user, _user$data2;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return getCurrentUserInfoFromAGG();
+        case 2:
+          user = _context.sent;
+          if (user !== null && user !== void 0 && (_user$data = user.data) !== null && _user$data !== void 0 && _user$data.me.user) {
+            setUser((_user$data2 = user.data) === null || _user$data2 === void 0 ? void 0 : _user$data2.me.user);
+          } else {
+            setUser(undefined);
+          }
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [getCurrentUserInfoFromAGG]);
+  useEffect(function () {
+    getCurrentUserInfo();
+  }, [getCurrentUserInfo]);
+  return {
+    user: user,
+    getCurrentUserInfo: getCurrentUserInfo
+  };
+};