@atlaskit/smart-user-picker 8.7.0 → 8.9.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlassian/smart-user-picker
 
+## 8.9.0
+
+### Minor Changes
+
+- [`1d3de95b5af00`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d3de95b5af00) -
+  Refactor verifiedTeams filter
+
+## 8.8.0
+
+### Minor Changes
+
+- [`386987f274ff5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/386987f274ff5) -
+  Add support for `restrictTo` prop to filter recommendations by user IDs and group IDs. This allows
+  filtering down results based on specific groups or users in a site.
+
+  **New prop:** `restrictTo?: { userIds?: string[], groupIds?: string[] }`
+
+  This prop is passed directly to the URS recommendations endpoint's `searchQuery.restrictTo` field,
+  enabling you to constrain recommendations to a specific set of users and/or groups.
+
+  **Feature gate:** `smart-user-picker-restrict-to-gate` - The prop is only forwarded to the backend
+  when this feature gate is enabled.
+
 ## 8.7.0
 
 ### Minor Changes

package/dist/cjs/components/SmartUserPicker.js

@@ -34,11 +34,11 @@ var _service = require("../service");
 var _ufoExperiences = require("../ufoExperiences");
 var _excluded = ["allowEmail", "enableEmailSearch", "allowEmailSelectionWhenEmailMatched"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-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) { (0, _defineProperty2.default)(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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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) { (0, _defineProperty2.default)(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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var DEFAULT_DEBOUNCE_TIME_MS = 150;
@@ -118,16 +118,16 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
     });
     (0, _defineProperty2.default)(_this, "memoizedFilterOptions", (0, _memoizeOne.default)(_this.filterOptions));
     (0, _defineProperty2.default)(_this, "getUsers", (0, _debounce.default)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, principalId, productAttributes, productKey, searchQueryFilter, siteId, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli;
+      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, principalId, productAttributes, productKey, restrictTo, searchQueryFilter, siteId, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _this$state = _this.state, query = _this$state.query, sessionId = _this$state.sessionId, closed = _this$state.closed;
-            _this$props = _this.props, baseUrl = _this$props.baseUrl, childObjectId = _this$props.childObjectId, containerId = _this$props.containerId, fieldId = _this$props.fieldId, includeGroups = _this$props.includeGroups, includeTeams = _this$props.includeTeams, includeTeamsUpdates = _this$props.includeTeamsUpdates, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, fetchOptions = _this$props.fetchOptions, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, displayEmailInByline = _this$props.displayEmailInByline, verifiedTeams = _this$props.verifiedTeams, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions, userResolvers = _this$props.userResolvers, enableEmailSearch = _this$props.enableEmailSearch;
+            _this$props = _this.props, baseUrl = _this$props.baseUrl, childObjectId = _this$props.childObjectId, containerId = _this$props.containerId, fieldId = _this$props.fieldId, includeGroups = _this$props.includeGroups, includeTeams = _this$props.includeTeams, includeTeamsUpdates = _this$props.includeTeamsUpdates, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, fetchOptions = _this$props.fetchOptions, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, displayEmailInByline = _this$props.displayEmailInByline, verifiedTeams = _this$props.verifiedTeams, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, restrictTo = _this$props.restrictTo, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions, userResolvers = _this$props.userResolvers, enableEmailSearch = _this$props.enableEmailSearch;
             maxNumberOfResults = maxOptions || 100;
             startTime = window.performance.now(); // Check if this is an email search
             isEmail = enableEmailSearch && isEmailQuery(query);
-            recommendationsRequest = {
+            recommendationsRequest = _objectSpread({
               baseUrl: baseUrl,
               context: {
                 containerId: containerId,
@@ -149,7 +149,8 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail,
-              verifiedTeams: verifiedTeams,
+              // Only request verified teams when both the prop is true and the feature flag is enabled
+              verifiedTeams: verifiedTeams && (0, _platformFeatureFlags.fg)('smart-user-picker-managed-teams-gate'),
               /*
               	For email-based searches, we have decided to filter out apps.
               	Also - because the other 2 filters ((NOT not_mentionable:true) AND (account_status:active)) are included
@@ -157,7 +158,9 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               		Further ref: https://developer.atlassian.com/platform/user-recommendations/guides/frequently-asked-questions/#filter-behavior
                */
               searchQueryFilter: isEmail && !searchQueryFilter ? '(NOT not_mentionable:true) AND (account_status:active) AND (NOT account_type:app)' : searchQueryFilter
-            };
+            }, restrictTo && (0, _platformFeatureFlags.fg)('smart-user-picker-restrict-to-gate') && {
+              restrictTo: restrictTo
+            });
             _context.prev = 6;
             _query = _this.state.query;
             _this.fireEvent(_analytics.requestUsersEvent);
@@ -253,19 +256,6 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               }
             }
 
-            // Filter to only verified teams when verifiedTeams is true and feature flag is enabled
-            if (verifiedTeams && includeTeams && (0, _platformFeatureFlags.fg)('smart-user-picker-managed-teams-gate')) {
-              recommendedUsers = recommendedUsers.filter(function (option) {
-                if ((0, _userPicker.isTeam)(option)) {
-                  // Only include teams that are verified
-                  // The verified property is set by the transformer from the server response
-                  var team = option;
-                  return team.verified === true;
-                }
-                return true; // Keep non-team options
-              });
-            }
-
             // Track if email search found matches for conditional allowEmail logic
             if (isEmail) {
               _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
@@ -274,50 +264,50 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 42;
+              _context.next = 41;
               break;
             }
-            _context.next = 39;
+            _context.next = 38;
             return transformOptions(recommendedUsers, _query);
-          case 39:
+          case 38:
             _context.t0 = _context.sent;
-            _context.next = 43;
+            _context.next = 42;
             break;
-          case 42:
+          case 41:
             _context.t0 = recommendedUsers;
-          case 43:
+          case 42:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 59;
+              _context.next = 58;
               break;
             }
-            _context.next = 47;
+            _context.next = 46;
             return onEmpty(_query);
-          case 47:
+          case 46:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 51;
+              _context.next = 50;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 51:
+          case 50:
             if (!_context.t2) {
-              _context.next = 55;
+              _context.next = 54;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 56;
+            _context.next = 55;
             break;
-          case 55:
+          case 54:
             _context.t4 = [];
-          case 56:
+          case 55:
             _context.t1 = _context.t4;
-            _context.next = 60;
+            _context.next = 59;
             break;
-          case 59:
+          case 58:
             _context.t1 = transformedOptions;
-          case 60:
+          case 59:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -339,10 +329,10 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
                 loading: loading
               };
             });
-            _context.next = 93;
+            _context.next = 92;
             break;
-          case 64:
-            _context.prev = 64;
+          case 63:
+            _context.prev = 63;
             _context.t5 = _context["catch"](6);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -355,35 +345,35 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 71;
+            _context.prev = 70;
             if (!onError) {
-              _context.next = 81;
+              _context.next = 80;
               break;
             }
-            _context.next = 75;
+            _context.next = 74;
             return onError(_context.t5, recommendationsRequest);
-          case 75:
+          case 74:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 78;
+              _context.next = 77;
               break;
             }
             _context.t7 = [];
-          case 78:
+          case 77:
             _context.t6 = _context.t7;
-            _context.next = 82;
+            _context.next = 81;
             break;
-          case 81:
+          case 80:
             _context.t6 = [];
-          case 82:
+          case 81:
             defaultUsers = _context.t6;
-            _context.next = 88;
+            _context.next = 87;
             break;
-          case 85:
-            _context.prev = 85;
-            _context.t8 = _context["catch"](71);
+          case 84:
+            _context.prev = 84;
+            _context.t8 = _context["catch"](70);
             onErrorProducedError = true;
-          case 88:
+          case 87:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -400,11 +390,11 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 93:
+          case 92:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 64], [71, 85]]);
+      }, _callee, null, [[6, 63], [70, 84]]);
     })), (_this$props$debounceT = _this.props.debounceTime) !== null && _this$props$debounceT !== void 0 ? _this$props$debounceT : 0));
     (0, _defineProperty2.default)(_this, "onInputChange", function (newQuery, sessionId) {
       var query = newQuery || '';

package/dist/cjs/service/recommendation-client.js

@@ -27,6 +27,7 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
+      isVerifiedTeamFilter: request.verifiedTeams,
       searchQuery: _objectSpread(_objectSpread({
         cpusQueryHighlights: {
           query: '',
@@ -40,7 +41,7 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
         filter: request.searchQueryFilter || '',
         minimumAccessLevel: 'APPLICATION',
         queryString: request.query,
-        restrictTo: {
+        restrictTo: request.restrictTo || {
           userIds: [],
           groupIds: []
         },

package/dist/es2019/components/SmartUserPicker.js

@@ -108,6 +108,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         principalId,
         productAttributes,
         productKey,
+        restrictTo,
         searchQueryFilter,
         siteId,
         transformOptions,
@@ -141,14 +142,18 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         maxNumberOfResults,
         query,
         searchEmail: isEmail,
-        verifiedTeams,
+        // Only request verified teams when both the prop is true and the feature flag is enabled
+        verifiedTeams: verifiedTeams && fg('smart-user-picker-managed-teams-gate'),
         /*
         	For email-based searches, we have decided to filter out apps.
         	Also - because the other 2 filters ((NOT not_mentionable:true) AND (account_status:active)) are included
         	when filter is empty, they have been added here to maintain consistency.
         		Further ref: https://developer.atlassian.com/platform/user-recommendations/guides/frequently-asked-questions/#filter-behavior
          */
-        searchQueryFilter: isEmail && !searchQueryFilter ? '(NOT not_mentionable:true) AND (account_status:active) AND (NOT account_type:app)' : searchQueryFilter
+        searchQueryFilter: isEmail && !searchQueryFilter ? '(NOT not_mentionable:true) AND (account_status:active) AND (NOT account_type:app)' : searchQueryFilter,
+        ...(restrictTo && fg('smart-user-picker-restrict-to-gate') && {
+          restrictTo
+        })
       };
       try {
         var _await$onEmpty;
@@ -200,19 +205,6 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
           }
         }
 
-        // Filter to only verified teams when verifiedTeams is true and feature flag is enabled
-        if (verifiedTeams && includeTeams && fg('smart-user-picker-managed-teams-gate')) {
-          recommendedUsers = recommendedUsers.filter(option => {
-            if (isTeam(option)) {
-              // Only include teams that are verified
-              // The verified property is set by the transformer from the server response
-              const team = option;
-              return team.verified === true;
-            }
-            return true; // Keep non-team options
-          });
-        }
-
         // Track if email search found matches for conditional allowEmail logic
         if (isEmail) {
           this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;

package/dist/es2019/service/recommendation-client.js

@@ -17,6 +17,7 @@ const getUserRecommendations = (request, intl) => {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
+      isVerifiedTeamFilter: request.verifiedTeams,
       searchQuery: {
         cpusQueryHighlights: {
           query: '',
@@ -30,7 +31,7 @@ const getUserRecommendations = (request, intl) => {
         filter: request.searchQueryFilter || '',
         minimumAccessLevel: 'APPLICATION',
         queryString: request.query,
-        restrictTo: {
+        restrictTo: request.restrictTo || {
           userIds: [],
           groupIds: []
         },

package/dist/esm/components/SmartUserPicker.js

@@ -11,11 +11,11 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["allowEmail", "enableEmailSearch", "allowEmailSelectionWhenEmailMatched"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
@@ -110,16 +110,16 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
     });
     _defineProperty(_this, "memoizedFilterOptions", memoizeOne(_this.filterOptions));
     _defineProperty(_this, "getUsers", debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, principalId, productAttributes, productKey, searchQueryFilter, siteId, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli;
+      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, principalId, productAttributes, productKey, restrictTo, searchQueryFilter, siteId, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _this$state = _this.state, query = _this$state.query, sessionId = _this$state.sessionId, closed = _this$state.closed;
-            _this$props = _this.props, baseUrl = _this$props.baseUrl, childObjectId = _this$props.childObjectId, containerId = _this$props.containerId, fieldId = _this$props.fieldId, includeGroups = _this$props.includeGroups, includeTeams = _this$props.includeTeams, includeTeamsUpdates = _this$props.includeTeamsUpdates, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, fetchOptions = _this$props.fetchOptions, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, displayEmailInByline = _this$props.displayEmailInByline, verifiedTeams = _this$props.verifiedTeams, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions, userResolvers = _this$props.userResolvers, enableEmailSearch = _this$props.enableEmailSearch;
+            _this$props = _this.props, baseUrl = _this$props.baseUrl, childObjectId = _this$props.childObjectId, containerId = _this$props.containerId, fieldId = _this$props.fieldId, includeGroups = _this$props.includeGroups, includeTeams = _this$props.includeTeams, includeTeamsUpdates = _this$props.includeTeamsUpdates, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, fetchOptions = _this$props.fetchOptions, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, displayEmailInByline = _this$props.displayEmailInByline, verifiedTeams = _this$props.verifiedTeams, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, restrictTo = _this$props.restrictTo, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions, userResolvers = _this$props.userResolvers, enableEmailSearch = _this$props.enableEmailSearch;
             maxNumberOfResults = maxOptions || 100;
             startTime = window.performance.now(); // Check if this is an email search
             isEmail = enableEmailSearch && isEmailQuery(query);
-            recommendationsRequest = {
+            recommendationsRequest = _objectSpread({
               baseUrl: baseUrl,
               context: {
                 containerId: containerId,
@@ -141,7 +141,8 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail,
-              verifiedTeams: verifiedTeams,
+              // Only request verified teams when both the prop is true and the feature flag is enabled
+              verifiedTeams: verifiedTeams && fg('smart-user-picker-managed-teams-gate'),
               /*
               	For email-based searches, we have decided to filter out apps.
               	Also - because the other 2 filters ((NOT not_mentionable:true) AND (account_status:active)) are included
@@ -149,7 +150,9 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               		Further ref: https://developer.atlassian.com/platform/user-recommendations/guides/frequently-asked-questions/#filter-behavior
                */
               searchQueryFilter: isEmail && !searchQueryFilter ? '(NOT not_mentionable:true) AND (account_status:active) AND (NOT account_type:app)' : searchQueryFilter
-            };
+            }, restrictTo && fg('smart-user-picker-restrict-to-gate') && {
+              restrictTo: restrictTo
+            });
             _context.prev = 6;
             _query = _this.state.query;
             _this.fireEvent(requestUsersEvent);
@@ -245,19 +248,6 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               }
             }
 
-            // Filter to only verified teams when verifiedTeams is true and feature flag is enabled
-            if (verifiedTeams && includeTeams && fg('smart-user-picker-managed-teams-gate')) {
-              recommendedUsers = recommendedUsers.filter(function (option) {
-                if (isTeam(option)) {
-                  // Only include teams that are verified
-                  // The verified property is set by the transformer from the server response
-                  var team = option;
-                  return team.verified === true;
-                }
-                return true; // Keep non-team options
-              });
-            }
-
             // Track if email search found matches for conditional allowEmail logic
             if (isEmail) {
               _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
@@ -266,50 +256,50 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 42;
+              _context.next = 41;
               break;
             }
-            _context.next = 39;
+            _context.next = 38;
             return transformOptions(recommendedUsers, _query);
-          case 39:
+          case 38:
             _context.t0 = _context.sent;
-            _context.next = 43;
+            _context.next = 42;
             break;
-          case 42:
+          case 41:
             _context.t0 = recommendedUsers;
-          case 43:
+          case 42:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 59;
+              _context.next = 58;
               break;
             }
-            _context.next = 47;
+            _context.next = 46;
             return onEmpty(_query);
-          case 47:
+          case 46:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 51;
+              _context.next = 50;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 51:
+          case 50:
             if (!_context.t2) {
-              _context.next = 55;
+              _context.next = 54;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 56;
+            _context.next = 55;
             break;
-          case 55:
+          case 54:
             _context.t4 = [];
-          case 56:
+          case 55:
             _context.t1 = _context.t4;
-            _context.next = 60;
+            _context.next = 59;
             break;
-          case 59:
+          case 58:
             _context.t1 = transformedOptions;
-          case 60:
+          case 59:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -331,10 +321,10 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
                 loading: loading
               };
             });
-            _context.next = 93;
+            _context.next = 92;
             break;
-          case 64:
-            _context.prev = 64;
+          case 63:
+            _context.prev = 63;
             _context.t5 = _context["catch"](6);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -347,35 +337,35 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 71;
+            _context.prev = 70;
             if (!onError) {
-              _context.next = 81;
+              _context.next = 80;
               break;
             }
-            _context.next = 75;
+            _context.next = 74;
             return onError(_context.t5, recommendationsRequest);
-          case 75:
+          case 74:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 78;
+              _context.next = 77;
               break;
             }
             _context.t7 = [];
-          case 78:
+          case 77:
             _context.t6 = _context.t7;
-            _context.next = 82;
+            _context.next = 81;
             break;
-          case 81:
+          case 80:
             _context.t6 = [];
-          case 82:
+          case 81:
             defaultUsers = _context.t6;
-            _context.next = 88;
+            _context.next = 87;
             break;
-          case 85:
-            _context.prev = 85;
-            _context.t8 = _context["catch"](71);
+          case 84:
+            _context.prev = 84;
+            _context.t8 = _context["catch"](70);
             onErrorProducedError = true;
-          case 88:
+          case 87:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -392,11 +382,11 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 93:
+          case 92:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 64], [71, 85]]);
+      }, _callee, null, [[6, 63], [70, 84]]);
     })), (_this$props$debounceT = _this.props.debounceTime) !== null && _this$props$debounceT !== void 0 ? _this$props$debounceT : 0));
     _defineProperty(_this, "onInputChange", function (newQuery, sessionId) {
       var query = newQuery || '';

package/dist/esm/service/recommendation-client.js

@@ -20,6 +20,7 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
+      isVerifiedTeamFilter: request.verifiedTeams,
       searchQuery: _objectSpread(_objectSpread({
         cpusQueryHighlights: {
           query: '',
@@ -33,7 +34,7 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
         filter: request.searchQueryFilter || '',
         minimumAccessLevel: 'APPLICATION',
         queryString: request.query,
-        restrictTo: {
+        restrictTo: request.restrictTo || {
           userIds: [],
           groupIds: []
         },

package/dist/types/types.d.ts

@@ -12,6 +12,10 @@ export interface Context {
     organizationId?: string;
     productAttributes?: ProductAttributes;
 }
+export interface RestrictionFilter {
+    userIds?: string[];
+    groupIds?: string[];
+}
 export interface RecommendationRequest {
     baseUrl?: string;
     context: Context;
@@ -24,6 +28,7 @@ export interface RecommendationRequest {
     includeNonLicensedUsers?: boolean;
     searchEmail?: boolean;
     verifiedTeams?: boolean;
+    restrictTo?: RestrictionFilter;
 }
 type OnError = (error: any, request: RecommendationRequest) => Promise<OptionData[]> | void;
 type OnValueError = (error: any, defaultValue: DefaultValue) => Promise<OptionData[]> | void;
@@ -247,6 +252,12 @@ export interface SmartProps {
     isFooterFocused?: boolean;
     /** Sets if the footer is focused or not. This is needed to keep the menu open when the footer is focused */
     setIsFooterFocused?: React.Dispatch<React.SetStateAction<boolean>>;
+    /**
+     * Restricts the recommendations to specific users and/or groups.
+     * If provided, only users matching the provided user IDs and/or groups matching the provided group IDs will be included in the results.
+     * @example { userIds: ["123", "456"], groupIds: ["789"] }
+     */
+    restrictTo?: RestrictionFilter;
 }
 export interface Props extends SmartProps, UserPickerProps, WithAnalyticsEventsProps {
     /**

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

@@ -12,6 +12,10 @@ export interface Context {
     organizationId?: string;
     productAttributes?: ProductAttributes;
 }
+export interface RestrictionFilter {
+    userIds?: string[];
+    groupIds?: string[];
+}
 export interface RecommendationRequest {
     baseUrl?: string;
     context: Context;
@@ -24,6 +28,7 @@ export interface RecommendationRequest {
     includeNonLicensedUsers?: boolean;
     searchEmail?: boolean;
     verifiedTeams?: boolean;
+    restrictTo?: RestrictionFilter;
 }
 type OnError = (error: any, request: RecommendationRequest) => Promise<OptionData[]> | void;
 type OnValueError = (error: any, defaultValue: DefaultValue) => Promise<OptionData[]> | void;
@@ -247,6 +252,12 @@ export interface SmartProps {
     isFooterFocused?: boolean;
     /** Sets if the footer is focused or not. This is needed to keep the menu open when the footer is focused */
     setIsFooterFocused?: React.Dispatch<React.SetStateAction<boolean>>;
+    /**
+     * Restricts the recommendations to specific users and/or groups.
+     * If provided, only users matching the provided user IDs and/or groups matching the provided group IDs will be included in the results.
+     * @example { userIds: ["123", "456"], groupIds: ["789"] }
+     */
+    restrictTo?: RestrictionFilter;
 }
 export interface Props extends SmartProps, UserPickerProps, WithAnalyticsEventsProps {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-user-picker",
-	"version": "8.7.0",
+	"version": "8.9.0",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/ufo": "^0.4.0",
-		"@atlaskit/user-picker": "^11.18.0",
+		"@atlaskit/user-picker": "^11.19.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
@@ -51,9 +51,9 @@
 	},
 	"devDependencies": {
 		"@atlaskit/select": "^21.6.0",
-		"@atlaskit/util-data-test": "^18.3.0",
+		"@atlaskit/util-data-test": "^18.4.0",
 		"@testing-library/dom": "^10.1.0",
-		"@testing-library/react": "^13.4.0",
+		"@testing-library/react": "^16.3.0",
 		"@testing-library/user-event": "^14.4.3",
 		"enzyme": "^3.10.0",
 		"fetch-mock": "^8.0.0",
@@ -69,6 +69,9 @@
 		},
 		"smart-user-picker-managed-teams-gate": {
 			"type": "boolean"
+		},
+		"smart-user-picker-restrict-to-gate": {
+			"type": "boolean"
 		}
 	}
 }