@atlaskit/smart-user-picker 8.5.0 → 8.7.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlassian/smart-user-picker
 
+## 8.7.0
+
+### Minor Changes
+
+- [`ae3f597598ae8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ae3f597598ae8) -
+  Added prop to toggle the ability to return only verified teams. Only applies when includeTeams is
+  true.
+
+## 8.6.0
+
+### Minor Changes
+
+- [`0d41d4c92fe89`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0d41d4c92fe89) -
+  [ux] Added `fetchOptions` prop to SmartUserPicker to support custom option fetching. When
+  provided, this function will be called instead of the default recommendation API, allowing
+  consumers to override the default fetching behavior with their own implementation.
+
 ## 8.5.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -4,7 +4,8 @@
 		"target": "es5",
 		"outDir": "../../../../../confluence/tsDist/@atlaskit__smart-user-picker",
 		"rootDir": "../",
-		"composite": true
+		"composite": true,
+		"noCheck": true
 	},
 	"include": [
 		"../src/**/*.ts",

package/afm-jira/tsconfig.json

@@ -4,7 +4,8 @@
 		"target": "es5",
 		"outDir": "../../../../../jira/tsDist/@atlaskit__smart-user-picker/app",
 		"rootDir": "../",
-		"composite": true
+		"composite": true,
+		"noCheck": true
 	},
 	"include": [
 		"../src/**/*.ts",

package/afm-products/tsconfig.json

@@ -4,7 +4,8 @@
 		"target": "es5",
 		"outDir": "../../../../../tsDist/@atlaskit__smart-user-picker/app",
 		"rootDir": "../",
-		"composite": true
+		"composite": true,
+		"noCheck": true
 	},
 	"include": [
 		"../src/**/*.ts",

package/dist/cjs/components/SmartUserPicker.js

@@ -118,12 +118,12 @@ 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, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, 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, 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, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, displayEmailInByline = _this$props.displayEmailInByline, 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, 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);
@@ -149,6 +149,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail,
+              verifiedTeams: verifiedTeams,
               /*
               	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
@@ -160,8 +161,19 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             _context.prev = 6;
             _query = _this.state.query;
             _this.fireEvent(_analytics.requestUsersEvent);
+            if (!(fetchOptions && (0, _platformFeatureFlags.fg)('smart-user-picker-load-options-gate'))) {
+              _context.next = 15;
+              break;
+            }
+            _context.next = 12;
+            return fetchOptions(_query);
+          case 12:
+            recommendedUsers = _context.sent;
+            _context.next = 30;
+            break;
+          case 15:
             if (!(0, _platformFeatureFlags.fg)('twcg-444-invite-usd-improvements-m2-gate')) {
-              _context.next = 21;
+              _context.next = 27;
               break;
             }
             userRecommendationsPromise = (0, _service.getUserRecommendations)(recommendationsRequest, intl);
@@ -174,22 +186,22 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
                 return [];
               });
             });
-            _context.next = 14;
+            _context.next = 20;
             return Promise.all([userRecommendationsPromise].concat((0, _toConsumableArray2.default)(userResolversPromises)));
-          case 14:
+          case 20:
             _yield$Promise$all = _context.sent;
             _yield$Promise$all2 = (0, _toArray2.default)(_yield$Promise$all);
             mainRecommendations = _yield$Promise$all2[0];
             userResolverResults = _yield$Promise$all2.slice(1);
             recommendedUsers = [mainRecommendations].concat((0, _toConsumableArray2.default)(userResolverResults)).flat();
-            _context.next = 24;
+            _context.next = 30;
             break;
-          case 21:
-            _context.next = 23;
+          case 27:
+            _context.next = 29;
             return (0, _service.getUserRecommendations)(recommendationsRequest, intl);
-          case 23:
+          case 29:
             recommendedUsers = _context.sent;
-          case 24:
+          case 30:
             if (overrideByline) {
               _iterator = _createForOfIteratorHelper(recommendedUsers);
               try {
@@ -241,6 +253,19 @@ 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;
@@ -249,50 +274,50 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 35;
+              _context.next = 42;
               break;
             }
-            _context.next = 32;
+            _context.next = 39;
             return transformOptions(recommendedUsers, _query);
-          case 32:
+          case 39:
             _context.t0 = _context.sent;
-            _context.next = 36;
+            _context.next = 43;
             break;
-          case 35:
+          case 42:
             _context.t0 = recommendedUsers;
-          case 36:
+          case 43:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 52;
+              _context.next = 59;
               break;
             }
-            _context.next = 40;
+            _context.next = 47;
             return onEmpty(_query);
-          case 40:
+          case 47:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 44;
+              _context.next = 51;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 44:
+          case 51:
             if (!_context.t2) {
-              _context.next = 48;
+              _context.next = 55;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 49;
+            _context.next = 56;
             break;
-          case 48:
+          case 55:
             _context.t4 = [];
-          case 49:
+          case 56:
             _context.t1 = _context.t4;
-            _context.next = 53;
+            _context.next = 60;
             break;
-          case 52:
+          case 59:
             _context.t1 = transformedOptions;
-          case 53:
+          case 60:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -314,10 +339,10 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
                 loading: loading
               };
             });
-            _context.next = 86;
+            _context.next = 93;
             break;
-          case 57:
-            _context.prev = 57;
+          case 64:
+            _context.prev = 64;
             _context.t5 = _context["catch"](6);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -330,35 +355,35 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 64;
+            _context.prev = 71;
             if (!onError) {
-              _context.next = 74;
+              _context.next = 81;
               break;
             }
-            _context.next = 68;
+            _context.next = 75;
             return onError(_context.t5, recommendationsRequest);
-          case 68:
+          case 75:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 71;
+              _context.next = 78;
               break;
             }
             _context.t7 = [];
-          case 71:
+          case 78:
             _context.t6 = _context.t7;
-            _context.next = 75;
+            _context.next = 82;
             break;
-          case 74:
+          case 81:
             _context.t6 = [];
-          case 75:
+          case 82:
             defaultUsers = _context.t6;
-            _context.next = 81;
+            _context.next = 88;
             break;
-          case 78:
-            _context.prev = 78;
-            _context.t8 = _context["catch"](64);
+          case 85:
+            _context.prev = 85;
+            _context.t8 = _context["catch"](71);
             onErrorProducedError = true;
-          case 81:
+          case 88:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -375,11 +400,11 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 86:
+          case 93:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 57], [64, 78]]);
+      }, _callee, null, [[6, 64], [71, 85]]);
     })), (_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 || '';
@@ -586,6 +611,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
   debounceTime: DEFAULT_DEBOUNCE_TIME_MS,
   userResolvers: [],
   enableEmailSearch: false,
-  allowEmailSelectionWhenEmailMatched: true
+  allowEmailSelectionWhenEmailMatched: true,
+  verifiedTeams: false
 });
 var SmartUserPicker = exports.SmartUserPicker = (0, _analyticsNext.withAnalyticsEvents)()((0, _reactIntlNext.injectIntl)(SmartUserPickerWithoutAnalytics));

package/dist/es2019/components/SmartUserPicker.js

@@ -96,12 +96,14 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         includeUsers,
         includeNonLicensedUsers,
         intl,
+        fetchOptions,
         maxOptions,
         objectId,
         onEmpty,
         onError,
         overrideByline,
         displayEmailInByline,
+        verifiedTeams,
         orgId,
         principalId,
         productAttributes,
@@ -139,6 +141,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         maxNumberOfResults,
         query,
         searchEmail: isEmail,
+        verifiedTeams,
         /*
         	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
@@ -154,7 +157,9 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         } = this.state;
         this.fireEvent(requestUsersEvent);
         let recommendedUsers;
-        if (fg('twcg-444-invite-usd-improvements-m2-gate')) {
+        if (fetchOptions && fg('smart-user-picker-load-options-gate')) {
+          recommendedUsers = await fetchOptions(query);
+        } else if (fg('twcg-444-invite-usd-improvements-m2-gate')) {
           const userRecommendationsPromise = getUserRecommendations(recommendationsRequest, intl);
           const userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(resolver => resolver(query).catch(error => {
             this.fireEvent(failedUserResolversEvent, {
@@ -195,6 +200,19 @@ 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;
@@ -237,7 +255,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         let defaultUsers = [];
         try {
           defaultUsers = onError ? (await onError(e, recommendationsRequest)) || [] : [];
-        } catch (error) {
+        } catch {
           onErrorProducedError = true;
         }
         if (onErrorProducedError && is5xxEvent) {
@@ -436,6 +454,7 @@ _defineProperty(SmartUserPickerWithoutAnalytics, "defaultProps", {
   debounceTime: DEFAULT_DEBOUNCE_TIME_MS,
   userResolvers: [],
   enableEmailSearch: false,
-  allowEmailSelectionWhenEmailMatched: true
+  allowEmailSelectionWhenEmailMatched: true,
+  verifiedTeams: false
 });
 export const SmartUserPicker = withAnalyticsEvents()(injectIntl(SmartUserPickerWithoutAnalytics));

package/dist/esm/components/SmartUserPicker.js

@@ -110,12 +110,12 @@ 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, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, 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, 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, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, displayEmailInByline = _this$props.displayEmailInByline, 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, 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);
@@ -141,6 +141,7 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail,
+              verifiedTeams: verifiedTeams,
               /*
               	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
@@ -152,8 +153,19 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             _context.prev = 6;
             _query = _this.state.query;
             _this.fireEvent(requestUsersEvent);
+            if (!(fetchOptions && fg('smart-user-picker-load-options-gate'))) {
+              _context.next = 15;
+              break;
+            }
+            _context.next = 12;
+            return fetchOptions(_query);
+          case 12:
+            recommendedUsers = _context.sent;
+            _context.next = 30;
+            break;
+          case 15:
             if (!fg('twcg-444-invite-usd-improvements-m2-gate')) {
-              _context.next = 21;
+              _context.next = 27;
               break;
             }
             userRecommendationsPromise = getUserRecommendations(recommendationsRequest, intl);
@@ -166,22 +178,22 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
                 return [];
               });
             });
-            _context.next = 14;
+            _context.next = 20;
             return Promise.all([userRecommendationsPromise].concat(_toConsumableArray(userResolversPromises)));
-          case 14:
+          case 20:
             _yield$Promise$all = _context.sent;
             _yield$Promise$all2 = _toArray(_yield$Promise$all);
             mainRecommendations = _yield$Promise$all2[0];
             userResolverResults = _yield$Promise$all2.slice(1);
             recommendedUsers = [mainRecommendations].concat(_toConsumableArray(userResolverResults)).flat();
-            _context.next = 24;
+            _context.next = 30;
             break;
-          case 21:
-            _context.next = 23;
+          case 27:
+            _context.next = 29;
             return getUserRecommendations(recommendationsRequest, intl);
-          case 23:
+          case 29:
             recommendedUsers = _context.sent;
-          case 24:
+          case 30:
             if (overrideByline) {
               _iterator = _createForOfIteratorHelper(recommendedUsers);
               try {
@@ -233,6 +245,19 @@ 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;
@@ -241,50 +266,50 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 35;
+              _context.next = 42;
               break;
             }
-            _context.next = 32;
+            _context.next = 39;
             return transformOptions(recommendedUsers, _query);
-          case 32:
+          case 39:
             _context.t0 = _context.sent;
-            _context.next = 36;
+            _context.next = 43;
             break;
-          case 35:
+          case 42:
             _context.t0 = recommendedUsers;
-          case 36:
+          case 43:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 52;
+              _context.next = 59;
               break;
             }
-            _context.next = 40;
+            _context.next = 47;
             return onEmpty(_query);
-          case 40:
+          case 47:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 44;
+              _context.next = 51;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 44:
+          case 51:
             if (!_context.t2) {
-              _context.next = 48;
+              _context.next = 55;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 49;
+            _context.next = 56;
             break;
-          case 48:
+          case 55:
             _context.t4 = [];
-          case 49:
+          case 56:
             _context.t1 = _context.t4;
-            _context.next = 53;
+            _context.next = 60;
             break;
-          case 52:
+          case 59:
             _context.t1 = transformedOptions;
-          case 53:
+          case 60:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -306,10 +331,10 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
                 loading: loading
               };
             });
-            _context.next = 86;
+            _context.next = 93;
             break;
-          case 57:
-            _context.prev = 57;
+          case 64:
+            _context.prev = 64;
             _context.t5 = _context["catch"](6);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -322,35 +347,35 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 64;
+            _context.prev = 71;
             if (!onError) {
-              _context.next = 74;
+              _context.next = 81;
               break;
             }
-            _context.next = 68;
+            _context.next = 75;
             return onError(_context.t5, recommendationsRequest);
-          case 68:
+          case 75:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 71;
+              _context.next = 78;
               break;
             }
             _context.t7 = [];
-          case 71:
+          case 78:
             _context.t6 = _context.t7;
-            _context.next = 75;
+            _context.next = 82;
             break;
-          case 74:
+          case 81:
             _context.t6 = [];
-          case 75:
+          case 82:
             defaultUsers = _context.t6;
-            _context.next = 81;
+            _context.next = 88;
             break;
-          case 78:
-            _context.prev = 78;
-            _context.t8 = _context["catch"](64);
+          case 85:
+            _context.prev = 85;
+            _context.t8 = _context["catch"](71);
             onErrorProducedError = true;
-          case 81:
+          case 88:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -367,11 +392,11 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 86:
+          case 93:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 57], [64, 78]]);
+      }, _callee, null, [[6, 64], [71, 85]]);
     })), (_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 || '';
@@ -580,6 +605,7 @@ _defineProperty(SmartUserPickerWithoutAnalytics, "defaultProps", {
   debounceTime: DEFAULT_DEBOUNCE_TIME_MS,
   userResolvers: [],
   enableEmailSearch: false,
-  allowEmailSelectionWhenEmailMatched: true
+  allowEmailSelectionWhenEmailMatched: true,
+  verifiedTeams: false
 });
 export var SmartUserPicker = withAnalyticsEvents()(injectIntl(SmartUserPickerWithoutAnalytics));

package/dist/types/components/SmartUserPicker.d.ts

@@ -21,6 +21,7 @@ export declare class SmartUserPickerWithoutAnalytics extends React.Component<Pro
         userResolvers: never[];
         enableEmailSearch: boolean;
         allowEmailSelectionWhenEmailMatched: boolean;
+        verifiedTeams: boolean;
     };
     constructor(props: Props & WrappedComponentProps);
     componentDidMount(): Promise<void>;

package/dist/types/types.d.ts

@@ -23,6 +23,7 @@ export interface RecommendationRequest {
     includeTeams?: boolean;
     includeNonLicensedUsers?: boolean;
     searchEmail?: boolean;
+    verifiedTeams?: boolean;
 }
 type OnError = (error: any, request: RecommendationRequest) => Promise<OptionData[]> | void;
 type OnValueError = (error: any, defaultValue: DefaultValue) => Promise<OptionData[]> | void;
@@ -126,6 +127,10 @@ export interface SmartProps {
      * Whether to include teams in the resultset. @default false
      */
     includeTeams?: boolean;
+    /**
+     * When set to true, only returns verified teams. Only applies when includeTeams is true. @default false
+     */
+    verifiedTeams?: boolean;
     /**
      * Whether to include users in the resultset. @default true
      */
@@ -228,6 +233,12 @@ export interface SmartProps {
      * Optional callback to provide additional user resolvers, such as for fetching and adding users from third party sources
      */
     userResolvers?: Array<(query: string) => Promise<OptionData[]>>;
+    /**
+     * Custom fetcher function to load options. When provided, this function will be called
+     * instead of the default recommendation API. The function receives the search term
+     * and should return a Promise that resolves to an array of OptionData.
+     */
+    fetchOptions?: (query: string) => Promise<OptionData[]>;
     /**
      * Whether to include teams UI updates in the resultset. @default false
      */

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

@@ -21,6 +21,7 @@ export declare class SmartUserPickerWithoutAnalytics extends React.Component<Pro
         userResolvers: never[];
         enableEmailSearch: boolean;
         allowEmailSelectionWhenEmailMatched: boolean;
+        verifiedTeams: boolean;
     };
     constructor(props: Props & WrappedComponentProps);
     componentDidMount(): Promise<void>;

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

@@ -23,6 +23,7 @@ export interface RecommendationRequest {
     includeTeams?: boolean;
     includeNonLicensedUsers?: boolean;
     searchEmail?: boolean;
+    verifiedTeams?: boolean;
 }
 type OnError = (error: any, request: RecommendationRequest) => Promise<OptionData[]> | void;
 type OnValueError = (error: any, defaultValue: DefaultValue) => Promise<OptionData[]> | void;
@@ -126,6 +127,10 @@ export interface SmartProps {
      * Whether to include teams in the resultset. @default false
      */
     includeTeams?: boolean;
+    /**
+     * When set to true, only returns verified teams. Only applies when includeTeams is true. @default false
+     */
+    verifiedTeams?: boolean;
     /**
      * Whether to include users in the resultset. @default true
      */
@@ -228,6 +233,12 @@ export interface SmartProps {
      * Optional callback to provide additional user resolvers, such as for fetching and adding users from third party sources
      */
     userResolvers?: Array<(query: string) => Promise<OptionData[]>>;
+    /**
+     * Custom fetcher function to load options. When provided, this function will be called
+     * instead of the default recommendation API. The function receives the search term
+     * and should return a Promise that resolves to an array of OptionData.
+     */
+    fetchOptions?: (query: string) => Promise<OptionData[]>;
     /**
      * Whether to include teams UI updates in the resultset. @default false
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-user-picker",
-	"version": "8.5.0",
+	"version": "8.7.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.17.0",
+		"@atlaskit/user-picker": "^11.18.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
@@ -50,7 +50,7 @@
 		"react-dom": "^18.2.0"
 	},
 	"devDependencies": {
-		"@atlaskit/select": "^21.4.0",
+		"@atlaskit/select": "^21.6.0",
 		"@atlaskit/util-data-test": "^18.3.0",
 		"@testing-library/dom": "^10.1.0",
 		"@testing-library/react": "^13.4.0",
@@ -63,6 +63,12 @@
 	"platform-feature-flags": {
 		"twcg-444-invite-usd-improvements-m2-gate": {
 			"type": "boolean"
+		},
+		"smart-user-picker-load-options-gate": {
+			"type": "boolean"
+		},
+		"smart-user-picker-managed-teams-gate": {
+			"type": "boolean"
 		}
 	}
 }