@atlaskit/link-datasource 1.29.2 → 1.29.4

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

@@ -6,14 +6,9 @@ export const useCurrentUserInfo = () => {
     getCurrentUserInfo: getCurrentUserInfoFromAGG
   } = useBasicFilterAGG();
   const getCurrentUserInfo = useCallback(async () => {
-    var _user$data;
+    var _user$data, _user$data$me;
     const user = await getCurrentUserInfoFromAGG();
-    if (user !== null && user !== void 0 && (_user$data = user.data) !== null && _user$data !== void 0 && _user$data.me.user) {
-      var _user$data2;
-      setUser((_user$data2 = user.data) === null || _user$data2 === void 0 ? void 0 : _user$data2.me.user);
-    } else {
-      setUser(undefined);
-    }
+    setUser((_user$data = user.data) === null || _user$data === void 0 ? void 0 : (_user$data$me = _user$data.me) === null || _user$data$me === void 0 ? void 0 : _user$data$me.user);
   }, [getCurrentUserInfoFromAGG]);
   useEffect(() => {
     getCurrentUserInfo();

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

@@ -62,6 +62,7 @@ const useRecommendation = () => {
     setStatus('empty');
     setFilterOptions([]);
     setErrors([]);
+    initialData.current = undefined;
   }, []);
   return {
     status,

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

@@ -8,7 +8,8 @@ const basicFilterContainerStyles = xcss({
 const BasicFilterContainer = ({
   cloudId,
   onChange,
-  selections = {}
+  selections = {},
+  isHydrating
 }) => {
   const {
     editedOrCreatedBy
@@ -20,7 +21,8 @@ const BasicFilterContainer = ({
   }, /*#__PURE__*/React.createElement(EditedOrCreatedByFilter, {
     cloudId: cloudId,
     onSelectionChange: onChange,
-    selection: editedOrCreatedBy || []
+    selection: editedOrCreatedBy || [],
+    isHydrating: isHydrating
   }), /*#__PURE__*/React.createElement(DateRangePicker, {
     onSelectionChange: onChange
   }));

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

@@ -5,6 +5,8 @@ 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 { useBasicFilterHydration } from '../basic-filters/hooks/useBasicFilterHydration';
+import { CLOLBasicFilters } from '../basic-filters/types';
 import { searchMessages } from './messages';
 const basicSearchInputContainerStyles = xcss({
   flexGrow: 1
@@ -12,9 +14,15 @@ const basicSearchInputContainerStyles = xcss({
 const ConfluenceSearchContainer = ({
   cloudId,
   initialSearchValue,
+  initialFilterSelection,
   isSearching,
   onSearch
 }) => {
+  const {
+    hydrateUsersFromAccountIds,
+    users,
+    status
+  } = useBasicFilterHydration();
   const currentCloudId = useRef(cloudId);
   const [searchBarSearchString, setSearchBarSearchString] = useState(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : '');
   const [filterSelections, setFilterSelections] = useState({});
@@ -49,6 +57,20 @@ const ConfluenceSearchContainer = ({
     }
     return false;
   }, []);
+  useEffect(() => {
+    const accountIds = initialFilterSelection === null || initialFilterSelection === void 0 ? void 0 : initialFilterSelection[CLOLBasicFilters.editedOrCreatedBy];
+    const hasAccountIds = accountIds && accountIds.length > 0;
+    if (hasAccountIds && status === 'empty' && showBasicFilters) {
+      hydrateUsersFromAccountIds(accountIds);
+    }
+  }, [hydrateUsersFromAccountIds, initialFilterSelection, showBasicFilters, status]);
+  useEffect(() => {
+    if (status === 'resolved') {
+      setFilterSelections({
+        editedOrCreatedBy: users
+      });
+    }
+  }, [users, status]);
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     xcss: basicSearchInputContainerStyles
@@ -63,7 +85,8 @@ const ConfluenceSearchContainer = ({
   }), showBasicFilters && /*#__PURE__*/React.createElement(BasicFilters, {
     cloudId: cloudId,
     selections: filterSelections,
-    onChange: handleBasicFilterSelectionChange
+    onChange: handleBasicFilterSelectionChange,
+    isHydrating: status === 'loading'
   }));
 };
 export default ConfluenceSearchContainer;

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

@@ -99,6 +99,9 @@ export const PlainConfluenceSearchConfigModal = props => {
       contributorAccountIds
     })
   }), [cloudId, lastModified, contributorAccountIds, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  const initialFilterSelection = useMemo(() => ({
+    editedOrCreatedBy: (initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []
+  }), [initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds]);
   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) {
@@ -233,7 +236,18 @@ export const PlainConfluenceSearchConfigModal = props => {
   const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   const hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   const selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
-  const confluenceSearchUrl = selectedConfluenceSiteUrl && searchString !== undefined && `${selectedConfluenceSiteUrl}/wiki/search?text=${encodeURI(searchString)}`;
+  const confluenceSearchUrl = useMemo(() => {
+    if (!selectedConfluenceSiteUrl || searchString === undefined) {
+      return undefined;
+    }
+    const 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 `${selectedConfluenceSiteUrl}/wiki/search?${params.toString()}`;
+  }, [contributorAccountIds, searchString, selectedConfluenceSiteUrl]);
   const analyticsPayload = useMemo(() => ({
     extensionKey,
     destinationObjectTypes,
@@ -424,7 +438,8 @@ export const PlainConfluenceSearchConfigModal = props => {
     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()) : jsx(NoInstancesView, {
     title: confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,

package/dist/esm/services/mocks.js

@@ -276,4 +276,46 @@ export var mockUserRecommendationsResponse = {
       isConfluenceExternalCollaborator: false
     }
   }]
-};
+};
+export var 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 var 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/esm/services/useBasicFilterAGG.js

@@ -2,24 +2,22 @@ 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, userQuery } from './utils';
+import { fieldValuesQuery, hydrateJQLQuery, userHydration, userQuery } from './utils';
 var AGG_BASE_URL = '/gateway/api/graphql';
 export var useBasicFilterAGG = function useBasicFilterAGG() {
   var requestCall = useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(body) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(body, headers) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            return _context.abrupt("return", request('post', AGG_BASE_URL, body, {
-              'X-ExperimentalApi': 'JiraJqlBuilder'
-            }, [200, 201, 202, 203, 204]));
+            return _context.abrupt("return", 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);
     };
   }(), []);
@@ -31,6 +29,8 @@ export var useBasicFilterAGG = function useBasicFilterAGG() {
       },
       operationName: 'hydrate',
       query: hydrateJQLQuery
+    }, {
+      'X-ExperimentalApi': 'JiraJqlBuilder'
     });
   }, [requestCall]);
   var getFieldValues = useCallback(function (_ref2) {
@@ -52,6 +52,8 @@ export var useBasicFilterAGG = function useBasicFilterAGG() {
       },
       operationName: 'fieldValues',
       query: fieldValuesQuery
+    }, {
+      'X-ExperimentalApi': 'JiraJqlBuilder'
     });
   }, [requestCall]);
   var getCurrentUserInfo = useCallback(function () {
@@ -60,11 +62,21 @@ export var useBasicFilterAGG = function useBasicFilterAGG() {
       query: userQuery
     });
   }, [requestCall]);
+  var getUsersFromAccountIDs = useCallback(function (accountIds) {
+    return requestCall({
+      variables: {
+        accountIds: accountIds
+      },
+      operationName: 'userHydration',
+      query: userHydration
+    });
+  }, [requestCall]);
   return useMemo(function () {
     return {
       getHydratedJQL: getHydratedJQL,
       getFieldValues: getFieldValues,
-      getCurrentUserInfo: getCurrentUserInfo
+      getCurrentUserInfo: getCurrentUserInfo,
+      getUsersFromAccountIDs: getUsersFromAccountIDs
     };
-  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
+  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo, getUsersFromAccountIDs]);
 };

package/dist/esm/services/utils.js

@@ -7,4 +7,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 userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";
+export var userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";
+export var userHydration = "query userHydration($accountIds: [ID!]!) {\n  users(accountIds: $accountIds) {\n    accountId\n    name\n    picture\n  }\n}";

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

@@ -1,7 +1,7 @@
 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 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';
@@ -15,7 +15,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 = useCurrentUserInfo(),
     user = _useCurrentUserInfo.user;
   var _useIntl = useIntl(),
@@ -24,7 +26,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 = useRef(cloudId || '');
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     searchTerm = _useState2[0],
@@ -75,6 +79,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);
+  useEffect(function () {
+    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,
@@ -84,7 +96,7 @@ var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
     selectedOptions: selection,
     onSelectionChange: handleOptionSelection,
     onInputChange: handleInputChange,
-    showHydrating: false,
+    showHydrating: isHydrating,
     shouldShowFooter: false,
     status: status,
     onMenuOpen: handleMenuOpen,

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

@@ -0,0 +1,72 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+export var useBasicFilterHydration = function useBasicFilterHydration() {
+  var _useState = useState('empty'),
+    _useState2 = _slicedToArray(_useState, 2),
+    status = _useState2[0],
+    setStatus = _useState2[1];
+  var _useBasicFilterAGG = useBasicFilterAGG(),
+    getUsersFromAccountIDs = _useBasicFilterAGG.getUsersFromAccountIDs;
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_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 = useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(accountIds) {
+      var response;
+      return _regeneratorRuntime.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/esm/ui/confluence-search-modal/basic-filters/hooks/useCurrentUserInfo.js

@@ -12,7 +12,7 @@ export var useCurrentUserInfo = function useCurrentUserInfo() {
     getCurrentUserInfoFromAGG = _useBasicFilterAGG.getCurrentUserInfo;
   var getCurrentUserInfo = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var _user$data;
-    var user, _user$data2;
+    var user;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -20,11 +20,7 @@ export var useCurrentUserInfo = function useCurrentUserInfo() {
           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/esm/ui/confluence-search-modal/basic-filters/hooks/useRecommendation.js

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

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

@@ -9,7 +9,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.createElement(Flex, {
     xcss: basicFilterContainerStyles,
@@ -18,7 +19,8 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
   }, /*#__PURE__*/React.createElement(EditedOrCreatedByFilter, {
     cloudId: cloudId,
     onSelectionChange: onChange,
-    selection: editedOrCreatedBy || []
+    selection: editedOrCreatedBy || [],
+    isHydrating: isHydrating
   }), /*#__PURE__*/React.createElement(DateRangePicker, {
     onSelectionChange: onChange
   }));

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

@@ -9,6 +9,8 @@ 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 { useBasicFilterHydration } from '../basic-filters/hooks/useBasicFilterHydration';
+import { CLOLBasicFilters } from '../basic-filters/types';
 import { searchMessages } from './messages';
 var basicSearchInputContainerStyles = xcss({
   flexGrow: 1
@@ -16,8 +18,13 @@ var basicSearchInputContainerStyles = xcss({
 var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   var cloudId = _ref.cloudId,
     initialSearchValue = _ref.initialSearchValue,
+    initialFilterSelection = _ref.initialFilterSelection,
     isSearching = _ref.isSearching,
     onSearch = _ref.onSearch;
+  var _useBasicFilterHydrat = useBasicFilterHydration(),
+    hydrateUsersFromAccountIds = _useBasicFilterHydrat.hydrateUsersFromAccountIds,
+    users = _useBasicFilterHydrat.users,
+    status = _useBasicFilterHydrat.status;
   var currentCloudId = useRef(cloudId);
   var _useState = useState(initialSearchValue !== null && initialSearchValue !== void 0 ? initialSearchValue : ''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -57,6 +64,20 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     }
     return false;
   }, []);
+  useEffect(function () {
+    var accountIds = initialFilterSelection === null || initialFilterSelection === void 0 ? void 0 : initialFilterSelection[CLOLBasicFilters.editedOrCreatedBy];
+    var hasAccountIds = accountIds && accountIds.length > 0;
+    if (hasAccountIds && status === 'empty' && showBasicFilters) {
+      hydrateUsersFromAccountIds(accountIds);
+    }
+  }, [hydrateUsersFromAccountIds, initialFilterSelection, showBasicFilters, status]);
+  useEffect(function () {
+    if (status === 'resolved') {
+      setFilterSelections({
+        editedOrCreatedBy: users
+      });
+    }
+  }, [users, status]);
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     xcss: basicSearchInputContainerStyles
@@ -71,7 +92,8 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
   }), showBasicFilters && /*#__PURE__*/React.createElement(BasicFilters, {
     cloudId: cloudId,
     selections: filterSelections,
-    onChange: handleBasicFilterSelectionChange
+    onChange: handleBasicFilterSelectionChange,
+    isHydrating: status === 'loading'
   }));
 };
 export default ConfluenceSearchContainer;

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

@@ -125,6 +125,11 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       contributorAccountIds: contributorAccountIds
     });
   }, [cloudId, lastModified, contributorAccountIds, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  var initialFilterSelection = useMemo(function () {
+    return {
+      editedOrCreatedBy: (initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []
+    };
+  }, [initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds]);
   var isParametersSet = useMemo(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -288,7 +293,18 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   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 = 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 = useMemo(function () {
     return {
       extensionKey: extensionKey,
@@ -477,7 +493,8 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     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()) : jsx(NoInstancesView, {
     title: confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
     description: confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,

package/dist/types/services/mocks.d.ts

@@ -1,3 +1,4 @@
+import { SelectOption } from '../ui/common/modal/popup-select/types';
 import { FieldValuesResponse, HydrateResponse } from '../ui/jira-issues-modal/basic-filters/types';
 export declare const mockHydrateJqlResponse: HydrateResponse;
 export declare const mockFieldValuesResponse: FieldValuesResponse;
@@ -52,3 +53,13 @@ export declare const mockUserRecommendationsResponse: {
         email?: undefined;
     })[];
 };
+export declare const mockUserHydrationResponse: {
+    data: {
+        users: {
+            accountId: string;
+            name: string;
+            picture: string;
+        }[];
+    };
+};
+export declare const mockTransformedUserHydrationResponse: SelectOption[];

package/dist/types/services/useBasicFilterAGG.d.ts

@@ -1,4 +1,4 @@
-import { UserInfoAGGResponse } from '../ui/confluence-search-modal/basic-filters/types';
+import { UserHydrationAGGResponse, UserInfoAGGResponse } from '../ui/confluence-search-modal/basic-filters/types';
 import { BasicFilterFieldType, FieldValuesResponse, HydrateResponse } from '../ui/jira-issues-modal/basic-filters/types';
 interface GetFieldValuesProps {
     cloudId: string;
@@ -11,5 +11,6 @@ export declare const useBasicFilterAGG: () => {
     getHydratedJQL: (cloudId: string, jql: string) => Promise<HydrateResponse>;
     getFieldValues: ({ cloudId, jql, jqlTerm, searchString, pageCursor, }: GetFieldValuesProps) => Promise<FieldValuesResponse>;
     getCurrentUserInfo: () => Promise<UserInfoAGGResponse>;
+    getUsersFromAccountIDs: (accountIds: string[]) => Promise<UserHydrationAGGResponse>;
 };
 export {};

package/dist/types/services/utils.d.ts

@@ -7,3 +7,4 @@
 export declare const 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 declare const 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 declare const userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";
+export declare const userHydration = "query userHydration($accountIds: [ID!]!) {\n  users(accountIds: $accountIds) {\n    accountId\n    name\n    picture\n  }\n}";

package/dist/types/ui/common/modal/popup-select/types.d.ts

@@ -25,3 +25,7 @@ export type DateRangeOption = OptionBase & {
 };
 export type SelectOption = IconLabelOption | LozengeLabelOption | AvatarLabelOption | DateRangeOption;
 export type FormatOptionLabel = (option: SelectOption) => ReactElement;
+export interface CommonBasicFilterHookState {
+    status: 'empty' | 'loading' | 'resolved' | 'rejected';
+    errors: unknown[];
+}

package/dist/types/ui/confluence-search-modal/basic-filters/filters/edited-or-created-by/index.d.ts

@@ -4,7 +4,8 @@ import { CLOLBasicFilters } from '../../types';
 interface EditedOrCreatedByFilterProps {
     cloudId?: string;
     selection: SelectOption[];
+    isHydrating?: boolean;
     onSelectionChange: (filterType: CLOLBasicFilters, selection: SelectOption[]) => void;
 }
-declare const EditedOrCreatedByFilter: ({ cloudId, onSelectionChange, selection, }: EditedOrCreatedByFilterProps) => JSX.Element;
+declare const EditedOrCreatedByFilter: ({ cloudId, onSelectionChange, selection, isHydrating, }: EditedOrCreatedByFilterProps) => JSX.Element;
 export default EditedOrCreatedByFilter;

package/dist/types/ui/confluence-search-modal/basic-filters/hooks/useBasicFilterHydration.d.ts

@@ -0,0 +1,6 @@
+import { CommonBasicFilterHookState, SelectOption } from '../../../common/modal/popup-select/types';
+export interface BasicFilterHydrationState extends Omit<CommonBasicFilterHookState, 'errors'> {
+    hydrateUsersFromAccountIds: (accountIds: string[]) => void;
+    users: SelectOption[];
+}
+export declare const useBasicFilterHydration: () => BasicFilterHydrationState;

package/dist/types/ui/confluence-search-modal/basic-filters/index.d.ts

@@ -5,6 +5,7 @@ export interface BasicFilterContainerProps {
     cloudId?: string;
     selections: SelectedOptionsMap;
     onChange: (filterType: CLOLBasicFilters, options: SelectOption[]) => void;
+    isHydrating?: boolean;
 }
-declare const BasicFilterContainer: ({ cloudId, onChange, selections, }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ cloudId, onChange, selections, isHydrating, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;