@atlaskit/smart-user-picker 8.9.3 → 9.0.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlassian/smart-user-picker
 
+## 9.0.0
+
+### Major Changes
+
+- [`fe65ecbc97c01`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fe65ecbc97c01) -
+  Filter team results to directory-synced teams only, so only supported teams can be selected and
+  unsynced teams do not cause errors.
+
 ## 8.9.3
 
 ### Patch Changes

package/dist/cjs/analytics.js

@@ -11,7 +11,7 @@ var _uuid = require("uuid");
 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "8.9.2";
+var packageVersion = "0.0.0-development";
 var startSession = exports.startSession = function startSession() {
   return {
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead

package/dist/cjs/components/SmartUserPicker.js

@@ -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, 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;
+      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, isTeamSyncedToGroupDirectoryFilter, 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, userMatches, 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, restrictTo = _this$props.restrictTo, 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, isTeamSyncedToGroupDirectoryFilter = _this$props.isTeamSyncedToGroupDirectoryFilter, 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 = _objectSpread(_objectSpread({
+            recommendationsRequest = _objectSpread(_objectSpread(_objectSpread({
               baseUrl: baseUrl,
               context: {
                 containerId: containerId,
@@ -161,6 +161,8 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               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
+            }), isTeamSyncedToGroupDirectoryFilter === true && {
+              isTeamSyncedToGroupDirectoryFilter: true
             });
             _context.prev = 6;
             _query = _this.state.query;
@@ -259,7 +261,15 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
 
             // Track if email search found matches for conditional allowEmail logic
             if (isEmail) {
-              _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
+              if ((0, _platformFeatureFlags.fg)('smart_user_picker_allow_email_if_team_is_found')) {
+                // Only count user/external user matches, not teams or groups
+                userMatches = recommendedUsers.filter(function (user) {
+                  return (0, _userPicker.isUser)(user) || (0, _userPicker.isExternalUser)(user);
+                });
+                _this.lastEmailSearchFoundMatches = userMatches.length > 0;
+              } else {
+                _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
+              }
             } else {
               _this.lastEmailSearchFoundMatches = false;
             }
@@ -572,9 +582,16 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
       // Determine whether to allow email selection based on allowEmailSelectionWhenEmailMatched, if needed
       var shouldAllowEmail = allowEmail;
       if (allowEmail && enableEmailSearch && !allowEmailSelectionWhenEmailMatched) {
-        // Only allow email selection if we're in an email search that found no matches
         var isCurrentQueryEmail = isEmailQuery(this.state.query);
-        shouldAllowEmail = !isCurrentQueryEmail || !this.lastEmailSearchFoundMatches;
+        if ((0, _platformFeatureFlags.fg)('smart_user_picker_allow_email_if_team_is_found')) {
+          // Only allow email selection when:
+          // 1. The query matches email format (validated by regex)
+          // 2. No user/external user matches were found (only teams/groups suggested)
+          shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+        } else {
+          // Only allow email selection if we're in an email search that found no matches
+          shouldAllowEmail = !isCurrentQueryEmail || !this.lastEmailSearchFoundMatches;
+        }
       }
       return /*#__PURE__*/_react.default.createElement(_MessagesIntlProvider.default, null, /*#__PURE__*/_react.default.createElement(_userPicker.default, (0, _extends2.default)({}, restProps, {
         allowEmail: shouldAllowEmail,

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

@@ -27,8 +27,10 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
-      searchQuery: _objectSpread(_objectSpread(_objectSpread({}, request.verifiedTeams === true && {
+      searchQuery: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, request.verifiedTeams === true && {
         isVerifiedTeamFilter: true
+      }), request.isTeamSyncedToGroupDirectoryFilter === true && {
+        isTeamSyncedToGroupDirectoryFilter: true
       }), {}, {
         cpusQueryHighlights: {
           query: '',

package/dist/cjs/service/users-transformer.js

@@ -42,6 +42,7 @@ var transformUser = function transformUser(item, intl) {
     };
   }
   if (type === _types.EntityType.TEAM) {
+    var _team$type;
     var team = item;
     return {
       id: team.id,
@@ -53,7 +54,8 @@ var transformUser = function transformUser(item, intl) {
       includesYou: team.includesYou,
       avatarUrl: team.largeAvatarImageUrl || team.smallAvatarImageUrl,
       tooltip: team.displayName,
-      verified: team.verified
+      verified: team.verified,
+      teamTypeName: (_team$type = team.type) === null || _team$type === void 0 ? void 0 : _team$type.name
     };
   }
   if (type === _types.EntityType.GROUP) {

package/dist/es2019/analytics.js

@@ -2,7 +2,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
 const packageName = "@atlaskit/smart-user-picker";
-const packageVersion = "8.9.2";
+const packageVersion = "0.0.0-development";
 export const startSession = () => ({
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   id: uuid(),

package/dist/es2019/components/SmartUserPicker.js

@@ -111,6 +111,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         restrictTo,
         searchQueryFilter,
         siteId,
+        isTeamSyncedToGroupDirectoryFilter,
         transformOptions,
         userResolvers,
         enableEmailSearch
@@ -154,6 +155,9 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         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
+        }),
+        ...(isTeamSyncedToGroupDirectoryFilter === true && {
+          isTeamSyncedToGroupDirectoryFilter: true
         })
       };
       try {
@@ -208,7 +212,13 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
 
         // Track if email search found matches for conditional allowEmail logic
         if (isEmail) {
-          this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
+          if (fg('smart_user_picker_allow_email_if_team_is_found')) {
+            // Only count user/external user matches, not teams or groups
+            const userMatches = recommendedUsers.filter(user => isUser(user) || isExternalUser(user));
+            this.lastEmailSearchFoundMatches = userMatches.length > 0;
+          } else {
+            this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
+          }
         } else {
           this.lastEmailSearchFoundMatches = false;
         }
@@ -416,9 +426,16 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
     // Determine whether to allow email selection based on allowEmailSelectionWhenEmailMatched, if needed
     let shouldAllowEmail = allowEmail;
     if (allowEmail && enableEmailSearch && !allowEmailSelectionWhenEmailMatched) {
-      // Only allow email selection if we're in an email search that found no matches
       const isCurrentQueryEmail = isEmailQuery(this.state.query);
-      shouldAllowEmail = !isCurrentQueryEmail || !this.lastEmailSearchFoundMatches;
+      if (fg('smart_user_picker_allow_email_if_team_is_found')) {
+        // Only allow email selection when:
+        // 1. The query matches email format (validated by regex)
+        // 2. No user/external user matches were found (only teams/groups suggested)
+        shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+      } else {
+        // Only allow email selection if we're in an email search that found no matches
+        shouldAllowEmail = !isCurrentQueryEmail || !this.lastEmailSearchFoundMatches;
+      }
     }
     return /*#__PURE__*/React.createElement(MessagesIntlProvider, null, /*#__PURE__*/React.createElement(UserPicker, _extends({}, restProps, {
       allowEmail: shouldAllowEmail,

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

@@ -21,6 +21,9 @@ const getUserRecommendations = (request, intl) => {
         ...(request.verifiedTeams === true && {
           isVerifiedTeamFilter: true
         }),
+        ...(request.isTeamSyncedToGroupDirectoryFilter === true && {
+          isTeamSyncedToGroupDirectoryFilter: true
+        }),
         cpusQueryHighlights: {
           query: '',
           field: ''

package/dist/es2019/service/users-transformer.js

@@ -36,6 +36,7 @@ const transformUser = (item, intl) => {
     };
   }
   if (type === EntityType.TEAM) {
+    var _team$type;
     const team = item;
     return {
       id: team.id,
@@ -47,7 +48,8 @@ const transformUser = (item, intl) => {
       includesYou: team.includesYou,
       avatarUrl: team.largeAvatarImageUrl || team.smallAvatarImageUrl,
       tooltip: team.displayName,
-      verified: team.verified
+      verified: team.verified,
+      teamTypeName: (_team$type = team.type) === null || _team$type === void 0 ? void 0 : _team$type.name
     };
   }
   if (type === EntityType.GROUP) {

package/dist/esm/analytics.js

@@ -5,7 +5,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "8.9.2";
+var packageVersion = "0.0.0-development";
 export var startSession = function startSession() {
   return {
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead

package/dist/esm/components/SmartUserPicker.js

@@ -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, 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;
+      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, isTeamSyncedToGroupDirectoryFilter, 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, userMatches, 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, restrictTo = _this$props.restrictTo, 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, isTeamSyncedToGroupDirectoryFilter = _this$props.isTeamSyncedToGroupDirectoryFilter, 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 = _objectSpread(_objectSpread({
+            recommendationsRequest = _objectSpread(_objectSpread(_objectSpread({
               baseUrl: baseUrl,
               context: {
                 containerId: containerId,
@@ -153,6 +153,8 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               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
+            }), isTeamSyncedToGroupDirectoryFilter === true && {
+              isTeamSyncedToGroupDirectoryFilter: true
             });
             _context.prev = 6;
             _query = _this.state.query;
@@ -251,7 +253,15 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
 
             // Track if email search found matches for conditional allowEmail logic
             if (isEmail) {
-              _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
+              if (fg('smart_user_picker_allow_email_if_team_is_found')) {
+                // Only count user/external user matches, not teams or groups
+                userMatches = recommendedUsers.filter(function (user) {
+                  return isUser(user) || isExternalUser(user);
+                });
+                _this.lastEmailSearchFoundMatches = userMatches.length > 0;
+              } else {
+                _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
+              }
             } else {
               _this.lastEmailSearchFoundMatches = false;
             }
@@ -564,9 +574,16 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
       // Determine whether to allow email selection based on allowEmailSelectionWhenEmailMatched, if needed
       var shouldAllowEmail = allowEmail;
       if (allowEmail && enableEmailSearch && !allowEmailSelectionWhenEmailMatched) {
-        // Only allow email selection if we're in an email search that found no matches
         var isCurrentQueryEmail = isEmailQuery(this.state.query);
-        shouldAllowEmail = !isCurrentQueryEmail || !this.lastEmailSearchFoundMatches;
+        if (fg('smart_user_picker_allow_email_if_team_is_found')) {
+          // Only allow email selection when:
+          // 1. The query matches email format (validated by regex)
+          // 2. No user/external user matches were found (only teams/groups suggested)
+          shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+        } else {
+          // Only allow email selection if we're in an email search that found no matches
+          shouldAllowEmail = !isCurrentQueryEmail || !this.lastEmailSearchFoundMatches;
+        }
       }
       return /*#__PURE__*/React.createElement(MessagesIntlProvider, null, /*#__PURE__*/React.createElement(UserPicker, _extends({}, restProps, {
         allowEmail: shouldAllowEmail,

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

@@ -20,8 +20,10 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
-      searchQuery: _objectSpread(_objectSpread(_objectSpread({}, request.verifiedTeams === true && {
+      searchQuery: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, request.verifiedTeams === true && {
         isVerifiedTeamFilter: true
+      }), request.isTeamSyncedToGroupDirectoryFilter === true && {
+        isTeamSyncedToGroupDirectoryFilter: true
       }), {}, {
         cpusQueryHighlights: {
           query: '',

package/dist/esm/service/users-transformer.js

@@ -36,6 +36,7 @@ var transformUser = function transformUser(item, intl) {
     };
   }
   if (type === EntityType.TEAM) {
+    var _team$type;
     var team = item;
     return {
       id: team.id,
@@ -47,7 +48,8 @@ var transformUser = function transformUser(item, intl) {
       includesYou: team.includesYou,
       avatarUrl: team.largeAvatarImageUrl || team.smallAvatarImageUrl,
       tooltip: team.displayName,
-      verified: team.verified
+      verified: team.verified,
+      teamTypeName: (_team$type = team.type) === null || _team$type === void 0 ? void 0 : _team$type.name
     };
   }
   if (type === EntityType.GROUP) {

package/dist/types/types.d.ts

@@ -29,6 +29,12 @@ export interface RecommendationRequest {
     searchEmail?: boolean;
     verifiedTeams?: boolean;
     restrictTo?: RestrictionFilter;
+    /**
+     * When true, URS returns only userbase-aligned teams (teams synced to Identity).
+     * Confluence uses this for teams-as-principals to avoid errors when users select teams
+     * that are not yet mirrored to Identity (e.g. old org-scoped teams in NonVortex orgs).
+     */
+    isTeamSyncedToGroupDirectoryFilter?: boolean;
 }
 type OnError = (error: any, request: RecommendationRequest) => Promise<OptionData[]> | void;
 type OnValueError = (error: any, defaultValue: DefaultValue) => Promise<OptionData[]> | void;
@@ -211,7 +217,9 @@ export interface SmartProps {
     /**
      * When both allowEmail and enableEmailSearch are true, this controls whether both email entry
      * and matched user entries can be selected simultaneously.
-     * If false, only allows email selection when no users are found.
+     * If false, only allows email selection when:
+     *   1. The query matches email format (validated by regex)
+     *   2. No user/external user matches are found (teams/groups don't suppress email entry)
      * @default true
      */
     allowEmailSelectionWhenEmailMatched?: boolean;
@@ -258,6 +266,12 @@ export interface SmartProps {
      * @example { userIds: ["123", "456"], groupIds: ["789"] }
      */
     restrictTo?: RestrictionFilter;
+    /**
+     * When true, URS returns only userbase-aligned teams (teams synced to Identity).
+     * Confluence uses this for teams-as-principals to avoid errors when users select teams
+     * that are not yet mirrored to Identity (e.g. old org-scoped teams in NonVortex orgs).
+     */
+    isTeamSyncedToGroupDirectoryFilter?: boolean;
 }
 export interface Props extends SmartProps, UserPickerProps, WithAnalyticsEventsProps {
     /**

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

@@ -29,6 +29,12 @@ export interface RecommendationRequest {
     searchEmail?: boolean;
     verifiedTeams?: boolean;
     restrictTo?: RestrictionFilter;
+    /**
+     * When true, URS returns only userbase-aligned teams (teams synced to Identity).
+     * Confluence uses this for teams-as-principals to avoid errors when users select teams
+     * that are not yet mirrored to Identity (e.g. old org-scoped teams in NonVortex orgs).
+     */
+    isTeamSyncedToGroupDirectoryFilter?: boolean;
 }
 type OnError = (error: any, request: RecommendationRequest) => Promise<OptionData[]> | void;
 type OnValueError = (error: any, defaultValue: DefaultValue) => Promise<OptionData[]> | void;
@@ -211,7 +217,9 @@ export interface SmartProps {
     /**
      * When both allowEmail and enableEmailSearch are true, this controls whether both email entry
      * and matched user entries can be selected simultaneously.
-     * If false, only allows email selection when no users are found.
+     * If false, only allows email selection when:
+     *   1. The query matches email format (validated by regex)
+     *   2. No user/external user matches are found (teams/groups don't suppress email entry)
      * @default true
      */
     allowEmailSelectionWhenEmailMatched?: boolean;
@@ -258,6 +266,12 @@ export interface SmartProps {
      * @example { userIds: ["123", "456"], groupIds: ["789"] }
      */
     restrictTo?: RestrictionFilter;
+    /**
+     * When true, URS returns only userbase-aligned teams (teams synced to Identity).
+     * Confluence uses this for teams-as-principals to avoid errors when users select teams
+     * that are not yet mirrored to Identity (e.g. old org-scoped teams in NonVortex orgs).
+     */
+    isTeamSyncedToGroupDirectoryFilter?: boolean;
 }
 export interface Props extends SmartProps, UserPickerProps, WithAnalyticsEventsProps {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-user-picker",
-	"version": "8.9.3",
+	"version": "9.0.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.20.0",
+		"@atlaskit/user-picker": "^11.22.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
@@ -51,8 +51,8 @@
 	},
 	"devDependencies": {
 		"@atlaskit/select": "^21.7.0",
-		"@atlaskit/util-data-test": "^18.4.0",
-		"@atlassian/a11y-jest-testing": "^0.8.0",
+		"@atlaskit/util-data-test": "^18.5.0",
+		"@atlassian/a11y-jest-testing": "^0.10.0",
 		"@testing-library/dom": "^10.1.0",
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/user-event": "^14.4.3",
@@ -73,6 +73,9 @@
 		},
 		"smart-user-picker-restrict-to-gate": {
 			"type": "boolean"
+		},
+		"smart_user_picker_allow_email_if_team_is_found": {
+			"type": "boolean"
 		}
 	}
 }