@atlaskit/link-datasource 1.28.0 → 1.28.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.28.2
+
+### Patch Changes
+
+- [#92426](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92426) [`32c76c7c225c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/32c76c7c225c) - Bump adf-schema to 35.9.2 to support table alignment options
+- Updated dependencies
+
+## 1.28.1
+
+### Patch Changes
+
+- [#91884](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91884) [`e6c2b9a64494`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e6c2b9a64494) - The changes here adds `Edited or Created by` filter to the confluence list of links config modal.
+
 ## 1.28.0
 
 ### Minor Changes

package/dist/cjs/services/mocks.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mockHydrateJqlResponse = exports.mockFieldValuesResponse = void 0;
+exports.mockUserRecommendationsResponse = exports.mockHydrateJqlResponse = exports.mockFieldValuesResponse = void 0;
 var mockHydrateJqlResponse = exports.mockHydrateJqlResponse = {
   data: {
     jira: {
@@ -131,4 +131,155 @@ var mockFieldValuesResponse = exports.mockFieldValuesResponse = {
       }
     }
   }
+};
+var mockUserRecommendationsResponse = exports.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/cjs/services/useBasicFilterAGG.js

@@ -61,10 +61,17 @@ var useBasicFilterAGG = exports.useBasicFilterAGG = function useBasicFilterAGG()
       query: _utils.fieldValuesQuery
     });
   }, [requestCall]);
+  var getCurrentUserInfo = (0, _react.useCallback)(function () {
+    return requestCall({
+      operationName: 'userQuery',
+      query: _utils.userQuery
+    });
+  }, [requestCall]);
   return (0, _react.useMemo)(function () {
     return {
       getHydratedJQL: getHydratedJQL,
-      getFieldValues: getFieldValues
+      getFieldValues: getFieldValues,
+      getCurrentUserInfo: getCurrentUserInfo
     };
-  }, [getHydratedJQL, getFieldValues]);
+  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
 };

package/dist/cjs/services/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hydrateJQLQuery = exports.fieldValuesQuery = void 0;
+exports.userQuery = exports.hydrateJQLQuery = exports.fieldValuesQuery = void 0;
 /**
  * HELLO DEV :wave
  * If you are here to change these queries, please also remember to update the query in jira/src/packages/platform/linking/link-datasource/src/index.tsx
@@ -12,4 +12,5 @@ exports.hydrateJQLQuery = exports.fieldValuesQuery = void 0;
  */
 
 var hydrateJQLQuery = exports.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}";
-var fieldValuesQuery = exports.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}";
+var fieldValuesQuery = exports.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}";
+var userQuery = exports.userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";

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

@@ -1,18 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
 var _peopleGroup = _interopRequireDefault(require("@atlaskit/icon/glyph/people-group"));
 var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
 var _primitives = require("@atlaskit/primitives");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var commonLabelStyles = (0, _primitives.xcss)({
   overflow: 'hidden',
   textOverflow: 'ellipsis'
@@ -73,9 +70,6 @@ var AvatarOptionLabel = function AvatarOptionLabel(_ref3) {
   }, data.label));
 };
 var formatOptionLabel = function formatOptionLabel(data) {
-  if (data.optionType === 'defaultOption') {
-    return /*#__PURE__*/_react.default.createElement(_react.Fragment, null);
-  }
   if (data.optionType === 'lozengeLabel') {
     return /*#__PURE__*/_react.default.createElement(LozengeOptionLabel, {
       data: data
@@ -86,8 +80,11 @@ var formatOptionLabel = function formatOptionLabel(data) {
       data: data
     });
   }
-  return /*#__PURE__*/_react.default.createElement(IconOptionLabel, {
-    data: data
-  });
+  if (data.optionType === 'iconLabel') {
+    return /*#__PURE__*/_react.default.createElement(IconOptionLabel, {
+      data: data
+    });
+  }
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 };
 var _default = exports.default = formatOptionLabel;

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

@@ -33,7 +33,8 @@ var noFilterOptions = function noFilterOptions() {
 };
 var FilterPopupSelect = exports.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/cjs/ui/common/modal/popup-select/trigger.js

@@ -18,8 +18,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var triggerButtonLabelStyles = (0, _primitives.xcss)({
   textOverflow: 'ellipsis',
-  overflow: 'hidden',
-  maxWidth: '150px'
+  overflow: 'hidden'
 });
 var badgeStyles = (0, _primitives.xcss)({
   marginLeft: 'space.050'
@@ -51,15 +50,15 @@ var PopupTrigger = /*#__PURE__*/(0, _react.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 = (0, _react.useCallback)(function () {
     return /*#__PURE__*/_react.default.createElement(LoadingStateAnimationWrapper, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
       iconAfter: /*#__PURE__*/_react.default.createElement(_spinner.default, {
         size: 'xsmall'
       }),
-      testId: "".concat(tiggerButtonTestId, "--loading-button")
+      testId: "".concat(triggerButtonTestId, "--loading-button")
     }, label));
-  }, [label, tiggerButtonTestId]);
+  }, [label, triggerButtonTestId]);
   var DefaultButton = (0, _react.useCallback)(function () {
     return /*#__PURE__*/_react.default.createElement(_standardButton.default, {
       appearance: "default",
@@ -68,7 +67,7 @@ var PopupTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       iconAfter: /*#__PURE__*/_react.default.createElement(_chevronDown.default, {
         label: ""
       }),
-      testId: "".concat(tiggerButtonTestId, "--button")
+      testId: "".concat(triggerButtonTestId, "--button")
     }, /*#__PURE__*/_react.default.createElement(_primitives.Flex, null, /*#__PURE__*/_react.default.createElement(_primitives.Box, {
       xcss: triggerButtonLabelStyles
     }, label, firstOption && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
@@ -77,7 +76,7 @@ var PopupTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }, /*#__PURE__*/_react.default.createElement(_badge.default, {
       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.
@@ -85,7 +84,7 @@ var PopupTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
    */
   return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     ref: ref,
-    testId: tiggerButtonTestId
+    testId: triggerButtonTestId
   }, showButtonLoading ? /*#__PURE__*/_react.default.createElement(LoadingButton, null) : /*#__PURE__*/_react.default.createElement(DefaultButton, null));
 });
 var _default = exports.default = PopupTrigger;

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

@@ -0,0 +1,110 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _useDebounce = require("use-debounce");
+var _popupSelect = require("../../../../common/modal/popup-select");
+var _constants = require("../../../../common/modal/popup-select/constants");
+var _useCurrentUserInfo2 = require("../../hooks/useCurrentUserInfo");
+var _useRecommendation2 = _interopRequireDefault(require("../../hooks/useRecommendation"));
+var _types = require("../../types");
+var _messages = require("./messages");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var filterName = "clol-basic-filter-".concat(_types.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 = (0, _useCurrentUserInfo2.useCurrentUserInfo)(),
+    user = _useCurrentUserInfo.user;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var _useRecommendation = (0, _useRecommendation2.default)(),
+    status = _useRecommendation.status,
+    filterOptions = _useRecommendation.filterOptions,
+    fetchFilterOptions = _useRecommendation.fetchFilterOptions,
+    errors = _useRecommendation.errors;
+  var _useState = (0, _react.useState)(''),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    searchTerm = _useState2[0],
+    setSearchTerm = _useState2[1];
+  var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (searchTerm) {
+      if (cloudId && user !== null && user !== void 0 && user.accountId) {
+        fetchFilterOptions({
+          searchTerm: searchTerm,
+          cloudId: cloudId,
+          userId: user.accountId
+        });
+      }
+    }, _constants.SEARCH_DEBOUNCE_MS),
+    _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
+    handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
+  var handleInputChange = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newSearchTerm) {
+      return _regenerator.default.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 = (0, _react.useCallback)(function (newValue) {
+    onSelectionChange(_types.CLOLBasicFilters.editedOrCreatedBy, newValue);
+  }, [onSelectionChange]);
+  var handleMenuOpen = (0, _react.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.default.createElement(_popupSelect.FilterPopupSelect, {
+    buttonLabel: formatMessage(_messages.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
+    }
+  });
+};
+var _default = exports.default = EditedOrCreatedByFilter;

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.editedOrCreatedByMessage = void 0;
+var _reactIntlNext = require("react-intl-next");
+var editedOrCreatedByMessage = exports.editedOrCreatedByMessage = (0, _reactIntlNext.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/cjs/ui/confluence-search-modal/basic-filters/hooks/useCurrentUserInfo.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCurrentUserInfo = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
+var useCurrentUserInfo = exports.useCurrentUserInfo = function useCurrentUserInfo() {
+  var _useState = (0, _react.useState)(),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    user = _useState2[0],
+    setUser = _useState2[1];
+  var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
+    getCurrentUserInfoFromAGG = _useBasicFilterAGG.getCurrentUserInfo;
+  var getCurrentUserInfo = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var _user$data;
+    var user, _user$data2;
+    return _regenerator.default.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]);
+  (0, _react.useEffect)(function () {
+    getCurrentUserInfo();
+  }, [getCurrentUserInfo]);
+  return {
+    user: user,
+    getCurrentUserInfo: getCurrentUserInfo
+  };
+};

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

@@ -0,0 +1,120 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _reactIntlNext = require("react-intl-next");
+var _smartUserPicker = require("@atlaskit/smart-user-picker");
+var useRecommendation = function useRecommendation() {
+  var intl = (0, _reactIntlNext.useIntl)();
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    filterOptions = _useState2[0],
+    setFilterOptions = _useState2[1];
+  var _useState3 = (0, _react.useState)('empty'),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    status = _useState4[0],
+    setStatus = _useState4[1];
+  var _useState5 = (0, _react.useState)([]),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    errors = _useState6[0],
+    setErrors = _useState6[1];
+  var initialData = (0, _react.useRef)();
+  var convertRecommendationsToFilterOptions = function convertRecommendationsToFilterOptions(recommendations) {
+    return recommendations.map(function (item) {
+      return {
+        optionType: 'avatarLabel',
+        label: item.name,
+        value: item.id,
+        avatar: item.avatarUrl
+      };
+    });
+  };
+  var fetchFilterOptions = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
+      var userId, cloudId, searchTerm, requestParams, initialResponseData, isRequestLikeInitialSearch, recommendations;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            userId = _ref.userId, cloudId = _ref.cloudId, searchTerm = _ref.searchTerm;
+            setStatus('loading');
+            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
+            };
+            initialResponseData = initialData.current;
+            isRequestLikeInitialSearch = !searchTerm;
+            _context.prev = 5;
+            if (!(isRequestLikeInitialSearch && initialResponseData)) {
+              _context.next = 10;
+              break;
+            }
+            _context.t0 = initialResponseData;
+            _context.next = 13;
+            break;
+          case 10:
+            _context.next = 12;
+            return (0, _smartUserPicker.getUserRecommendations)(requestParams, intl);
+          case 12:
+            _context.t0 = _context.sent;
+          case 13:
+            recommendations = _context.t0;
+            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;
+            }
+            _context.next = 23;
+            break;
+          case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](5);
+            setStatus('rejected');
+            setErrors([_context.t1]);
+          case 23:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[5, 19]]);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [intl]);
+  var reset = (0, _react.useCallback)(function () {
+    setStatus('empty');
+    setFilterOptions([]);
+    setErrors([]);
+  }, []);
+  return {
+    status: status,
+    errors: errors,
+    filterOptions: filterOptions,
+    reset: reset,
+    fetchFilterOptions: fetchFilterOptions
+  };
+};
+var _default = exports.default = useRecommendation;

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

@@ -8,17 +8,26 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _primitives = require("@atlaskit/primitives");
 var _dateRangePicker = require("./filters/date-range-picker");
+var _editedOrCreatedBy = _interopRequireDefault(require("./filters/edited-or-created-by"));
 var basicFilterContainerStyles = (0, _primitives.xcss)({
   paddingLeft: 'space.100'
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
-  var onChange = _ref.onChange;
+  var cloudId = _ref.cloudId,
+    onChange = _ref.onChange,
+    _ref$selections = _ref.selections,
+    selections = _ref$selections === void 0 ? {} : _ref$selections;
+  var editedOrCreatedBy = selections.editedOrCreatedBy;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
     testId: "clol-basic-filter-container"
-  }, /*#__PURE__*/_react.default.createElement(_dateRangePicker.DateRangePicker, {
+  }, /*#__PURE__*/_react.default.createElement(_editedOrCreatedBy.default, {
+    cloudId: cloudId,
+    onSelectionChange: onChange,
+    selection: editedOrCreatedBy || []
+  }), /*#__PURE__*/_react.default.createElement(_dateRangePicker.DateRangePicker, {
     onSelectionChange: onChange
-  }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
+  }));
 };
 var _default = exports.default = BasicFilterContainer;