@atlaskit/smart-user-picker 8.9.3 → 9.0.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlassian/smart-user-picker
 
+## 9.0.1
+
+### Patch Changes
+
+- [`94aa45d957856`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/94aa45d957856) -
+  Add atl-attribution header to network requests for metrics attribution in AGG
+
+## 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,
@@ -149,7 +149,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail
-            }, verifiedTeams === true && (0, _platformFeatureFlags.fg)('smart-user-picker-managed-teams-gate') && {
+            }, verifiedTeams === true && {
               verifiedTeams: true
             }), {}, {
               /*
@@ -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;
             }
@@ -501,7 +511,10 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             case 0:
               _context2.prev = 0;
               _context2.next = 3;
-              return (0, _service.hydrateDefaultValues)(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId);
+              return (0, _service.hydrateDefaultValues)(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId, {
+                tenantId: this.props.siteId,
+                activationId: this.props.activationId
+              });
             case 3:
               value = _context2.sent;
               this.setState({
@@ -572,9 +585,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/atl-attribution.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createAtlAttributionHeader = createAtlAttributionHeader;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _excluded = ["product", "activationId"];
+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; }
+/**
+ * Utility for creating the atl-attribution header for AGG requests
+ * Reference: https://hello.atlassian.net/wiki/spaces/AGG/pages/5954141702/Metrics+Attribution+Onboarding+Doc+for+AGG+Clients
+ */
+
+/**
+ * Creates the atl-attribution header value for network requests.
+ * This header is used for metrics attribution in AGG (Analytics & Insights Graph).
+ *
+ * @param data Optional attribution data including tenantId, atlWorkspaceId, and product
+ * @returns Object with atl-attribution header
+ */
+function createAtlAttributionHeader() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _ref$product = _ref.product,
+    product = _ref$product === void 0 ? 'platform' : _ref$product,
+    activationId = _ref.activationId,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var headerData = _objectSpread({
+    service: 'smart-experiences/smart-user-picker',
+    product: product,
+    atlWorkspaceId: activationId && props.tenantId ? "ari:cloud:".concat(product, ":").concat(props.tenantId, ":workspace/").concat(activationId) : undefined
+  }, props);
+  return {
+    'atl-attribution': JSON.stringify(headerData)
+  };
+}

package/dist/cjs/service/default-value-hydration-client.js

@@ -7,12 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _userPicker = require("@atlaskit/user-picker");
 var _config = require("../config");
 var _usersClient = _interopRequireDefault(require("./users-client"));
 var _teamsClient = _interopRequireDefault(require("./teams-client"));
 var _constants = require("./constants");
+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; }
 var getHydratedUsersFromProducts = function getHydratedUsersFromProducts(request) {
   var url = "".concat(_config.config.getUsersServiceUrl(request.productKey, request.baseUrl));
   var params = new URLSearchParams();
@@ -126,7 +129,7 @@ var hydrateTeamIds = /*#__PURE__*/function () {
   };
 }();
 var hydrateAccountIds = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(baseUrl, productKey, values) {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(baseUrl, productKey, values, atlAttributes) {
     var accountIds;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -156,7 +159,9 @@ var hydrateAccountIds = /*#__PURE__*/function () {
           break;
         case 9:
           _context2.next = 11;
-          return (0, _usersClient.default)(baseUrl, accountIds);
+          return (0, _usersClient.default)(baseUrl, accountIds, _objectSpread({
+            product: productKey
+          }, atlAttributes));
         case 11:
           _context2.t0 = _context2.sent;
         case 12:
@@ -167,15 +172,15 @@ var hydrateAccountIds = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function hydrateAccountIds(_x4, _x5, _x6) {
+  return function hydrateAccountIds(_x4, _x5, _x6, _x7) {
     return _ref2.apply(this, arguments);
   };
 }();
-function hydrateDefaultValues(_x7, _x8, _x9, _x0) {
+function hydrateDefaultValues(_x8, _x9, _x0, _x1, _x10) {
   return _hydrateDefaultValues.apply(this, arguments);
 }
 function _hydrateDefaultValues() {
-  _hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(baseUrl, value, productKey, siteId) {
+  _hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(baseUrl, value, productKey, siteId, atlAttributes) {
     var values, _yield$Promise$all, _yield$Promise$all2, hydratedUsers, hydratedTeams, hydratedOptions;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -198,7 +203,7 @@ function _hydrateDefaultValues() {
           _context3.next = 7;
           return Promise.all([hydrateAccountIds(baseUrl, productKey, values.filter(function (val) {
             return !isOptionData(val) && val.type === 'user';
-          })), hydrateTeamIds(baseUrl, values.filter(function (val) {
+          }), atlAttributes), hydrateTeamIds(baseUrl, values.filter(function (val) {
             return !isOptionData(val) && val.type === 'team';
           }), siteId)]);
         case 7:

package/dist/cjs/service/graphqlUtils.js

@@ -4,17 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.graphqlQuery = graphqlQuery;
-var buildHeaders = function buildHeaders() {
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _atlAttribution = require("./atl-attribution");
+var buildHeaders = function buildHeaders(attributionData) {
   var headers = new Headers();
   headers.append('Content-Type', 'application/json');
+  if ((0, _platformFeatureFlags.fg)('smart-user-picker-attribution-header')) {
+    var atlAttributionHeader = (0, _atlAttribution.createAtlAttributionHeader)(attributionData);
+    headers.append('atl-attribution', atlAttributionHeader['atl-attribution']);
+  }
   return headers;
 };
 /**
  * @param {string} serviceUrl - GraphQL service endpoint
  * @param {Query} query - GraphQL query
+ * @param {Partial<AtlAttributionHeaderData>} attributionData - Optional attribution data for the atl-attribution header
  */
-function graphqlQuery(serviceUrl, query) {
-  var headers = buildHeaders();
+function graphqlQuery(serviceUrl, query, attributionData) {
+  var headers = buildHeaders(attributionData);
   return fetch(new Request("".concat(serviceUrl), {
     method: 'POST',
     credentials: 'include',

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-client.js

@@ -26,14 +26,14 @@ var buildUsersQuery = function buildUsersQuery(accountIds) {
   };
 };
 var makeRequest = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, accountIds) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, accountIds, attributionData) {
     var query;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           query = buildUsersQuery(accountIds);
           _context.next = 3;
-          return (0, _graphqlUtils.graphqlQuery)(url, query);
+          return (0, _graphqlUtils.graphqlQuery)(url, query, attributionData);
         case 3:
           return _context.abrupt("return", _context.sent);
         case 4:
@@ -42,7 +42,7 @@ var makeRequest = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function makeRequest(_x, _x2) {
+  return function makeRequest(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -59,10 +59,10 @@ var modifyResponse = function modifyResponse(users) {
     };
   });
 };
-var getHydratedUsers = function getHydratedUsers(baseUrl, userIds) {
+var getHydratedUsers = function getHydratedUsers(baseUrl, userIds, attributionData) {
   var url = _config.config.getGraphQLUrl(baseUrl);
   return new Promise(function (resolve) {
-    makeRequest(url, userIds).then(function (data) {
+    makeRequest(url, userIds, attributionData).then(function (data) {
       resolve(modifyResponse(data.users));
     }).catch(function () {
       // on network error, return original list with label 'Unknown'

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
@@ -142,7 +143,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         maxNumberOfResults,
         query,
         searchEmail: isEmail,
-        ...(verifiedTeams === true && fg('smart-user-picker-managed-teams-gate') && {
+        ...(verifiedTeams === true && {
           verifiedTeams: true
         }),
         /*
@@ -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;
         }
@@ -365,7 +375,10 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
   }
   async componentDidMount() {
     try {
-      const value = await hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId);
+      const value = await hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId, {
+        tenantId: this.props.siteId,
+        activationId: this.props.activationId
+      });
       this.setState({
         defaultValue: value
       });
@@ -416,9 +429,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/atl-attribution.js

@@ -0,0 +1,27 @@
+/**
+ * Utility for creating the atl-attribution header for AGG requests
+ * Reference: https://hello.atlassian.net/wiki/spaces/AGG/pages/5954141702/Metrics+Attribution+Onboarding+Doc+for+AGG+Clients
+ */
+
+/**
+ * Creates the atl-attribution header value for network requests.
+ * This header is used for metrics attribution in AGG (Analytics & Insights Graph).
+ *
+ * @param data Optional attribution data including tenantId, atlWorkspaceId, and product
+ * @returns Object with atl-attribution header
+ */
+export function createAtlAttributionHeader({
+  product = 'platform',
+  activationId,
+  ...props
+} = {}) {
+  const headerData = {
+    service: 'smart-experiences/smart-user-picker',
+    product,
+    atlWorkspaceId: activationId && props.tenantId ? `ari:cloud:${product}:${props.tenantId}:workspace/${activationId}` : undefined,
+    ...props
+  };
+  return {
+    'atl-attribution': JSON.stringify(headerData)
+  };
+}

package/dist/es2019/service/default-value-hydration-client.js

@@ -77,7 +77,7 @@ const hydrateTeamIds = async (baseUrl, values, siteId) => {
   }));
   return await Promise.all(legionPromises);
 };
-const hydrateAccountIds = async (baseUrl, productKey, values) => {
+const hydrateAccountIds = async (baseUrl, productKey, values, atlAttributes) => {
   if (values.length === 0) {
     return [];
   }
@@ -88,9 +88,12 @@ const hydrateAccountIds = async (baseUrl, productKey, values) => {
     baseUrl,
     productKey,
     accountIds
-  }) : await getHydratedUsersFromPrs(baseUrl, accountIds);
+  }) : await getHydratedUsersFromPrs(baseUrl, accountIds, {
+    product: productKey,
+    ...atlAttributes
+  });
 };
-async function hydrateDefaultValues(baseUrl, value, productKey, siteId) {
+async function hydrateDefaultValues(baseUrl, value, productKey, siteId, atlAttributes) {
   //return if no value
   if (!value || Array.isArray(value) && value.length === 0) {
     return [];
@@ -101,7 +104,7 @@ async function hydrateDefaultValues(baseUrl, value, productKey, siteId) {
   if (!values.some(val => !isOptionData(val))) {
     return value;
   }
-  const [hydratedUsers, hydratedTeams] = await Promise.all([hydrateAccountIds(baseUrl, productKey, values.filter(val => !isOptionData(val) && val.type === 'user')), hydrateTeamIds(baseUrl, values.filter(val => !isOptionData(val) && val.type === 'team'), siteId)]);
+  const [hydratedUsers, hydratedTeams] = await Promise.all([hydrateAccountIds(baseUrl, productKey, values.filter(val => !isOptionData(val) && val.type === 'user'), atlAttributes), hydrateTeamIds(baseUrl, values.filter(val => !isOptionData(val) && val.type === 'team'), siteId)]);
   const hydratedOptions = values.filter(val => isOptionData(val)).map(val => val).concat(hydratedUsers).concat(hydratedTeams);
   return sortResults(hydratedOptions, values);
 }

package/dist/es2019/service/graphqlUtils.js

@@ -1,14 +1,21 @@
-const buildHeaders = () => {
+import { fg } from '@atlaskit/platform-feature-flags';
+import { createAtlAttributionHeader } from './atl-attribution';
+const buildHeaders = attributionData => {
   const headers = new Headers();
   headers.append('Content-Type', 'application/json');
+  if (fg('smart-user-picker-attribution-header')) {
+    const atlAttributionHeader = createAtlAttributionHeader(attributionData);
+    headers.append('atl-attribution', atlAttributionHeader['atl-attribution']);
+  }
   return headers;
 };
 /**
  * @param {string} serviceUrl - GraphQL service endpoint
  * @param {Query} query - GraphQL query
+ * @param {Partial<AtlAttributionHeaderData>} attributionData - Optional attribution data for the atl-attribution header
  */
-export function graphqlQuery(serviceUrl, query) {
-  const headers = buildHeaders();
+export function graphqlQuery(serviceUrl, query, attributionData) {
+  const headers = buildHeaders(attributionData);
   return fetch(new Request(`${serviceUrl}`, {
     method: 'POST',
     credentials: 'include',

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-client.js

@@ -17,9 +17,9 @@ const buildUsersQuery = accountIds => ({
     accountIds
   }
 });
-const makeRequest = async (url, accountIds) => {
+const makeRequest = async (url, accountIds, attributionData) => {
   const query = buildUsersQuery(accountIds);
-  return await graphqlQuery(url, query);
+  return await graphqlQuery(url, query, attributionData);
 };
 const modifyResponse = users => users.map(({
   accountId,
@@ -31,10 +31,10 @@ const modifyResponse = users => users.map(({
   name,
   type: 'user'
 }));
-const getHydratedUsers = (baseUrl, userIds) => {
+const getHydratedUsers = (baseUrl, userIds, attributionData) => {
   const url = config.getGraphQLUrl(baseUrl);
   return new Promise(resolve => {
-    makeRequest(url, userIds).then(data => {
+    makeRequest(url, userIds, attributionData).then(data => {
       resolve(modifyResponse(data.users));
     }).catch(() => {
       // on network error, return original list with label 'Unknown'

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,
@@ -141,7 +141,7 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail
-            }, verifiedTeams === true && fg('smart-user-picker-managed-teams-gate') && {
+            }, verifiedTeams === true && {
               verifiedTeams: true
             }), {}, {
               /*
@@ -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;
             }
@@ -493,7 +503,10 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             case 0:
               _context2.prev = 0;
               _context2.next = 3;
-              return hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId);
+              return hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId, {
+                tenantId: this.props.siteId,
+                activationId: this.props.activationId
+              });
             case 3:
               value = _context2.sent;
               this.setState({
@@ -564,9 +577,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/atl-attribution.js

@@ -0,0 +1,32 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["product", "activationId"];
+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; }
+/**
+ * Utility for creating the atl-attribution header for AGG requests
+ * Reference: https://hello.atlassian.net/wiki/spaces/AGG/pages/5954141702/Metrics+Attribution+Onboarding+Doc+for+AGG+Clients
+ */
+
+/**
+ * Creates the atl-attribution header value for network requests.
+ * This header is used for metrics attribution in AGG (Analytics & Insights Graph).
+ *
+ * @param data Optional attribution data including tenantId, atlWorkspaceId, and product
+ * @returns Object with atl-attribution header
+ */
+export function createAtlAttributionHeader() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _ref$product = _ref.product,
+    product = _ref$product === void 0 ? 'platform' : _ref$product,
+    activationId = _ref.activationId,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var headerData = _objectSpread({
+    service: 'smart-experiences/smart-user-picker',
+    product: product,
+    atlWorkspaceId: activationId && props.tenantId ? "ari:cloud:".concat(product, ":").concat(props.tenantId, ":workspace/").concat(activationId) : undefined
+  }, props);
+  return {
+    'atl-attribution': JSON.stringify(headerData)
+  };
+}

package/dist/esm/service/default-value-hydration-client.js

@@ -1,5 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { UserType } from '@atlaskit/user-picker';
 import { config } from '../config';
@@ -119,7 +122,7 @@ var hydrateTeamIds = /*#__PURE__*/function () {
   };
 }();
 var hydrateAccountIds = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(baseUrl, productKey, values) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(baseUrl, productKey, values, atlAttributes) {
     var accountIds;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -149,7 +152,9 @@ var hydrateAccountIds = /*#__PURE__*/function () {
           break;
         case 9:
           _context2.next = 11;
-          return getHydratedUsersFromPrs(baseUrl, accountIds);
+          return getHydratedUsersFromPrs(baseUrl, accountIds, _objectSpread({
+            product: productKey
+          }, atlAttributes));
         case 11:
           _context2.t0 = _context2.sent;
         case 12:
@@ -160,15 +165,15 @@ var hydrateAccountIds = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function hydrateAccountIds(_x4, _x5, _x6) {
+  return function hydrateAccountIds(_x4, _x5, _x6, _x7) {
     return _ref2.apply(this, arguments);
   };
 }();
-function hydrateDefaultValues(_x7, _x8, _x9, _x0) {
+function hydrateDefaultValues(_x8, _x9, _x0, _x1, _x10) {
   return _hydrateDefaultValues.apply(this, arguments);
 }
 function _hydrateDefaultValues() {
-  _hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(baseUrl, value, productKey, siteId) {
+  _hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(baseUrl, value, productKey, siteId, atlAttributes) {
     var values, _yield$Promise$all, _yield$Promise$all2, hydratedUsers, hydratedTeams, hydratedOptions;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -191,7 +196,7 @@ function _hydrateDefaultValues() {
           _context3.next = 7;
           return Promise.all([hydrateAccountIds(baseUrl, productKey, values.filter(function (val) {
             return !isOptionData(val) && val.type === 'user';
-          })), hydrateTeamIds(baseUrl, values.filter(function (val) {
+          }), atlAttributes), hydrateTeamIds(baseUrl, values.filter(function (val) {
             return !isOptionData(val) && val.type === 'team';
           }), siteId)]);
         case 7:

package/dist/esm/service/graphqlUtils.js

@@ -1,14 +1,21 @@
-var buildHeaders = function buildHeaders() {
+import { fg } from '@atlaskit/platform-feature-flags';
+import { createAtlAttributionHeader } from './atl-attribution';
+var buildHeaders = function buildHeaders(attributionData) {
   var headers = new Headers();
   headers.append('Content-Type', 'application/json');
+  if (fg('smart-user-picker-attribution-header')) {
+    var atlAttributionHeader = createAtlAttributionHeader(attributionData);
+    headers.append('atl-attribution', atlAttributionHeader['atl-attribution']);
+  }
   return headers;
 };
 /**
  * @param {string} serviceUrl - GraphQL service endpoint
  * @param {Query} query - GraphQL query
+ * @param {Partial<AtlAttributionHeaderData>} attributionData - Optional attribution data for the atl-attribution header
  */
-export function graphqlQuery(serviceUrl, query) {
-  var headers = buildHeaders();
+export function graphqlQuery(serviceUrl, query, attributionData) {
+  var headers = buildHeaders(attributionData);
   return fetch(new Request("".concat(serviceUrl), {
     method: 'POST',
     credentials: 'include',

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-client.js

@@ -19,14 +19,14 @@ var buildUsersQuery = function buildUsersQuery(accountIds) {
   };
 };
 var makeRequest = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, accountIds) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, accountIds, attributionData) {
     var query;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           query = buildUsersQuery(accountIds);
           _context.next = 3;
-          return graphqlQuery(url, query);
+          return graphqlQuery(url, query, attributionData);
         case 3:
           return _context.abrupt("return", _context.sent);
         case 4:
@@ -35,7 +35,7 @@ var makeRequest = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function makeRequest(_x, _x2) {
+  return function makeRequest(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -52,10 +52,10 @@ var modifyResponse = function modifyResponse(users) {
     };
   });
 };
-var getHydratedUsers = function getHydratedUsers(baseUrl, userIds) {
+var getHydratedUsers = function getHydratedUsers(baseUrl, userIds, attributionData) {
   var url = config.getGraphQLUrl(baseUrl);
   return new Promise(function (resolve) {
-    makeRequest(url, userIds).then(function (data) {
+    makeRequest(url, userIds, attributionData).then(function (data) {
       resolve(modifyResponse(data.users));
     }).catch(function () {
       // on network error, return original list with label 'Unknown'

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/service/atl-attribution.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Utility for creating the atl-attribution header for AGG requests
+ * Reference: https://hello.atlassian.net/wiki/spaces/AGG/pages/5954141702/Metrics+Attribution+Onboarding+Doc+for+AGG+Clients
+ */
+export interface AtlAttributionHeaderData {
+    service: string;
+    tenantId?: string;
+    activationId?: string;
+    product?: string;
+}
+/**
+ * Creates the atl-attribution header value for network requests.
+ * This header is used for metrics attribution in AGG (Analytics & Insights Graph).
+ *
+ * @param data Optional attribution data including tenantId, atlWorkspaceId, and product
+ * @returns Object with atl-attribution header
+ */
+export declare function createAtlAttributionHeader({ product, activationId, ...props }?: Partial<AtlAttributionHeaderData>): {
+    'atl-attribution': string;
+};

package/dist/types/service/default-value-hydration-client.d.ts

@@ -4,5 +4,8 @@ export interface UsersRequest {
     accountIds: string[];
     productKey: 'jira' | 'confluence';
 }
-declare function hydrateDefaultValues(baseUrl: string | undefined, value: DefaultValue, productKey: string, siteId: string | undefined): Promise<DefaultValue>;
+declare function hydrateDefaultValues(baseUrl: string | undefined, value: DefaultValue, productKey: string, siteId: string | undefined, atlAttributes?: {
+    tenantId?: string;
+    activationId?: string;
+}): Promise<DefaultValue>;
 export default hydrateDefaultValues;

package/dist/types/service/graphqlUtils.d.ts

@@ -1,3 +1,5 @@
+import { type AtlAttributionHeaderData } from './atl-attribution';
+export type { AtlAttributionHeaderData } from './atl-attribution';
 interface Query {
     query: string;
     variables: Record<string, string> | Record<string, string[]>;
@@ -9,6 +11,6 @@ export interface GraphQLError {
 /**
  * @param {string} serviceUrl - GraphQL service endpoint
  * @param {Query} query - GraphQL query
+ * @param {Partial<AtlAttributionHeaderData>} attributionData - Optional attribution data for the atl-attribution header
  */
-export declare function graphqlQuery<D>(serviceUrl: string, query: Query): Promise<D>;
-export {};
+export declare function graphqlQuery<D>(serviceUrl: string, query: Query, attributionData?: Partial<AtlAttributionHeaderData>): Promise<D>;

package/dist/types/service/users-client.d.ts

@@ -1,4 +1,5 @@
 import { type User } from '@atlaskit/user-picker';
+import { type AtlAttributionHeaderData } from './graphqlUtils';
 interface UserData {
     accountId: string;
     name: string;
@@ -7,5 +8,5 @@ interface UserData {
 export interface ApiClientResponse {
     users: UserData[];
 }
-declare const getHydratedUsers: (baseUrl: string | undefined, userIds: string[]) => Promise<User[]>;
+declare const getHydratedUsers: (baseUrl: string | undefined, userIds: string[], attributionData?: Partial<AtlAttributionHeaderData>) => Promise<User[]>;
 export default getHydratedUsers;

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;
@@ -225,6 +233,10 @@ export interface SmartProps {
      * Identifier for the product's tenant, also known as tenantId or cloudId
      */
     siteId: string;
+    /**
+     * Identifier for the product activation.
+     */
+    activationId?: string;
     /**
      * Identifier for the organization in which to search for teams.
      */
@@ -258,6 +270,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/service/atl-attribution.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Utility for creating the atl-attribution header for AGG requests
+ * Reference: https://hello.atlassian.net/wiki/spaces/AGG/pages/5954141702/Metrics+Attribution+Onboarding+Doc+for+AGG+Clients
+ */
+export interface AtlAttributionHeaderData {
+    service: string;
+    tenantId?: string;
+    activationId?: string;
+    product?: string;
+}
+/**
+ * Creates the atl-attribution header value for network requests.
+ * This header is used for metrics attribution in AGG (Analytics & Insights Graph).
+ *
+ * @param data Optional attribution data including tenantId, atlWorkspaceId, and product
+ * @returns Object with atl-attribution header
+ */
+export declare function createAtlAttributionHeader({ product, activationId, ...props }?: Partial<AtlAttributionHeaderData>): {
+    'atl-attribution': string;
+};

package/dist/types-ts4.5/service/default-value-hydration-client.d.ts

@@ -4,5 +4,8 @@ export interface UsersRequest {
     accountIds: string[];
     productKey: 'jira' | 'confluence';
 }
-declare function hydrateDefaultValues(baseUrl: string | undefined, value: DefaultValue, productKey: string, siteId: string | undefined): Promise<DefaultValue>;
+declare function hydrateDefaultValues(baseUrl: string | undefined, value: DefaultValue, productKey: string, siteId: string | undefined, atlAttributes?: {
+    tenantId?: string;
+    activationId?: string;
+}): Promise<DefaultValue>;
 export default hydrateDefaultValues;

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

@@ -1,3 +1,5 @@
+import { type AtlAttributionHeaderData } from './atl-attribution';
+export type { AtlAttributionHeaderData } from './atl-attribution';
 interface Query {
     query: string;
     variables: Record<string, string> | Record<string, string[]>;
@@ -9,6 +11,6 @@ export interface GraphQLError {
 /**
  * @param {string} serviceUrl - GraphQL service endpoint
  * @param {Query} query - GraphQL query
+ * @param {Partial<AtlAttributionHeaderData>} attributionData - Optional attribution data for the atl-attribution header
  */
-export declare function graphqlQuery<D>(serviceUrl: string, query: Query): Promise<D>;
-export {};
+export declare function graphqlQuery<D>(serviceUrl: string, query: Query, attributionData?: Partial<AtlAttributionHeaderData>): Promise<D>;

package/dist/types-ts4.5/service/users-client.d.ts

@@ -1,4 +1,5 @@
 import { type User } from '@atlaskit/user-picker';
+import { type AtlAttributionHeaderData } from './graphqlUtils';
 interface UserData {
     accountId: string;
     name: string;
@@ -7,5 +8,5 @@ interface UserData {
 export interface ApiClientResponse {
     users: UserData[];
 }
-declare const getHydratedUsers: (baseUrl: string | undefined, userIds: string[]) => Promise<User[]>;
+declare const getHydratedUsers: (baseUrl: string | undefined, userIds: string[], attributionData?: Partial<AtlAttributionHeaderData>) => Promise<User[]>;
 export default getHydratedUsers;

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;
@@ -225,6 +233,10 @@ export interface SmartProps {
      * Identifier for the product's tenant, also known as tenantId or cloudId
      */
     siteId: string;
+    /**
+     * Identifier for the product activation.
+     */
+    activationId?: string;
     /**
      * Identifier for the organization in which to search for teams.
      */
@@ -258,6 +270,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.1",
 	"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.23.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",
@@ -68,10 +68,13 @@
 		"smart-user-picker-load-options-gate": {
 			"type": "boolean"
 		},
-		"smart-user-picker-managed-teams-gate": {
+		"smart-user-picker-restrict-to-gate": {
 			"type": "boolean"
 		},
-		"smart-user-picker-restrict-to-gate": {
+		"smart_user_picker_allow_email_if_team_is_found": {
+			"type": "boolean"
+		},
+		"smart-user-picker-attribution-header": {
 			"type": "boolean"
 		}
 	}

package/tsconfig.json

@@ -15,6 +15,5 @@
     "**/stories/*.tsx",
     "**/stories/**/*.ts",
     "**/stories/**/*.tsx"
-  ],
-  "compilerOptions": {}
+  ]
 }