@atlaskit/link-datasource 1.29.3 → 1.29.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.29.5
+
+### Patch Changes
+
+- [#94901](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94901) [`da964fcdc828`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/da964fcdc828) - [ED-23097] Bump ADF schema to version 35.12.1
+- [#95182](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/95182) [`3d3dd335b8e8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3d3dd335b8e8) - The internal composition of this component has changed. There is no expected change in behavior.
+
+## 1.29.4
+
+### Patch Changes
+
+- [#92797](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92797) [`55f4c6b7a6f0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/55f4c6b7a6f0) - The changes here adds the logic to hydrate Edited/Created by filter values.
+
 ## 1.29.3
 
 ### Patch Changes

package/dist/cjs/services/mocks.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mockUserRecommendationsResponse = exports.mockHydrateJqlResponse = exports.mockFieldValuesResponse = void 0;
+exports.mockUserRecommendationsResponse = exports.mockUserHydrationResponse = exports.mockTransformedUserHydrationResponse = exports.mockHydrateJqlResponse = exports.mockFieldValuesResponse = void 0;
 var mockHydrateJqlResponse = exports.mockHydrateJqlResponse = {
   data: {
     jira: {
@@ -282,4 +282,46 @@ var mockUserRecommendationsResponse = exports.mockUserRecommendationsResponse =
       isConfluenceExternalCollaborator: false
     }
   }]
-};
+};
+var mockUserHydrationResponse = exports.mockUserHydrationResponse = {
+  data: {
+    users: [{
+      accountId: '655363:d8dff7fe-efb7-4073-a3cd-12463ac79e1c',
+      name: 'Peter Grasevski',
+      picture: 'https://secure.gravatar.com/avatar/f4bb2f6eef1621e67cd136c0be9af81c?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FPG-5.png'
+    }, {
+      accountId: '62cf07378afb5805e5d46454',
+      name: 'Richard Wang',
+      picture: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62cf07378afb5805e5d46454/5d1719ab-8717-4837-9ae7-a3761c3b6604/128'
+    }, {
+      accountId: '62f3ed1ee50f2f2a39573e7f',
+      name: 'Luke Muller',
+      picture: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62f3ed1ee50f2f2a39573e7f/1bd99ace-ea01-4d41-b0ab-3e1ebc353914/128'
+    }, {
+      accountId: '6232212a62dc1e006802dea8',
+      name: 'Nidhin Joseph',
+      picture: 'https://secure.gravatar.com/avatar/815c1ee3e8e2839ef94bf90b134d1c68?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FNJ-2.png'
+    }]
+  }
+};
+var mockTransformedUserHydrationResponse = exports.mockTransformedUserHydrationResponse = [{
+  optionType: 'avatarLabel',
+  label: 'Peter Grasevski',
+  value: '655363:d8dff7fe-efb7-4073-a3cd-12463ac79e1c',
+  avatar: 'https://secure.gravatar.com/avatar/f4bb2f6eef1621e67cd136c0be9af81c?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FPG-5.png'
+}, {
+  optionType: 'avatarLabel',
+  label: 'Richard Wang',
+  value: '62cf07378afb5805e5d46454',
+  avatar: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62cf07378afb5805e5d46454/5d1719ab-8717-4837-9ae7-a3761c3b6604/128'
+}, {
+  optionType: 'avatarLabel',
+  label: 'Luke Muller',
+  value: '62f3ed1ee50f2f2a39573e7f',
+  avatar: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62f3ed1ee50f2f2a39573e7f/1bd99ace-ea01-4d41-b0ab-3e1ebc353914/128'
+}, {
+  optionType: 'avatarLabel',
+  label: 'Nidhin Joseph',
+  value: '6232212a62dc1e006802dea8',
+  avatar: 'https://secure.gravatar.com/avatar/815c1ee3e8e2839ef94bf90b134d1c68?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FNJ-2.png'
+}];

package/dist/cjs/services/useBasicFilterAGG.js

@@ -13,20 +13,18 @@ var _utils = require("./utils");
 var AGG_BASE_URL = '/gateway/api/graphql';
 var useBasicFilterAGG = exports.useBasicFilterAGG = function useBasicFilterAGG() {
   var requestCall = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(body) {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(body, headers) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            return _context.abrupt("return", (0, _linkingCommon.request)('post', AGG_BASE_URL, body, {
-              'X-ExperimentalApi': 'JiraJqlBuilder'
-            }, [200, 201, 202, 203, 204]));
+            return _context.abrupt("return", (0, _linkingCommon.request)('post', AGG_BASE_URL, body, headers, [200, 201, 202, 203, 204]));
           case 1:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function (_x) {
+    return function (_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }(), []);
@@ -38,6 +36,8 @@ var useBasicFilterAGG = exports.useBasicFilterAGG = function useBasicFilterAGG()
       },
       operationName: 'hydrate',
       query: _utils.hydrateJQLQuery
+    }, {
+      'X-ExperimentalApi': 'JiraJqlBuilder'
     });
   }, [requestCall]);
   var getFieldValues = (0, _react.useCallback)(function (_ref2) {
@@ -59,6 +59,8 @@ var useBasicFilterAGG = exports.useBasicFilterAGG = function useBasicFilterAGG()
       },
       operationName: 'fieldValues',
       query: _utils.fieldValuesQuery
+    }, {
+      'X-ExperimentalApi': 'JiraJqlBuilder'
     });
   }, [requestCall]);
   var getCurrentUserInfo = (0, _react.useCallback)(function () {
@@ -67,11 +69,21 @@ var useBasicFilterAGG = exports.useBasicFilterAGG = function useBasicFilterAGG()
       query: _utils.userQuery
     });
   }, [requestCall]);
+  var getUsersFromAccountIDs = (0, _react.useCallback)(function (accountIds) {
+    return requestCall({
+      variables: {
+        accountIds: accountIds
+      },
+      operationName: 'userHydration',
+      query: _utils.userHydration
+    });
+  }, [requestCall]);
   return (0, _react.useMemo)(function () {
     return {
       getHydratedJQL: getHydratedJQL,
       getFieldValues: getFieldValues,
-      getCurrentUserInfo: getCurrentUserInfo
+      getCurrentUserInfo: getCurrentUserInfo,
+      getUsersFromAccountIDs: getUsersFromAccountIDs
     };
-  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
+  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo, getUsersFromAccountIDs]);
 };

package/dist/cjs/services/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.userQuery = exports.hydrateJQLQuery = exports.fieldValuesQuery = void 0;
+exports.userQuery = exports.userHydration = 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
@@ -13,4 +13,5 @@ exports.userQuery = 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 userQuery = exports.userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";
+var userQuery = exports.userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";
+var userHydration = exports.userHydration = "query userHydration($accountIds: [ID!]!) {\n  users(accountIds: $accountIds) {\n    accountId\n    name\n    picture\n  }\n}";

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

@@ -25,7 +25,9 @@ var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
   var cloudId = _ref.cloudId,
     onSelectionChange = _ref.onSelectionChange,
     _ref$selection = _ref.selection,
-    selection = _ref$selection === void 0 ? [] : _ref$selection;
+    selection = _ref$selection === void 0 ? [] : _ref$selection,
+    _ref$isHydrating = _ref.isHydrating,
+    isHydrating = _ref$isHydrating === void 0 ? false : _ref$isHydrating;
   var _useCurrentUserInfo = (0, _useCurrentUserInfo2.useCurrentUserInfo)(),
     user = _useCurrentUserInfo.user;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -34,7 +36,9 @@ var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
     status = _useRecommendation.status,
     filterOptions = _useRecommendation.filterOptions,
     fetchFilterOptions = _useRecommendation.fetchFilterOptions,
-    errors = _useRecommendation.errors;
+    errors = _useRecommendation.errors,
+    resetHook = _useRecommendation.reset;
+  var currentSiteCloudId = (0, _react.useRef)(cloudId || '');
   var _useState = (0, _react.useState)(''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     searchTerm = _useState2[0],
@@ -85,6 +89,14 @@ var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
   var isLoading = status === 'loading' || status === 'empty';
   var isEmpty = status === 'resolved' && filterOptionsLength === 0;
   var isDisabled = !cloudId || !(user !== null && user !== void 0 && user.accountId);
+  (0, _react.useEffect)(function () {
+    if (cloudId && currentSiteCloudId.current !== cloudId) {
+      currentSiteCloudId.current = cloudId;
+      if (status === 'resolved') {
+        resetHook();
+      }
+    }
+  }, [cloudId, resetHook, status]);
   return /*#__PURE__*/_react.default.createElement(_popupSelect.FilterPopupSelect, {
     buttonLabel: formatMessage(_messages.editedOrCreatedByMessage.buttonLabel),
     filterName: filterName,
@@ -94,7 +106,7 @@ var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
     selectedOptions: selection,
     onSelectionChange: handleOptionSelection,
     onInputChange: handleInputChange,
-    showHydrating: false,
+    showHydrating: isHydrating,
     shouldShowFooter: false,
     status: status,
     onMenuOpen: handleMenuOpen,

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

@@ -0,0 +1,79 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useBasicFilterHydration = 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 useBasicFilterHydration = exports.useBasicFilterHydration = function useBasicFilterHydration() {
+  var _useState = (0, _react.useState)('empty'),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    status = _useState2[0],
+    setStatus = _useState2[1];
+  var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
+    getUsersFromAccountIDs = _useBasicFilterAGG.getUsersFromAccountIDs;
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    users = _useState4[0],
+    setUsers = _useState4[1];
+  var convertUserHydrationResponseToFilterOptions = function convertUserHydrationResponseToFilterOptions(response) {
+    var _response$data, _response$data2;
+    if (!((_response$data = response.data) !== null && _response$data !== void 0 && _response$data.users)) {
+      return [];
+    }
+    return (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.users.map(function (item) {
+      return {
+        optionType: 'avatarLabel',
+        label: item.name,
+        value: item.accountId,
+        avatar: item.picture
+      };
+    });
+  };
+  var hydrateUsersFromAccountIds = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(accountIds) {
+      var response;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            setStatus('loading');
+            _context.next = 4;
+            return getUsersFromAccountIDs(accountIds);
+          case 4:
+            response = _context.sent;
+            if (!(response.errors && response.errors.length > 0)) {
+              _context.next = 7;
+              break;
+            }
+            throw new Error(JSON.stringify(response.errors));
+          case 7:
+            setUsers(convertUserHydrationResponseToFilterOptions(response));
+            setStatus('resolved');
+            _context.next = 14;
+            break;
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](0);
+            setStatus('rejected');
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 11]]);
+    }));
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(), [getUsersFromAccountIDs]);
+  return {
+    hydrateUsersFromAccountIds: hydrateUsersFromAccountIds,
+    status: status,
+    users: users
+  };
+};

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

@@ -19,7 +19,7 @@ var useCurrentUserInfo = exports.useCurrentUserInfo = function useCurrentUserInf
     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;
+    var user;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -27,11 +27,7 @@ var useCurrentUserInfo = exports.useCurrentUserInfo = function useCurrentUserInf
           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);
-          }
+          setUser((_user$data = user.data) === null || _user$data === void 0 || (_user$data = _user$data.me) === null || _user$data === void 0 ? void 0 : _user$data.user);
         case 4:
         case "end":
           return _context.stop();

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

@@ -108,6 +108,7 @@ var useRecommendation = function useRecommendation() {
     setStatus('empty');
     setFilterOptions([]);
     setErrors([]);
+    initialData.current = undefined;
   }, []);
   return {
     status: status,

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

@@ -16,7 +16,8 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var cloudId = _ref.cloudId,
     onChange = _ref.onChange,
     _ref$selections = _ref.selections,
-    selections = _ref$selections === void 0 ? {} : _ref$selections;
+    selections = _ref$selections === void 0 ? {} : _ref$selections,
+    isHydrating = _ref.isHydrating;
   var editedOrCreatedBy = selections.editedOrCreatedBy;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,
@@ -25,7 +26,8 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_editedOrCreatedBy.default, {
     cloudId: cloudId,
     onSelectionChange: onChange,
-    selection: editedOrCreatedBy || []
+    selection: editedOrCreatedBy || [],
+    isHydrating: isHydrating
   }), /*#__PURE__*/_react.default.createElement(_dateRangePicker.DateRangePicker, {
     onSelectionChange: onChange
   }));

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

@@ -15,6 +15,8 @@ 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 _useBasicFilterHydration = require("../basic-filters/hooks/useBasicFilterHydration");
+var _types = require("../basic-filters/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; }
@@ -26,8 +28,13 @@ var basicSearchInputContainerStyles = (0, _primitives.xcss)({
 var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   var cloudId = _ref.cloudId,
     initialSearchValue = _ref.initialSearchValue,
+    initialFilterSelection = _ref.initialFilterSelection,
     isSearching = _ref.isSearching,
     onSearch = _ref.onSearch;
+  var _useBasicFilterHydrat = (0, _useBasicFilterHydration.useBasicFilterHydration)(),
+    hydrateUsersFromAccountIds = _useBasicFilterHydrat.hydrateUsersFromAccountIds,
+    users = _useBasicFilterHydrat.users,
+    status = _useBasicFilterHydrat.status;
   var currentCloudId = (0, _react.useRef)(cloudId);
   var _useState = (0, _react.useState)(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : ''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -67,6 +74,20 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     }
     return false;
   }, []);
+  (0, _react.useEffect)(function () {
+    var accountIds = initialFilterSelection === null || initialFilterSelection === void 0 ? void 0 : initialFilterSelection[_types.CLOLBasicFilters.editedOrCreatedBy];
+    var hasAccountIds = accountIds && accountIds.length > 0;
+    if (hasAccountIds && status === 'empty' && showBasicFilters) {
+      hydrateUsersFromAccountIds(accountIds);
+    }
+  }, [hydrateUsersFromAccountIds, initialFilterSelection, showBasicFilters, status]);
+  (0, _react.useEffect)(function () {
+    if (status === 'resolved') {
+      setFilterSelections({
+        editedOrCreatedBy: users
+      });
+    }
+  }, [users, status]);
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     alignItems: "center",
     xcss: basicSearchInputContainerStyles
@@ -81,7 +102,8 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   }), showBasicFilters && /*#__PURE__*/_react.default.createElement(_basicFilters.default, {
     cloudId: cloudId,
     selections: filterSelections,
-    onChange: handleBasicFilterSelectionChange
+    onChange: handleBasicFilterSelectionChange,
+    isHydrating: status === 'loading'
   }));
 };
 var _default = exports.default = ConfluenceSearchContainer;

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

@@ -134,6 +134,11 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       contributorAccountIds: contributorAccountIds
     });
   }, [cloudId, lastModified, contributorAccountIds, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  var initialFilterSelection = (0, _react.useMemo)(function () {
+    return {
+      editedOrCreatedBy: (initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []
+    };
+  }, [initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds]);
   var isParametersSet = (0, _react.useMemo)(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -297,7 +302,18 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
-  var confluenceSearchUrl = selectedConfluenceSiteUrl && searchString !== undefined && "".concat(selectedConfluenceSiteUrl, "/wiki/search?text=").concat(encodeURI(searchString));
+  var confluenceSearchUrl = (0, _react.useMemo)(function () {
+    if (!selectedConfluenceSiteUrl || searchString === undefined) {
+      return undefined;
+    }
+    var params = new URLSearchParams();
+    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search
+    params.append('text', searchString);
+    if (contributorAccountIds.length > 0) {
+      params.append('contributors', contributorAccountIds.join(','));
+    }
+    return "".concat(selectedConfluenceSiteUrl, "/wiki/search?").concat(params.toString());
+  }, [contributorAccountIds, searchString, selectedConfluenceSiteUrl]);
   var analyticsPayload = (0, _react.useMemo)(function () {
     return {
       extensionKey: extensionKey,
@@ -486,7 +502,8 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     cloudId: cloudId,
     isSearching: status === 'loading',
     onSearch: onSearch,
-    initialSearchValue: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString
+    initialSearchValue: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString,
+    initialFilterSelection: initialFilterSelection
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
     title: _messages.confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: _messages.confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,

package/dist/cjs/ui/table-footer/powered-by-jsm-assets/index.js

@@ -12,7 +12,7 @@ var _analytics = require("../../../analytics");
 var jsmTextStyles = (0, _primitives.xcss)({
   fontSize: 'small',
   color: 'color.text.subtle',
-  marginLeft: "var(--ds-space-075, 6px)",
+  marginLeft: 'space.075',
   ':hover': {
     color: 'color.link.pressed'
   }

package/dist/es2019/services/mocks.js

@@ -276,4 +276,46 @@ export const mockUserRecommendationsResponse = {
       isConfluenceExternalCollaborator: false
     }
   }]
-};
+};
+export const mockUserHydrationResponse = {
+  data: {
+    users: [{
+      accountId: '655363:d8dff7fe-efb7-4073-a3cd-12463ac79e1c',
+      name: 'Peter Grasevski',
+      picture: 'https://secure.gravatar.com/avatar/f4bb2f6eef1621e67cd136c0be9af81c?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FPG-5.png'
+    }, {
+      accountId: '62cf07378afb5805e5d46454',
+      name: 'Richard Wang',
+      picture: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62cf07378afb5805e5d46454/5d1719ab-8717-4837-9ae7-a3761c3b6604/128'
+    }, {
+      accountId: '62f3ed1ee50f2f2a39573e7f',
+      name: 'Luke Muller',
+      picture: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62f3ed1ee50f2f2a39573e7f/1bd99ace-ea01-4d41-b0ab-3e1ebc353914/128'
+    }, {
+      accountId: '6232212a62dc1e006802dea8',
+      name: 'Nidhin Joseph',
+      picture: 'https://secure.gravatar.com/avatar/815c1ee3e8e2839ef94bf90b134d1c68?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FNJ-2.png'
+    }]
+  }
+};
+export const mockTransformedUserHydrationResponse = [{
+  optionType: 'avatarLabel',
+  label: 'Peter Grasevski',
+  value: '655363:d8dff7fe-efb7-4073-a3cd-12463ac79e1c',
+  avatar: 'https://secure.gravatar.com/avatar/f4bb2f6eef1621e67cd136c0be9af81c?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FPG-5.png'
+}, {
+  optionType: 'avatarLabel',
+  label: 'Richard Wang',
+  value: '62cf07378afb5805e5d46454',
+  avatar: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62cf07378afb5805e5d46454/5d1719ab-8717-4837-9ae7-a3761c3b6604/128'
+}, {
+  optionType: 'avatarLabel',
+  label: 'Luke Muller',
+  value: '62f3ed1ee50f2f2a39573e7f',
+  avatar: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/62f3ed1ee50f2f2a39573e7f/1bd99ace-ea01-4d41-b0ab-3e1ebc353914/128'
+}, {
+  optionType: 'avatarLabel',
+  label: 'Nidhin Joseph',
+  value: '6232212a62dc1e006802dea8',
+  avatar: 'https://secure.gravatar.com/avatar/815c1ee3e8e2839ef94bf90b134d1c68?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FNJ-2.png'
+}];

package/dist/es2019/services/useBasicFilterAGG.js

@@ -1,11 +1,9 @@
 import { useCallback, useMemo } from 'react';
 import { request } from '@atlaskit/linking-common';
-import { fieldValuesQuery, hydrateJQLQuery, userQuery } from './utils';
+import { fieldValuesQuery, hydrateJQLQuery, userHydration, userQuery } from './utils';
 const AGG_BASE_URL = '/gateway/api/graphql';
 export const useBasicFilterAGG = () => {
-  const requestCall = useCallback(async body => request('post', AGG_BASE_URL, body, {
-    'X-ExperimentalApi': 'JiraJqlBuilder'
-  }, [200, 201, 202, 203, 204]), []);
+  const requestCall = useCallback(async (body, headers) => request('post', AGG_BASE_URL, body, headers, [200, 201, 202, 203, 204]), []);
   const getHydratedJQL = useCallback((cloudId, jql) => requestCall({
     variables: {
       cloudId,
@@ -13,6 +11,8 @@ export const useBasicFilterAGG = () => {
     },
     operationName: 'hydrate',
     query: hydrateJQLQuery
+  }, {
+    'X-ExperimentalApi': 'JiraJqlBuilder'
   }), [requestCall]);
   const getFieldValues = useCallback(({
     cloudId,
@@ -31,14 +31,24 @@ export const useBasicFilterAGG = () => {
     },
     operationName: 'fieldValues',
     query: fieldValuesQuery
+  }, {
+    'X-ExperimentalApi': 'JiraJqlBuilder'
   }), [requestCall]);
   const getCurrentUserInfo = useCallback(() => requestCall({
     operationName: 'userQuery',
     query: userQuery
   }), [requestCall]);
+  const getUsersFromAccountIDs = useCallback(accountIds => requestCall({
+    variables: {
+      accountIds
+    },
+    operationName: 'userHydration',
+    query: userHydration
+  }), [requestCall]);
   return useMemo(() => ({
     getHydratedJQL,
     getFieldValues,
-    getCurrentUserInfo
-  }), [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
+    getCurrentUserInfo,
+    getUsersFromAccountIDs
+  }), [getHydratedJQL, getFieldValues, getCurrentUserInfo, getUsersFromAccountIDs]);
 };

package/dist/es2019/services/utils.js

@@ -125,4 +125,11 @@ export const userQuery = `query userQuery {
       accountId
     }
   }
+}`;
+export const userHydration = `query userHydration($accountIds: [ID!]!) {
+  users(accountIds: $accountIds) {
+    accountId
+    name
+    picture
+  }
 }`;

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

@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
 import { FilterPopupSelect } from '../../../../common/modal/popup-select';
@@ -11,7 +11,8 @@ const filterName = `clol-basic-filter-${CLOLBasicFilters.editedOrCreatedBy}`;
 const EditedOrCreatedByFilter = ({
   cloudId,
   onSelectionChange,
-  selection = []
+  selection = [],
+  isHydrating = false
 }) => {
   const {
     user
@@ -23,8 +24,10 @@ const EditedOrCreatedByFilter = ({
     status,
     filterOptions,
     fetchFilterOptions,
-    errors
+    errors,
+    reset: resetHook
   } = useRecommendation();
+  const currentSiteCloudId = useRef(cloudId || '');
   const [searchTerm, setSearchTerm] = useState('');
   const [handleDebouncedFetchFilterOptions] = useDebouncedCallback(searchTerm => {
     if (cloudId && user !== null && user !== void 0 && user.accountId) {
@@ -57,6 +60,14 @@ const EditedOrCreatedByFilter = ({
   const isLoading = status === 'loading' || status === 'empty';
   const isEmpty = status === 'resolved' && filterOptionsLength === 0;
   const isDisabled = !cloudId || !(user !== null && user !== void 0 && user.accountId);
+  useEffect(() => {
+    if (cloudId && currentSiteCloudId.current !== cloudId) {
+      currentSiteCloudId.current = cloudId;
+      if (status === 'resolved') {
+        resetHook();
+      }
+    }
+  }, [cloudId, resetHook, status]);
   return /*#__PURE__*/React.createElement(FilterPopupSelect, {
     buttonLabel: formatMessage(editedOrCreatedByMessage.buttonLabel),
     filterName: filterName,
@@ -66,7 +77,7 @@ const EditedOrCreatedByFilter = ({
     selectedOptions: selection,
     onSelectionChange: handleOptionSelection,
     onInputChange: handleInputChange,
-    showHydrating: false,
+    showHydrating: isHydrating,
     shouldShowFooter: false,
     status: status,
     onMenuOpen: handleMenuOpen,

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

@@ -0,0 +1,39 @@
+import { useCallback, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+export const useBasicFilterHydration = () => {
+  const [status, setStatus] = useState('empty');
+  const {
+    getUsersFromAccountIDs
+  } = useBasicFilterAGG();
+  const [users, setUsers] = useState([]);
+  const convertUserHydrationResponseToFilterOptions = response => {
+    var _response$data, _response$data2;
+    if (!((_response$data = response.data) !== null && _response$data !== void 0 && _response$data.users)) {
+      return [];
+    }
+    return (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.users.map(item => ({
+      optionType: 'avatarLabel',
+      label: item.name,
+      value: item.accountId,
+      avatar: item.picture
+    }));
+  };
+  const hydrateUsersFromAccountIds = useCallback(async accountIds => {
+    try {
+      setStatus('loading');
+      const response = await getUsersFromAccountIDs(accountIds);
+      if (response.errors && response.errors.length > 0) {
+        throw new Error(JSON.stringify(response.errors));
+      }
+      setUsers(convertUserHydrationResponseToFilterOptions(response));
+      setStatus('resolved');
+    } catch (error) {
+      setStatus('rejected');
+    }
+  }, [getUsersFromAccountIDs]);
+  return {
+    hydrateUsersFromAccountIds,
+    status,
+    users
+  };
+};