@atlaskit/smart-user-picker 8.1.0 → 8.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlassian/smart-user-picker
 
+## 8.2.0
+
+### Minor Changes
+
+- [`272ab9229ad98`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/272ab9229ad98) -
+  add additional userResolvers prop to support adding additional contacts to existing user
+  recommendations
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.1.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../analytics/analytics-next/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../data/ufo-external/afm-cc/tsconfig.json"
 		},

package/afm-passionfruit/tsconfig.json

@@ -0,0 +1,35 @@
+{
+	"extends": "../../../../tsconfig.entry-points.passionfruit.json",
+	"compilerOptions": {
+		"target": "es5",
+		"outDir": "../../../../../passionfruit/tsDist/@atlaskit__smart-user-picker/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*",
+		"../src/**/examples.*",
+		"../src/**/examples/*",
+		"../src/**/examples/**/*",
+		"../src/**/*.stories.*",
+		"../src/**/stories/*",
+		"../src/**/stories/**/*"
+	],
+	"references": [
+		{
+			"path": "../../../analytics/analytics-next/afm-passionfruit/tsconfig.json"
+		},
+		{
+			"path": "../../../data/ufo-external/afm-passionfruit/tsconfig.json"
+		},
+		{
+			"path": "../../../elements/user-picker/afm-passionfruit/tsconfig.json"
+		}
+	]
+}

package/afm-volt/tsconfig.json

@@ -13,7 +13,13 @@
 	"exclude": [
 		"../src/**/__tests__/*",
 		"../src/**/*.test.*",
-		"../src/**/test.*"
+		"../src/**/test.*",
+		"../src/**/examples.*",
+		"../src/**/examples/*",
+		"../src/**/examples/**/*",
+		"../src/**/*.stories.*",
+		"../src/**/stories/*",
+		"../src/**/stories/**/*"
 	],
 	"references": [
 		{

package/dist/cjs/analytics.js

@@ -4,14 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.successfulRequestUsersEvent = exports.startSession = exports.requestUsersEvent = exports.preparedUsersLoadedEvent = exports.mountedWithPrefetchEvent = exports.filterUsersEvent = exports.failedRequestUsersEvent = exports.createAndFireEventInElementsChannel = void 0;
+exports.successfulRequestUsersEvent = exports.startSession = exports.requestUsersEvent = exports.preparedUsersLoadedEvent = exports.mountedWithPrefetchEvent = exports.filterUsersEvent = exports.failedUserResolversEvent = exports.failedRequestUsersEvent = exports.createAndFireEventInElementsChannel = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 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; }
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "8.0.1";
+var packageVersion = "8.1.0";
 var startSession = exports.startSession = function startSession() {
   return {
     id: (0, _uuid.v4)(),
@@ -97,4 +97,8 @@ var successfulRequestUsersEvent = exports.successfulRequestUsersEvent = function
 var failedRequestUsersEvent = exports.failedRequestUsersEvent = function failedRequestUsersEvent(props, state) {
   var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return createSmartUserPickerEvent('failed', 'usersRequest', _objectSpread(_objectSpread({}, createDefaultSmartPickerAttributes(props, state)), attributes));
+};
+var failedUserResolversEvent = exports.failedUserResolversEvent = function failedUserResolversEvent(props, state) {
+  var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  return createSmartUserPickerEvent('failed', 'userResolversRequest', _objectSpread(_objectSpread({}, createDefaultSmartPickerAttributes(props, state)), attributes));
 };

package/dist/cjs/components/SmartUserPicker.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.SmartUserPickerWithoutAnalytics = exports.SmartUserPicker = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -23,6 +25,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _reactIntlNext = require("react-intl-next");
 var _ufo = require("@atlaskit/ufo");
 var _userPicker = _interopRequireWildcard(require("@atlaskit/user-picker"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _MessagesIntlProvider = _interopRequireDefault(require("./MessagesIntlProvider"));
 var _service = require("../service");
@@ -107,12 +110,12 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
     });
     (0, _defineProperty2.default)(_this, "memoizedFilterOptions", (0, _memoizeOne.default)(_this.filterOptions));
     (0, _defineProperty2.default)(_this, "getUsers", (0, _debounce.default)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeUsers, includeNonLicensedUsers, intl, maxOptions, objectId, onEmpty, onError, overrideByline, orgId, principalId, productAttributes, productKey, searchQueryFilter, siteId, transformOptions, maxNumberOfResults, startTime, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, _iterator, _step, option, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli;
+      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeUsers, includeNonLicensedUsers, intl, maxOptions, objectId, onEmpty, onError, overrideByline, orgId, principalId, productAttributes, productKey, searchQueryFilter, siteId, transformOptions, userResolvers, maxNumberOfResults, startTime, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, 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, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions;
+            _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, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions, userResolvers = _this$props.userResolvers;
             maxNumberOfResults = maxOptions || 100;
             startTime = window.performance.now();
             recommendationsRequest = {
@@ -140,10 +143,36 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             _context.prev = 5;
             _query = _this.state.query;
             _this.fireEvent(_analytics.requestUsersEvent);
-            _context.next = 10;
+            if (!(0, _platformFeatureFlags.fg)('twcg-444-invite-usd-improvements-m2-gate')) {
+              _context.next = 20;
+              break;
+            }
+            userRecommendationsPromise = (0, _service.getUserRecommendations)(recommendationsRequest, intl);
+            userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(function (resolver) {
+              return resolver(_query).catch(function (error) {
+                _this.fireEvent(_analytics.failedUserResolversEvent, {
+                  resolverName: resolver.name,
+                  error: error
+                });
+                return [];
+              });
+            });
+            _context.next = 13;
+            return Promise.all([userRecommendationsPromise].concat((0, _toConsumableArray2.default)(userResolversPromises)));
+          case 13:
+            _yield$Promise$all = _context.sent;
+            _yield$Promise$all2 = (0, _toArray2.default)(_yield$Promise$all);
+            mainRecommendations = _yield$Promise$all2[0];
+            userResolverResults = _yield$Promise$all2.slice(1);
+            recommendedUsers = [mainRecommendations].concat((0, _toConsumableArray2.default)(userResolverResults)).flat();
+            _context.next = 23;
+            break;
+          case 20:
+            _context.next = 22;
             return (0, _service.getUserRecommendations)(recommendationsRequest, intl);
-          case 10:
+          case 22:
             recommendedUsers = _context.sent;
+          case 23:
             if (overrideByline) {
               _iterator = _createForOfIteratorHelper(recommendedUsers);
               try {
@@ -161,71 +190,75 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 19;
+              _context.next = 31;
               break;
             }
-            _context.next = 16;
+            _context.next = 28;
             return transformOptions(recommendedUsers, _query);
-          case 16:
+          case 28:
             _context.t0 = _context.sent;
-            _context.next = 20;
+            _context.next = 32;
             break;
-          case 19:
+          case 31:
             _context.t0 = recommendedUsers;
-          case 20:
+          case 32:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 36;
+              _context.next = 48;
               break;
             }
-            _context.next = 24;
+            _context.next = 36;
             return onEmpty(_query);
-          case 24:
+          case 36:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 28;
+              _context.next = 40;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 28:
+          case 40:
             if (!_context.t2) {
-              _context.next = 32;
+              _context.next = 44;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 33;
+            _context.next = 45;
             break;
-          case 32:
+          case 44:
             _context.t4 = [];
-          case 33:
+          case 45:
             _context.t1 = _context.t4;
-            _context.next = 37;
+            _context.next = 49;
             break;
-          case 36:
+          case 48:
             _context.t1 = transformedOptions;
-          case 37:
+          case 49:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
               var users = applicable ? displayedUsers : state.users;
               var loading = !applicable;
-              _this.fireEvent(_analytics.successfulRequestUsersEvent, {
+              _this.fireEvent(_analytics.successfulRequestUsersEvent, _objectSpread({
                 users: getUsersForAnalytics(recommendedUsers),
                 elapsedTimeMilli: elapsedTimeMilli,
                 displayedUsers: getUsersForAnalytics(displayedUsers),
                 productAttributes: productAttributes,
                 applicable: applicable
-              });
+              }, (0, _platformFeatureFlags.fg)('twcg-444-invite-usd-improvements-m2-gate') && {
+                userResolvers: Array.isArray(userResolvers) ? userResolvers.map(function (resolver) {
+                  return resolver.name;
+                }) : []
+              }));
               return {
                 users: users,
                 loading: loading
               };
             });
-            _context.next = 70;
+            _context.next = 82;
             break;
-          case 41:
-            _context.prev = 41;
+          case 53:
+            _context.prev = 53;
             _context.t5 = _context["catch"](5);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -238,35 +271,35 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 48;
+            _context.prev = 60;
             if (!onError) {
-              _context.next = 58;
+              _context.next = 70;
               break;
             }
-            _context.next = 52;
+            _context.next = 64;
             return onError(_context.t5, recommendationsRequest);
-          case 52:
+          case 64:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 55;
+              _context.next = 67;
               break;
             }
             _context.t7 = [];
-          case 55:
+          case 67:
             _context.t6 = _context.t7;
-            _context.next = 59;
+            _context.next = 71;
             break;
-          case 58:
+          case 70:
             _context.t6 = [];
-          case 59:
+          case 71:
             defaultUsers = _context.t6;
-            _context.next = 65;
+            _context.next = 77;
             break;
-          case 62:
-            _context.prev = 62;
-            _context.t8 = _context["catch"](48);
+          case 74:
+            _context.prev = 74;
+            _context.t8 = _context["catch"](60);
             onErrorProducedError = true;
-          case 65:
+          case 77:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -283,11 +316,11 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 70:
+          case 82:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 41], [48, 62]]);
+      }, _callee, null, [[5, 53], [60, 74]]);
     })), (_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 || '';
@@ -474,6 +507,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
   includeNonLicensedUsers: false,
   prefetch: false,
   principalId: 'Context',
-  debounceTime: DEFAULT_DEBOUNCE_TIME_MS
+  debounceTime: DEFAULT_DEBOUNCE_TIME_MS,
+  userResolvers: []
 });
 var SmartUserPicker = exports.SmartUserPicker = (0, _analyticsNext.withAnalyticsEvents)()((0, _reactIntlNext.injectIntl)(SmartUserPickerWithoutAnalytics));

package/dist/es2019/analytics.js

@@ -1,7 +1,7 @@
 import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { v4 as uuid } from 'uuid';
 const packageName = "@atlaskit/smart-user-picker";
-const packageVersion = "8.0.1";
+const packageVersion = "8.1.0";
 export const startSession = () => ({
   id: uuid(),
   start: Date.now(),
@@ -85,4 +85,8 @@ export const successfulRequestUsersEvent = (props, state, attributes = {}) => cr
 export const failedRequestUsersEvent = (props, state, attributes = {}) => createSmartUserPickerEvent('failed', 'usersRequest', {
   ...createDefaultSmartPickerAttributes(props, state),
   ...attributes
+});
+export const failedUserResolversEvent = (props, state, attributes = {}) => createSmartUserPickerEvent('failed', 'userResolversRequest', {
+  ...createDefaultSmartPickerAttributes(props, state),
+  ...attributes
 });

package/dist/es2019/components/SmartUserPicker.js

@@ -8,7 +8,8 @@ import memoizeOne from 'memoize-one';
 import { injectIntl } from 'react-intl-next';
 import { UFOExperienceState } from '@atlaskit/ufo';
 import UserPicker, { isExternalUser, isTeam, isUser } from '@atlaskit/user-picker';
-import { requestUsersEvent, filterUsersEvent, preparedUsersLoadedEvent, successfulRequestUsersEvent, failedRequestUsersEvent, mountedWithPrefetchEvent, createAndFireEventInElementsChannel } from '../analytics';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { requestUsersEvent, filterUsersEvent, preparedUsersLoadedEvent, successfulRequestUsersEvent, failedRequestUsersEvent, mountedWithPrefetchEvent, createAndFireEventInElementsChannel, failedUserResolversEvent } from '../analytics';
 import MessagesIntlProvider from './MessagesIntlProvider';
 import { getUserRecommendations, hydrateDefaultValues } from '../service';
 import { smartUserPickerOptionsShownUfoExperience } from '../ufoExperiences';
@@ -98,7 +99,8 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         productKey,
         searchQueryFilter,
         siteId,
-        transformOptions
+        transformOptions,
+        userResolvers
       } = this.props;
       const maxNumberOfResults = maxOptions || 100;
       const startTime = window.performance.now();
@@ -130,7 +132,21 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
           query
         } = this.state;
         this.fireEvent(requestUsersEvent);
-        const recommendedUsers = await getUserRecommendations(recommendationsRequest, intl);
+        let recommendedUsers;
+        if (fg('twcg-444-invite-usd-improvements-m2-gate')) {
+          const userRecommendationsPromise = getUserRecommendations(recommendationsRequest, intl);
+          const userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(resolver => resolver(query).catch(error => {
+            this.fireEvent(failedUserResolversEvent, {
+              resolverName: resolver.name,
+              error
+            });
+            return [];
+          }));
+          const [mainRecommendations, ...userResolverResults] = await Promise.all([userRecommendationsPromise, ...userResolversPromises]);
+          recommendedUsers = [mainRecommendations, ...userResolverResults].flat();
+        } else {
+          recommendedUsers = await getUserRecommendations(recommendationsRequest, intl);
+        }
         if (overrideByline) {
           for (let option of recommendedUsers) {
             if (isUser(option) || isExternalUser(option) || isTeam(option)) {
@@ -150,7 +166,10 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
             elapsedTimeMilli,
             displayedUsers: getUsersForAnalytics(displayedUsers),
             productAttributes,
-            applicable
+            applicable,
+            ...(fg('twcg-444-invite-usd-improvements-m2-gate') && {
+              userResolvers: Array.isArray(userResolvers) ? userResolvers.map(resolver => resolver.name) : []
+            })
           });
           return {
             users,
@@ -349,6 +368,7 @@ _defineProperty(SmartUserPickerWithoutAnalytics, "defaultProps", {
   includeNonLicensedUsers: false,
   prefetch: false,
   principalId: 'Context',
-  debounceTime: DEFAULT_DEBOUNCE_TIME_MS
+  debounceTime: DEFAULT_DEBOUNCE_TIME_MS,
+  userResolvers: []
 });
 export const SmartUserPicker = withAnalyticsEvents()(injectIntl(SmartUserPickerWithoutAnalytics));

package/dist/esm/analytics.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { v4 as uuid } from 'uuid';
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "8.0.1";
+var packageVersion = "8.1.0";
 export var startSession = function startSession() {
   return {
     id: uuid(),
@@ -90,4 +90,8 @@ export var successfulRequestUsersEvent = function successfulRequestUsersEvent(pr
 export var failedRequestUsersEvent = function failedRequestUsersEvent(props, state) {
   var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return createSmartUserPickerEvent('failed', 'usersRequest', _objectSpread(_objectSpread({}, createDefaultSmartPickerAttributes(props, state)), attributes));
+};
+export var failedUserResolversEvent = function failedUserResolversEvent(props, state) {
+  var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  return createSmartUserPickerEvent('failed', 'userResolversRequest', _objectSpread(_objectSpread({}, createDefaultSmartPickerAttributes(props, state)), attributes));
 };

package/dist/esm/components/SmartUserPicker.js

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _toArray from "@babel/runtime/helpers/toArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -6,9 +8,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -22,7 +24,8 @@ import memoizeOne from 'memoize-one';
 import { injectIntl } from 'react-intl-next';
 import { UFOExperienceState } from '@atlaskit/ufo';
 import UserPicker, { isExternalUser, isTeam, isUser } from '@atlaskit/user-picker';
-import { requestUsersEvent, filterUsersEvent, preparedUsersLoadedEvent, successfulRequestUsersEvent, failedRequestUsersEvent, mountedWithPrefetchEvent, createAndFireEventInElementsChannel } from '../analytics';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { requestUsersEvent, filterUsersEvent, preparedUsersLoadedEvent, successfulRequestUsersEvent, failedRequestUsersEvent, mountedWithPrefetchEvent, createAndFireEventInElementsChannel, failedUserResolversEvent } from '../analytics';
 import MessagesIntlProvider from './MessagesIntlProvider';
 import { getUserRecommendations, hydrateDefaultValues } from '../service';
 import { smartUserPickerOptionsShownUfoExperience } from '../ufoExperiences';
@@ -98,12 +101,12 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
     });
     _defineProperty(_this, "memoizedFilterOptions", memoizeOne(_this.filterOptions));
     _defineProperty(_this, "getUsers", debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeUsers, includeNonLicensedUsers, intl, maxOptions, objectId, onEmpty, onError, overrideByline, orgId, principalId, productAttributes, productKey, searchQueryFilter, siteId, transformOptions, maxNumberOfResults, startTime, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, _iterator, _step, option, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli;
+      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeUsers, includeNonLicensedUsers, intl, maxOptions, objectId, onEmpty, onError, overrideByline, orgId, principalId, productAttributes, productKey, searchQueryFilter, siteId, transformOptions, userResolvers, maxNumberOfResults, startTime, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, 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, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions;
+            _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, includeUsers = _this$props.includeUsers, includeNonLicensedUsers = _this$props.includeNonLicensedUsers, intl = _this$props.intl, maxOptions = _this$props.maxOptions, objectId = _this$props.objectId, onEmpty = _this$props.onEmpty, onError = _this$props.onError, overrideByline = _this$props.overrideByline, orgId = _this$props.orgId, principalId = _this$props.principalId, productAttributes = _this$props.productAttributes, productKey = _this$props.productKey, searchQueryFilter = _this$props.searchQueryFilter, siteId = _this$props.siteId, transformOptions = _this$props.transformOptions, userResolvers = _this$props.userResolvers;
             maxNumberOfResults = maxOptions || 100;
             startTime = window.performance.now();
             recommendationsRequest = {
@@ -131,10 +134,36 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             _context.prev = 5;
             _query = _this.state.query;
             _this.fireEvent(requestUsersEvent);
-            _context.next = 10;
+            if (!fg('twcg-444-invite-usd-improvements-m2-gate')) {
+              _context.next = 20;
+              break;
+            }
+            userRecommendationsPromise = getUserRecommendations(recommendationsRequest, intl);
+            userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(function (resolver) {
+              return resolver(_query).catch(function (error) {
+                _this.fireEvent(failedUserResolversEvent, {
+                  resolverName: resolver.name,
+                  error: error
+                });
+                return [];
+              });
+            });
+            _context.next = 13;
+            return Promise.all([userRecommendationsPromise].concat(_toConsumableArray(userResolversPromises)));
+          case 13:
+            _yield$Promise$all = _context.sent;
+            _yield$Promise$all2 = _toArray(_yield$Promise$all);
+            mainRecommendations = _yield$Promise$all2[0];
+            userResolverResults = _yield$Promise$all2.slice(1);
+            recommendedUsers = [mainRecommendations].concat(_toConsumableArray(userResolverResults)).flat();
+            _context.next = 23;
+            break;
+          case 20:
+            _context.next = 22;
             return getUserRecommendations(recommendationsRequest, intl);
-          case 10:
+          case 22:
             recommendedUsers = _context.sent;
+          case 23:
             if (overrideByline) {
               _iterator = _createForOfIteratorHelper(recommendedUsers);
               try {
@@ -152,71 +181,75 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 19;
+              _context.next = 31;
               break;
             }
-            _context.next = 16;
+            _context.next = 28;
             return transformOptions(recommendedUsers, _query);
-          case 16:
+          case 28:
             _context.t0 = _context.sent;
-            _context.next = 20;
+            _context.next = 32;
             break;
-          case 19:
+          case 31:
             _context.t0 = recommendedUsers;
-          case 20:
+          case 32:
             transformedOptions = _context.t0;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 36;
+              _context.next = 48;
               break;
             }
-            _context.next = 24;
+            _context.next = 36;
             return onEmpty(_query);
-          case 24:
+          case 36:
             _context.t3 = _yield$onEmpty = _context.sent;
             _context.t2 = _context.t3 !== null;
             if (!_context.t2) {
-              _context.next = 28;
+              _context.next = 40;
               break;
             }
             _context.t2 = _yield$onEmpty !== void 0;
-          case 28:
+          case 40:
             if (!_context.t2) {
-              _context.next = 32;
+              _context.next = 44;
               break;
             }
             _context.t4 = _yield$onEmpty;
-            _context.next = 33;
+            _context.next = 45;
             break;
-          case 32:
+          case 44:
             _context.t4 = [];
-          case 33:
+          case 45:
             _context.t1 = _context.t4;
-            _context.next = 37;
+            _context.next = 49;
             break;
-          case 36:
+          case 48:
             _context.t1 = transformedOptions;
-          case 37:
+          case 49:
             displayedUsers = _context.t1;
             _this.setState(function (state) {
               var applicable = state.query === _query;
               var users = applicable ? displayedUsers : state.users;
               var loading = !applicable;
-              _this.fireEvent(successfulRequestUsersEvent, {
+              _this.fireEvent(successfulRequestUsersEvent, _objectSpread({
                 users: getUsersForAnalytics(recommendedUsers),
                 elapsedTimeMilli: elapsedTimeMilli,
                 displayedUsers: getUsersForAnalytics(displayedUsers),
                 productAttributes: productAttributes,
                 applicable: applicable
-              });
+              }, fg('twcg-444-invite-usd-improvements-m2-gate') && {
+                userResolvers: Array.isArray(userResolvers) ? userResolvers.map(function (resolver) {
+                  return resolver.name;
+                }) : []
+              }));
               return {
                 users: users,
                 loading: loading
               };
             });
-            _context.next = 70;
+            _context.next = 82;
             break;
-          case 41:
-            _context.prev = 41;
+          case 53:
+            _context.prev = 53;
             _context.t5 = _context["catch"](5);
             is5xxEvent = checkIf500Event(_context.t5.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -229,35 +262,35 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 48;
+            _context.prev = 60;
             if (!onError) {
-              _context.next = 58;
+              _context.next = 70;
               break;
             }
-            _context.next = 52;
+            _context.next = 64;
             return onError(_context.t5, recommendationsRequest);
-          case 52:
+          case 64:
             _context.t7 = _context.sent;
             if (_context.t7) {
-              _context.next = 55;
+              _context.next = 67;
               break;
             }
             _context.t7 = [];
-          case 55:
+          case 67:
             _context.t6 = _context.t7;
-            _context.next = 59;
+            _context.next = 71;
             break;
-          case 58:
+          case 70:
             _context.t6 = [];
-          case 59:
+          case 71:
             defaultUsers = _context.t6;
-            _context.next = 65;
+            _context.next = 77;
             break;
-          case 62:
-            _context.prev = 62;
-            _context.t8 = _context["catch"](48);
+          case 74:
+            _context.prev = 74;
+            _context.t8 = _context["catch"](60);
             onErrorProducedError = true;
-          case 65:
+          case 77:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -274,11 +307,11 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 70:
+          case 82:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 41], [48, 62]]);
+      }, _callee, null, [[5, 53], [60, 74]]);
     })), (_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 || '';
@@ -467,6 +500,7 @@ _defineProperty(SmartUserPickerWithoutAnalytics, "defaultProps", {
   includeNonLicensedUsers: false,
   prefetch: false,
   principalId: 'Context',
-  debounceTime: DEFAULT_DEBOUNCE_TIME_MS
+  debounceTime: DEFAULT_DEBOUNCE_TIME_MS,
+  userResolvers: []
 });
 export var SmartUserPicker = withAnalyticsEvents()(injectIntl(SmartUserPickerWithoutAnalytics));

package/dist/types/analytics.d.ts

@@ -19,3 +19,4 @@ export declare const filterUsersEvent: SmartEventCreator;
 export declare const requestUsersEvent: SmartEventCreator;
 export declare const successfulRequestUsersEvent: SmartEventCreator;
 export declare const failedRequestUsersEvent: SmartEventCreator;
+export declare const failedUserResolversEvent: SmartEventCreator;

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

@@ -15,6 +15,7 @@ export declare class SmartUserPickerWithoutAnalytics extends React.Component<Pro
         prefetch: boolean;
         principalId: string;
         debounceTime: number;
+        userResolvers: never[];
     };
     constructor(props: Props & WrappedComponentProps);
     componentDidMount(): Promise<void>;

package/dist/types/types.d.ts

@@ -196,6 +196,10 @@ export interface SmartProps {
      * Called after options are loaded.
      */
     transformOptions?: TransformOptions;
+    /**
+     * Optional callback to provide additional user resolvers, such as for fetching and adding users from third party sources
+     */
+    userResolvers?: Array<(query: string) => Promise<OptionData[]>>;
 }
 export interface Props extends SmartProps, UserPickerProps, WithAnalyticsEventsProps {
     /**

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

@@ -19,3 +19,4 @@ export declare const filterUsersEvent: SmartEventCreator;
 export declare const requestUsersEvent: SmartEventCreator;
 export declare const successfulRequestUsersEvent: SmartEventCreator;
 export declare const failedRequestUsersEvent: SmartEventCreator;
+export declare const failedUserResolversEvent: SmartEventCreator;

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

@@ -15,6 +15,7 @@ export declare class SmartUserPickerWithoutAnalytics extends React.Component<Pro
         prefetch: boolean;
         principalId: string;
         debounceTime: number;
+        userResolvers: never[];
     };
     constructor(props: Props & WrappedComponentProps);
     componentDidMount(): Promise<void>;

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

@@ -196,6 +196,10 @@ export interface SmartProps {
      * Called after options are loaded.
      */
     transformOptions?: TransformOptions;
+    /**
+     * Optional callback to provide additional user resolvers, such as for fetching and adding users from third party sources
+     */
+    userResolvers?: Array<(query: string) => Promise<OptionData[]>>;
 }
 export interface Props extends SmartProps, UserPickerProps, WithAnalyticsEventsProps {
     /**

package/option/package.json

@@ -6,7 +6,7 @@
   "sideEffects": false,
   "types": "../dist/types/option.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/option.d.ts"
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-user-picker",
-	"version": "8.1.0",
+	"version": "8.2.0",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,8 +39,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/analytics-next": "^11.1.0",
+		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/ufo": "^0.4.0",
-		"@atlaskit/user-picker": "^11.4.0",
+		"@atlaskit/user-picker": "^11.6.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
@@ -53,7 +54,7 @@
 	},
 	"devDependencies": {
 		"@atlaskit/select": "^21.2.0",
-		"@atlaskit/util-data-test": "^18.0.0",
+		"@atlaskit/util-data-test": "^18.1.0",
 		"@testing-library/dom": "^10.1.0",
 		"@testing-library/react": "^13.4.0",
 		"@testing-library/user-event": "^14.4.3",
@@ -61,5 +62,10 @@
 		"fetch-mock": "^8.0.0",
 		"graphql-tag": "^2.10.1",
 		"mock-apollo-client": "^0.1.0"
+	},
+	"platform-feature-flags": {
+		"twcg-444-invite-usd-improvements-m2-gate": {
+			"type": "boolean"
+		}
 	}
 }