@atlaskit/link-datasource 1.28.0 → 1.28.2

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

@@ -0,0 +1,113 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback, useRef, useState } from 'react';
+import { useIntl } from 'react-intl-next';
+import { getUserRecommendations } from '@atlaskit/smart-user-picker';
+var useRecommendation = function useRecommendation() {
+  var intl = useIntl();
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterOptions = _useState2[0],
+    setFilterOptions = _useState2[1];
+  var _useState3 = useState('empty'),
+    _useState4 = _slicedToArray(_useState3, 2),
+    status = _useState4[0],
+    setStatus = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errors = _useState6[0],
+    setErrors = _useState6[1];
+  var initialData = 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 = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+      var userId, cloudId, searchTerm, requestParams, initialResponseData, isRequestLikeInitialSearch, recommendations;
+      return _regeneratorRuntime.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 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 = useCallback(function () {
+    setStatus('empty');
+    setFilterOptions([]);
+    setErrors([]);
+  }, []);
+  return {
+    status: status,
+    errors: errors,
+    filterOptions: filterOptions,
+    reset: reset,
+    fetchFilterOptions: fetchFilterOptions
+  };
+};
+export default useRecommendation;

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

@@ -1,17 +1,26 @@
 import React from 'react';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { DateRangePicker } from './filters/date-range-picker';
+import EditedOrCreatedByFilter from './filters/edited-or-created-by';
 var basicFilterContainerStyles = 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.createElement(Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
     testId: "clol-basic-filter-container"
-  }, /*#__PURE__*/React.createElement(DateRangePicker, {
+  }, /*#__PURE__*/React.createElement(EditedOrCreatedByFilter, {
+    cloudId: cloudId,
+    onSelectionChange: onChange,
+    selection: editedOrCreatedBy || []
+  }), /*#__PURE__*/React.createElement(DateRangePicker, {
     onSelectionChange: onChange
-  }), /*#__PURE__*/React.createElement(React.Fragment, null));
+  }));
 };
 export default BasicFilterContainer;

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

@@ -3,9 +3,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useDebouncedCallback } from 'use-debounce';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
+import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
 import BasicFilters from '../basic-filters';
 import { searchMessages } from './messages';
 var basicSearchInputContainerStyles = xcss({
@@ -29,21 +31,26 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     var rawSearch = e.currentTarget.value;
     setSearchBarSearchString(rawSearch);
   }, []);
+  var _useDebouncedCallback = useDebouncedCallback(function (filterValues) {
+      onSearch(searchBarSearchString, filterValues);
+    }, FILTER_SELECTION_DEBOUNCE_MS),
+    _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
+    debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
+  var handleBasicFilterSelectionChange = useCallback(function (filterType, options) {
+    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, _defineProperty({}, filterType, options));
+    setFilterSelections(updatedSelection);
+    debouncedBasicFilterSelectionChange(updatedSelection);
+  }, [debouncedBasicFilterSelectionChange, filterSelections]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6827913
   useEffect(function () {
     if (currentCloudId.current !== cloudId) {
       setSearchBarSearchString('');
+      setFilterSelections({});
       currentCloudId.current = cloudId;
     }
   }, [cloudId]);
-  var handleBasicFilterSelectionChange = useCallback(function (filterType, options) {
-    var updatedSelection = _objectSpread(_objectSpread({}, filterSelections), {}, _defineProperty({}, filterType, options));
-    setFilterSelections(updatedSelection);
-    //TODO: move to debounce fn in https://product-fabric.atlassian.net/browse/EDM-9485
-    onSearch(searchBarSearchString, updatedSelection);
-  }, [filterSelections, onSearch, searchBarSearchString]);
   var showBasicFilters = useMemo(function () {
     if (getBooleanFF('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
@@ -62,6 +69,8 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     placeholder: searchMessages.searchLabel,
     fullWidth: !showBasicFilters
   }), showBasicFilters && /*#__PURE__*/React.createElement(BasicFilters, {
+    cloudId: cloudId,
+    selections: filterSelections,
     onChange: handleBasicFilterSelectionChange
   }));
 };

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

@@ -99,10 +99,14 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     _useState10 = _slicedToArray(_useState9, 2),
     visibleColumnKeys = _useState10[0],
     setVisibleColumnKeys = _useState10[1];
-  var _useState11 = useState(),
+  var _useState11 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified),
     _useState12 = _slicedToArray(_useState11, 2),
     lastModified = _useState12[0],
     setLastModified = _useState12[1];
+  var _useState13 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
+    _useState14 = _slicedToArray(_useState13, 2),
+    contributorAccountIds = _useState14[0],
+    setContributorAccountIds = _useState14[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
@@ -112,13 +116,15 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   var parameters = useMemo(function () {
-    return _objectSpread(_objectSpread({}, initialParameters), {}, {
+    return _objectSpread(_objectSpread(_objectSpread({}, initialParameters), {}, {
       cloudId: cloudId,
       searchString: searchString
-    }, lastModified && {
+    }, ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified) || lastModified) && {
       lastModified: lastModified
+    }), ((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0) && {
+      contributorAccountIds: contributorAccountIds
     });
-  }, [cloudId, lastModified, initialParameters, searchString /** Add more parameters when more filters are added */]);
+  }, [cloudId, lastModified, contributorAccountIds, initialParameters, searchString /** Add more parameters when more filters are added */]);
   var isParametersSet = useMemo(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -182,6 +188,8 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   var onSiteSelection = useCallback(function (site) {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
     setSearchString(undefined);
+    setLastModified(undefined);
+    setContributorAccountIds([]);
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true
@@ -224,17 +232,17 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
-  var _useState13 = useState(initialColumnCustomSizes),
-    _useState14 = _slicedToArray(_useState13, 2),
-    columnCustomSizes = _useState14[0],
-    setColumnCustomSizes = _useState14[1];
+  var _useState15 = useState(initialColumnCustomSizes),
+    _useState16 = _slicedToArray(_useState15, 2),
+    columnCustomSizes = _useState16[0],
+    setColumnCustomSizes = _useState16[1];
   var onColumnResize = useCallback(function (key, width) {
     setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, _defineProperty({}, key, width)));
   }, [columnCustomSizes]);
-  var _useState15 = useState(initialWrappedColumnKeys),
-    _useState16 = _slicedToArray(_useState15, 2),
-    wrappedColumnKeys = _useState16[0],
-    setWrappedColumnKeys = _useState16[1];
+  var _useState17 = useState(initialWrappedColumnKeys),
+    _useState18 = _slicedToArray(_useState17, 2),
+    wrappedColumnKeys = _useState18[0],
+    setWrappedColumnKeys = _useState18[1];
   var onWrappedColumnChange = useCallback(function (key, isWrapped) {
     var set = new Set(wrappedColumnKeys);
     if (isWrapped) {
@@ -416,11 +424,21 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   var onSearch = useCallback(function (newSearchString, filters) {
     searchCount.current++;
     userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
-    if (filters !== null && filters !== void 0 && filters.lastModified) {
-      var lastModifiedValue = filters.lastModified.find(function (range) {
-        return range.value;
-      });
-      setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+    if (filters) {
+      var editedOrCreatedBy = filters.editedOrCreatedBy,
+        _lastModified = filters.lastModified;
+      if (_lastModified) {
+        var lastModifiedValue = _lastModified.find(function (range) {
+          return range.value;
+        });
+        setLastModified(lastModifiedValue === null || lastModifiedValue === void 0 ? void 0 : lastModifiedValue.value);
+      }
+      if (editedOrCreatedBy) {
+        var accountIds = editedOrCreatedBy.map(function (user) {
+          return user.value;
+        });
+        setContributorAccountIds(accountIds);
+      }
     }
     setSearchString(newSearchString);
     reset({

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

@@ -1,3 +1,54 @@
 import { FieldValuesResponse, HydrateResponse } from '../ui/jira-issues-modal/basic-filters/types';
 export declare const mockHydrateJqlResponse: HydrateResponse;
 export declare const mockFieldValuesResponse: FieldValuesResponse;
+export declare const mockUserRecommendationsResponse: {
+    recommendedUsers: ({
+        entityType: string;
+        id: string;
+        name: string;
+        avatarUrl: string;
+        nickname: string;
+        matchPositions: {};
+        accessLevel: string;
+        accountStatus: string;
+        notMentionable: boolean;
+        userType: string;
+        attributes: {
+            isConfluenceExternalCollaborator: boolean;
+        };
+        email?: undefined;
+        locale?: undefined;
+    } | {
+        entityType: string;
+        id: string;
+        name: string;
+        email: string;
+        avatarUrl: string;
+        nickname: string;
+        matchPositions: {};
+        accessLevel: string;
+        accountStatus: string;
+        notMentionable: boolean;
+        locale: string;
+        userType: string;
+        attributes: {
+            isConfluenceExternalCollaborator: boolean;
+        };
+    } | {
+        entityType: string;
+        id: string;
+        name: string;
+        avatarUrl: string;
+        nickname: string;
+        matchPositions: {};
+        accessLevel: string;
+        accountStatus: string;
+        notMentionable: boolean;
+        locale: string;
+        userType: string;
+        attributes: {
+            isConfluenceExternalCollaborator: boolean;
+        };
+        email?: undefined;
+    })[];
+};

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

@@ -1,3 +1,4 @@
+import { 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;
@@ -9,5 +10,6 @@ interface GetFieldValuesProps {
 export declare const useBasicFilterAGG: () => {
     getHydratedJQL: (cloudId: string, jql: string) => Promise<HydrateResponse>;
     getFieldValues: ({ cloudId, jql, jqlTerm, searchString, pageCursor, }: GetFieldValuesProps) => Promise<FieldValuesResponse>;
+    getCurrentUserInfo: () => Promise<UserInfoAGGResponse>;
 };
 export {};

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

@@ -6,3 +6,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}";

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

@@ -4,7 +4,7 @@ import { CustomMenuListProps } from './menu-list';
 import { SelectOption } from './types';
 export interface FilterPopupSelectProps {
     buttonLabel: string;
-    totalCount: number;
+    totalCount?: number;
     filterName: string;
     isDisabled: boolean;
     showLoading: boolean;

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import { SelectOption } from '../../../../common/modal/popup-select/types';
+import { CLOLBasicFilters } from '../../types';
+interface EditedOrCreatedByFilterProps {
+    cloudId?: string;
+    selection: SelectOption[];
+    onSelectionChange: (filterType: CLOLBasicFilters, selection: SelectOption[]) => void;
+}
+declare const EditedOrCreatedByFilter: ({ cloudId, onSelectionChange, selection, }: EditedOrCreatedByFilterProps) => JSX.Element;
+export default EditedOrCreatedByFilter;

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

@@ -0,0 +1,7 @@
+export declare const editedOrCreatedByMessage: {
+    buttonLabel: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

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

@@ -0,0 +1,7 @@
+import { UserInfo } from '../types';
+interface useUserInfoState {
+    user?: UserInfo;
+    getCurrentUserInfo: () => Promise<void>;
+}
+export declare const useCurrentUserInfo: () => useUserInfoState;
+export {};

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

@@ -0,0 +1,16 @@
+import { FilterPopupSelectProps } from '../../../common/modal/popup-select';
+import { SelectOption } from '../../../common/modal/popup-select/types';
+interface FetchFilterOptionsProps {
+    cloudId: string;
+    userId: string;
+    searchTerm: string;
+}
+interface UserRecommendationState {
+    filterOptions: SelectOption[];
+    reset: () => void;
+    status: FilterPopupSelectProps['status'];
+    errors: unknown[];
+    fetchFilterOptions: (prop: FetchFilterOptionsProps) => Promise<any>;
+}
+declare const useRecommendation: () => UserRecommendationState;
+export default useRecommendation;

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

@@ -1,8 +1,10 @@
 /// <reference types="react" />
 import { SelectOption } from '../../common/modal/popup-select/types';
-import { CLOLBasicFilters } from './types';
+import { CLOLBasicFilters, SelectedOptionsMap } from './types';
 export interface BasicFilterContainerProps {
+    cloudId?: string;
+    selections: SelectedOptionsMap;
     onChange: (filterType: CLOLBasicFilters, options: SelectOption[]) => void;
 }
-declare const BasicFilterContainer: ({ onChange }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ cloudId, onChange, selections, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types-ts4.5/services/mocks.d.ts

@@ -1,3 +1,54 @@
 import { FieldValuesResponse, HydrateResponse } from '../ui/jira-issues-modal/basic-filters/types';
 export declare const mockHydrateJqlResponse: HydrateResponse;
 export declare const mockFieldValuesResponse: FieldValuesResponse;
+export declare const mockUserRecommendationsResponse: {
+    recommendedUsers: ({
+        entityType: string;
+        id: string;
+        name: string;
+        avatarUrl: string;
+        nickname: string;
+        matchPositions: {};
+        accessLevel: string;
+        accountStatus: string;
+        notMentionable: boolean;
+        userType: string;
+        attributes: {
+            isConfluenceExternalCollaborator: boolean;
+        };
+        email?: undefined;
+        locale?: undefined;
+    } | {
+        entityType: string;
+        id: string;
+        name: string;
+        email: string;
+        avatarUrl: string;
+        nickname: string;
+        matchPositions: {};
+        accessLevel: string;
+        accountStatus: string;
+        notMentionable: boolean;
+        locale: string;
+        userType: string;
+        attributes: {
+            isConfluenceExternalCollaborator: boolean;
+        };
+    } | {
+        entityType: string;
+        id: string;
+        name: string;
+        avatarUrl: string;
+        nickname: string;
+        matchPositions: {};
+        accessLevel: string;
+        accountStatus: string;
+        notMentionable: boolean;
+        locale: string;
+        userType: string;
+        attributes: {
+            isConfluenceExternalCollaborator: boolean;
+        };
+        email?: undefined;
+    })[];
+};

package/dist/types-ts4.5/services/useBasicFilterAGG.d.ts

@@ -1,3 +1,4 @@
+import { 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;
@@ -9,5 +10,6 @@ interface GetFieldValuesProps {
 export declare const useBasicFilterAGG: () => {
     getHydratedJQL: (cloudId: string, jql: string) => Promise<HydrateResponse>;
     getFieldValues: ({ cloudId, jql, jqlTerm, searchString, pageCursor, }: GetFieldValuesProps) => Promise<FieldValuesResponse>;
+    getCurrentUserInfo: () => Promise<UserInfoAGGResponse>;
 };
 export {};

package/dist/types-ts4.5/services/utils.d.ts

@@ -6,3 +6,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}";

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

@@ -4,7 +4,7 @@ import { CustomMenuListProps } from './menu-list';
 import { SelectOption } from './types';
 export interface FilterPopupSelectProps {
     buttonLabel: string;
-    totalCount: number;
+    totalCount?: number;
     filterName: string;
     isDisabled: boolean;
     showLoading: boolean;

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import { SelectOption } from '../../../../common/modal/popup-select/types';
+import { CLOLBasicFilters } from '../../types';
+interface EditedOrCreatedByFilterProps {
+    cloudId?: string;
+    selection: SelectOption[];
+    onSelectionChange: (filterType: CLOLBasicFilters, selection: SelectOption[]) => void;
+}
+declare const EditedOrCreatedByFilter: ({ cloudId, onSelectionChange, selection, }: EditedOrCreatedByFilterProps) => JSX.Element;
+export default EditedOrCreatedByFilter;

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

@@ -0,0 +1,7 @@
+export declare const editedOrCreatedByMessage: {
+    buttonLabel: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/hooks/useCurrentUserInfo.d.ts

@@ -0,0 +1,7 @@
+import { UserInfo } from '../types';
+interface useUserInfoState {
+    user?: UserInfo;
+    getCurrentUserInfo: () => Promise<void>;
+}
+export declare const useCurrentUserInfo: () => useUserInfoState;
+export {};

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/hooks/useRecommendation.d.ts

@@ -0,0 +1,16 @@
+import { FilterPopupSelectProps } from '../../../common/modal/popup-select';
+import { SelectOption } from '../../../common/modal/popup-select/types';
+interface FetchFilterOptionsProps {
+    cloudId: string;
+    userId: string;
+    searchTerm: string;
+}
+interface UserRecommendationState {
+    filterOptions: SelectOption[];
+    reset: () => void;
+    status: FilterPopupSelectProps['status'];
+    errors: unknown[];
+    fetchFilterOptions: (prop: FetchFilterOptionsProps) => Promise<any>;
+}
+declare const useRecommendation: () => UserRecommendationState;
+export default useRecommendation;

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

@@ -1,8 +1,10 @@
 /// <reference types="react" />
 import { SelectOption } from '../../common/modal/popup-select/types';
-import { CLOLBasicFilters } from './types';
+import { CLOLBasicFilters, SelectedOptionsMap } from './types';
 export interface BasicFilterContainerProps {
+    cloudId?: string;
+    selections: SelectedOptionsMap;
     onChange: (filterType: CLOLBasicFilters, options: SelectOption[]) => void;
 }
-declare const BasicFilterContainer: ({ onChange }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ cloudId, onChange, selections, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.28.0",
+  "version": "1.28.2",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,17 +31,17 @@
     "analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.9.0",
+    "@atlaskit/adf-schema": "^35.9.2",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/avatar": "^21.5.0",
     "@atlaskit/avatar-group": "^9.5.0",
     "@atlaskit/badge": "^16.0.0",
-    "@atlaskit/button": "^17.12.0",
+    "@atlaskit/button": "^17.13.0",
     "@atlaskit/dropdown-menu": "^12.9.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/empty-state": "^7.8.0",
-    "@atlaskit/form": "^9.2.0",
-    "@atlaskit/heading": "^2.1.0",
+    "@atlaskit/form": "^9.3.0",
+    "@atlaskit/heading": "^2.2.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/image": "^1.1.0",
@@ -64,7 +64,8 @@
     "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
     "@atlaskit/primitives": "^5.5.0",
     "@atlaskit/select": "^17.6.0",
-    "@atlaskit/smart-card": "^26.56.0",
+    "@atlaskit/smart-card": "^26.57.0",
+    "@atlaskit/smart-user-picker": "6.9.2",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "6.1.3",