@atlaskit/smart-user-picker 8.8.0 → 8.9.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlassian/smart-user-picker
 
+## 8.9.0
+
+### Minor Changes
+
+- [`1d3de95b5af00`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d3de95b5af00) -
+  Refactor verifiedTeams filter
+
 ## 8.8.0
 
 ### Minor Changes

package/dist/cjs/components/SmartUserPicker.js

@@ -149,7 +149,8 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail,
-              verifiedTeams: verifiedTeams,
+              // Only request verified teams when both the prop is true and the feature flag is enabled
+              verifiedTeams: verifiedTeams && (0, _platformFeatureFlags.fg)('smart-user-picker-managed-teams-gate'),
               /*
               	For email-based searches, we have decided to filter out apps.
               	Also - because the other 2 filters ((NOT not_mentionable:true) AND (account_status:active)) are included
@@ -255,19 +256,6 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               }
             }
 
-            // Filter to only verified teams when verifiedTeams is true and feature flag is enabled
-            if (verifiedTeams && includeTeams && (0, _platformFeatureFlags.fg)('smart-user-picker-managed-teams-gate')) {
-              recommendedUsers = recommendedUsers.filter(function (option) {
-                if ((0, _userPicker.isTeam)(option)) {
-                  // Only include teams that are verified
-                  // The verified property is set by the transformer from the server response
-                  var team = option;
-                  return team.verified === true;
-                }
-                return true; // Keep non-team options
-              });
-            }
-
             // Track if email search found matches for conditional allowEmail logic
             if (isEmail) {
               _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
@@ -276,50 +264,50 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 42;
+              _context.next = 41;
               break;
             }
-            _context.next = 39;
+            _context.next = 38;
             return transformOptions(recommendedUsers, _query);
-          case 39:
+          case 38:
             _context.t0 = _context.sent;
-            _context.next = 43;
+            _context.next = 42;
             break;
-          case 42:
+          case 41:
             _context.t0 = recommendedUsers;
-          case 43:
+          case 42:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 59;
+              _context.next = 58;
               break;
             }
-            _context.next = 47;
+            _context.next = 46;
             return onEmpty(_query);
-          case 47:
+          case 46:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 51;
+              _context.next = 50;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 51:
+          case 50:
             if (!_context.t2) {
-              _context.next = 55;
+              _context.next = 54;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 56;
+            _context.next = 55;
             break;
-          case 55:
+          case 54:
             _context.t4 = [];
-          case 56:
+          case 55:
             _context.t1 = _context.t4;
-            _context.next = 60;
+            _context.next = 59;
             break;
-          case 59:
+          case 58:
             _context.t1 = transformedOptions;
-          case 60:
+          case 59:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -341,10 +329,10 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
                 loading: loading
               };
             });
-            _context.next = 93;
+            _context.next = 92;
             break;
-          case 64:
-            _context.prev = 64;
+          case 63:
+            _context.prev = 63;
             _context.t5 = _context["catch"](6);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -357,35 +345,35 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 71;
+            _context.prev = 70;
             if (!onError) {
-              _context.next = 81;
+              _context.next = 80;
               break;
             }
-            _context.next = 75;
+            _context.next = 74;
             return onError(_context.t5, recommendationsRequest);
-          case 75:
+          case 74:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 78;
+              _context.next = 77;
               break;
             }
             _context.t7 = [];
-          case 78:
+          case 77:
             _context.t6 = _context.t7;
-            _context.next = 82;
+            _context.next = 81;
             break;
-          case 81:
+          case 80:
             _context.t6 = [];
-          case 82:
+          case 81:
             defaultUsers = _context.t6;
-            _context.next = 88;
+            _context.next = 87;
             break;
-          case 85:
-            _context.prev = 85;
-            _context.t8 = _context["catch"](71);
+          case 84:
+            _context.prev = 84;
+            _context.t8 = _context["catch"](70);
             onErrorProducedError = true;
-          case 88:
+          case 87:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -402,11 +390,11 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 93:
+          case 92:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 64], [71, 85]]);
+      }, _callee, null, [[6, 63], [70, 84]]);
     })), (_this$props$debounceT = _this.props.debounceTime) !== null && _this$props$debounceT !== void 0 ? _this$props$debounceT : 0));
     (0, _defineProperty2.default)(_this, "onInputChange", function (newQuery, sessionId) {
       var query = newQuery || '';

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

@@ -27,6 +27,7 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
+      isVerifiedTeamFilter: request.verifiedTeams,
       searchQuery: _objectSpread(_objectSpread({
         cpusQueryHighlights: {
           query: '',

package/dist/es2019/components/SmartUserPicker.js

@@ -142,7 +142,8 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         maxNumberOfResults,
         query,
         searchEmail: isEmail,
-        verifiedTeams,
+        // Only request verified teams when both the prop is true and the feature flag is enabled
+        verifiedTeams: verifiedTeams && fg('smart-user-picker-managed-teams-gate'),
         /*
         	For email-based searches, we have decided to filter out apps.
         	Also - because the other 2 filters ((NOT not_mentionable:true) AND (account_status:active)) are included
@@ -204,19 +205,6 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
           }
         }
 
-        // Filter to only verified teams when verifiedTeams is true and feature flag is enabled
-        if (verifiedTeams && includeTeams && fg('smart-user-picker-managed-teams-gate')) {
-          recommendedUsers = recommendedUsers.filter(option => {
-            if (isTeam(option)) {
-              // Only include teams that are verified
-              // The verified property is set by the transformer from the server response
-              const team = option;
-              return team.verified === true;
-            }
-            return true; // Keep non-team options
-          });
-        }
-
         // Track if email search found matches for conditional allowEmail logic
         if (isEmail) {
           this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;

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

@@ -17,6 +17,7 @@ const getUserRecommendations = (request, intl) => {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
+      isVerifiedTeamFilter: request.verifiedTeams,
       searchQuery: {
         cpusQueryHighlights: {
           query: '',

package/dist/esm/components/SmartUserPicker.js

@@ -141,7 +141,8 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               maxNumberOfResults: maxNumberOfResults,
               query: query,
               searchEmail: isEmail,
-              verifiedTeams: verifiedTeams,
+              // Only request verified teams when both the prop is true and the feature flag is enabled
+              verifiedTeams: verifiedTeams && fg('smart-user-picker-managed-teams-gate'),
               /*
               	For email-based searches, we have decided to filter out apps.
               	Also - because the other 2 filters ((NOT not_mentionable:true) AND (account_status:active)) are included
@@ -247,19 +248,6 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               }
             }
 
-            // Filter to only verified teams when verifiedTeams is true and feature flag is enabled
-            if (verifiedTeams && includeTeams && fg('smart-user-picker-managed-teams-gate')) {
-              recommendedUsers = recommendedUsers.filter(function (option) {
-                if (isTeam(option)) {
-                  // Only include teams that are verified
-                  // The verified property is set by the transformer from the server response
-                  var team = option;
-                  return team.verified === true;
-                }
-                return true; // Keep non-team options
-              });
-            }
-
             // Track if email search found matches for conditional allowEmail logic
             if (isEmail) {
               _this.lastEmailSearchFoundMatches = recommendedUsers.length > 0;
@@ -268,50 +256,50 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 42;
+              _context.next = 41;
               break;
             }
-            _context.next = 39;
+            _context.next = 38;
             return transformOptions(recommendedUsers, _query);
-          case 39:
+          case 38:
             _context.t0 = _context.sent;
-            _context.next = 43;
+            _context.next = 42;
             break;
-          case 42:
+          case 41:
             _context.t0 = recommendedUsers;
-          case 43:
+          case 42:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 59;
+              _context.next = 58;
               break;
             }
-            _context.next = 47;
+            _context.next = 46;
             return onEmpty(_query);
-          case 47:
+          case 46:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 51;
+              _context.next = 50;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 51:
+          case 50:
             if (!_context.t2) {
-              _context.next = 55;
+              _context.next = 54;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 56;
+            _context.next = 55;
             break;
-          case 55:
+          case 54:
             _context.t4 = [];
-          case 56:
+          case 55:
             _context.t1 = _context.t4;
-            _context.next = 60;
+            _context.next = 59;
             break;
-          case 59:
+          case 58:
             _context.t1 = transformedOptions;
-          case 60:
+          case 59:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -333,10 +321,10 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
                 loading: loading
               };
             });
-            _context.next = 93;
+            _context.next = 92;
             break;
-          case 64:
-            _context.prev = 64;
+          case 63:
+            _context.prev = 63;
             _context.t5 = _context["catch"](6);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -349,35 +337,35 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 71;
+            _context.prev = 70;
             if (!onError) {
-              _context.next = 81;
+              _context.next = 80;
               break;
             }
-            _context.next = 75;
+            _context.next = 74;
             return onError(_context.t5, recommendationsRequest);
-          case 75:
+          case 74:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 78;
+              _context.next = 77;
               break;
             }
             _context.t7 = [];
-          case 78:
+          case 77:
             _context.t6 = _context.t7;
-            _context.next = 82;
+            _context.next = 81;
             break;
-          case 81:
+          case 80:
             _context.t6 = [];
-          case 82:
+          case 81:
             defaultUsers = _context.t6;
-            _context.next = 88;
+            _context.next = 87;
             break;
-          case 85:
-            _context.prev = 85;
-            _context.t8 = _context["catch"](71);
+          case 84:
+            _context.prev = 84;
+            _context.t8 = _context["catch"](70);
             onErrorProducedError = true;
-          case 88:
+          case 87:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -394,11 +382,11 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 93:
+          case 92:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 64], [71, 85]]);
+      }, _callee, null, [[6, 63], [70, 84]]);
     })), (_this$props$debounceT = _this.props.debounceTime) !== null && _this$props$debounceT !== void 0 ? _this$props$debounceT : 0));
     _defineProperty(_this, "onInputChange", function (newQuery, sessionId) {
       var query = newQuery || '';

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

@@ -20,6 +20,7 @@ var getUserRecommendations = function getUserRecommendations(request, intl) {
       includeNonLicensedUsers: request.includeNonLicensedUsers,
       maxNumberOfResults: request.maxNumberOfResults,
       performSearchQueryOnly: false,
+      isVerifiedTeamFilter: request.verifiedTeams,
       searchQuery: _objectSpread(_objectSpread({
         cpusQueryHighlights: {
           query: '',

package/package.json

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