@atlaskit/smart-user-picker 7.0.1 → 8.0.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlassian/smart-user-picker
 
+## 8.0.1
+
+### Patch Changes
+
+- [#139492](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139492)
+  [`27030518ad18e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/27030518ad18e) -
+  The SmartUserPicker currently calls the teams v3 api which has been deprecated since December,
+  resulting in 404 api calls. This change has updated the api from v3 to v4 so that api calls can be
+  made and data successfull retrieved.
+
+## 8.0.0
+
+### Major Changes
+
+- [#117363](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117363)
+  [`10a0f7f6c2027`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10a0f7f6c2027) -
+  This package's `peerDependencies` have been adjusted for `react` and/or `react-dom` to reflect the
+  status of only supporting React 18 going forward. No explicit breaking change to React support has
+  been made in this release, but this is to signify going forward, breaking changes for React 16 or
+  React 17 may come via non-major semver releases.
+
+  Please refer this community post for more details:
+  https://community.developer.atlassian.com/t/rfc-78-dropping-support-for-react-16-and-rendering-in-a-react-18-concurrent-root-in-jira-and-confluence/87026
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 7.0.1
 
 ### 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; }
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "7.0.1";
+var packageVersion = "8.0.1";
 var startSession = exports.startSession = function startSession() {
   return {
     id: (0, _uuid.v4)(),

package/dist/cjs/components/SmartUserPicker.js

@@ -380,7 +380,7 @@ 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);
+              return (0, _service.hydrateDefaultValues)(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId);
             case 3:
               value = _context2.sent;
               this.setState({

package/dist/cjs/config/index.js

@@ -15,7 +15,7 @@ var config = exports.config = {
   getGraphQLUrl: function getGraphQLUrl(baseUrl) {
     return baseUrl ? "".concat(baseUrl, "/gateway/api/graphql") : "/gateway/api/graphql";
   },
-  getTeamsUrl: function getTeamsUrl(baseUrl) {
-    return baseUrl ? "".concat(baseUrl, "/gateway/api/v3/teams") : "/gateway/api/v3/teams";
+  getTeamsUrl: function getTeamsUrl(id, baseUrl, siteId) {
+    return baseUrl ? "".concat(baseUrl, "/gateway/api/v4/teams/").concat(id, "?siteId=").concat(siteId !== null && siteId !== void 0 ? siteId : 'None') : "/gateway/api/v4/teams/".concat(id, "?siteId=").concat(siteId !== null && siteId !== void 0 ? siteId : 'None');
   }
 };

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

@@ -93,7 +93,7 @@ var isOptionData = function isOptionData(option) {
   return option.name !== undefined;
 };
 var hydrateTeamIds = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(baseUrl, values) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(baseUrl, values, siteId) {
     var legionPromises;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -107,7 +107,8 @@ var hydrateTeamIds = /*#__PURE__*/function () {
           legionPromises = values.map(function (value) {
             return (0, _teamsClient.default)({
               baseUrl: baseUrl,
-              id: value.id
+              id: value.id,
+              siteId: siteId
             });
           });
           _context.next = 5;
@@ -120,7 +121,7 @@ var hydrateTeamIds = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function hydrateTeamIds(_x, _x2) {
+  return function hydrateTeamIds(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -166,15 +167,15 @@ var hydrateAccountIds = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function hydrateAccountIds(_x3, _x4, _x5) {
+  return function hydrateAccountIds(_x4, _x5, _x6) {
     return _ref2.apply(this, arguments);
   };
 }();
-function hydrateDefaultValues(_x6, _x7, _x8) {
+function hydrateDefaultValues(_x7, _x8, _x9, _x10) {
   return _hydrateDefaultValues.apply(this, arguments);
 }
 function _hydrateDefaultValues() {
-  _hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(baseUrl, value, productKey) {
+  _hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(baseUrl, value, productKey, siteId) {
     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) {
@@ -199,7 +200,7 @@ function _hydrateDefaultValues() {
             return !isOptionData(val) && val.type === 'user';
           })), hydrateTeamIds(baseUrl, values.filter(function (val) {
             return !isOptionData(val) && val.type === 'team';
-          }))]);
+          }), siteId)]);
         case 7:
           _yield$Promise$all = _context3.sent;
           _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 2);

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

@@ -19,7 +19,7 @@ var transformTeam = function transformTeam(team, id) {
   };
 };
 var hydrateTeamFromLegion = function hydrateTeamFromLegion(request) {
-  var url = "".concat(_config.config.getTeamsUrl(request.baseUrl), "/").concat(request.id);
+  var url = _config.config.getTeamsUrl(request.id, request.baseUrl, request.siteId);
   return fetch(url, {
     method: 'GET',
     credentials: 'include',

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 = "7.0.1";
+const packageVersion = "8.0.1";
 export const startSession = () => ({
   id: uuid(),
   start: Date.now(),

package/dist/es2019/components/SmartUserPicker.js

@@ -284,7 +284,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
   }
   async componentDidMount() {
     try {
-      const value = await hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey);
+      const value = await hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId);
       this.setState({
         defaultValue: value
       });

package/dist/es2019/config/index.js

@@ -8,7 +8,7 @@ export const config = {
   getGraphQLUrl(baseUrl) {
     return baseUrl ? `${baseUrl}/gateway/api/graphql` : `/gateway/api/graphql`;
   },
-  getTeamsUrl(baseUrl) {
-    return baseUrl ? `${baseUrl}/gateway/api/v3/teams` : `/gateway/api/v3/teams`;
+  getTeamsUrl(id, baseUrl, siteId) {
+    return baseUrl ? `${baseUrl}/gateway/api/v4/teams/${id}?siteId=${siteId !== null && siteId !== void 0 ? siteId : 'None'}` : `/gateway/api/v4/teams/${id}?siteId=${siteId !== null && siteId !== void 0 ? siteId : 'None'}`;
   }
 };

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

@@ -66,13 +66,14 @@ const sortResults = (options, sortIds) => {
 const isOptionData = option => {
   return option.name !== undefined;
 };
-const hydrateTeamIds = async (baseUrl, values) => {
+const hydrateTeamIds = async (baseUrl, values, siteId) => {
   if (values.length === 0) {
     return [];
   }
   const legionPromises = values.map(value => hydrateTeamFromLegion({
     baseUrl,
-    id: value.id
+    id: value.id,
+    siteId
   }));
   return await Promise.all(legionPromises);
 };
@@ -89,7 +90,7 @@ const hydrateAccountIds = async (baseUrl, productKey, values) => {
     accountIds
   }) : await getHydratedUsersFromPrs(baseUrl, accountIds);
 };
-async function hydrateDefaultValues(baseUrl, value, productKey) {
+async function hydrateDefaultValues(baseUrl, value, productKey, siteId) {
   //return if no value
   if (!value || Array.isArray(value) && value.length === 0) {
     return [];
@@ -100,7 +101,7 @@ async function hydrateDefaultValues(baseUrl, value, productKey) {
   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'))]);
+  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 hydratedOptions = values.filter(val => isOptionData(val)).map(val => val).concat(hydratedUsers).concat(hydratedTeams);
   return sortResults(hydratedOptions, values);
 }

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

@@ -9,7 +9,7 @@ const transformTeam = (team, id) => {
   };
 };
 const hydrateTeamFromLegion = request => {
-  const url = `${config.getTeamsUrl(request.baseUrl)}/${request.id}`;
+  const url = config.getTeamsUrl(request.id, request.baseUrl, request.siteId);
   return fetch(url, {
     method: 'GET',
     credentials: 'include',

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 = "7.0.1";
+var packageVersion = "8.0.1";
 export var startSession = function startSession() {
   return {
     id: uuid(),

package/dist/esm/components/SmartUserPicker.js

@@ -370,7 +370,7 @@ 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);
+              return hydrateDefaultValues(this.props.baseUrl, this.props.defaultValue, this.props.productKey, this.props.siteId);
             case 3:
               value = _context2.sent;
               this.setState({

package/dist/esm/config/index.js

@@ -9,7 +9,7 @@ export var config = {
   getGraphQLUrl: function getGraphQLUrl(baseUrl) {
     return baseUrl ? "".concat(baseUrl, "/gateway/api/graphql") : "/gateway/api/graphql";
   },
-  getTeamsUrl: function getTeamsUrl(baseUrl) {
-    return baseUrl ? "".concat(baseUrl, "/gateway/api/v3/teams") : "/gateway/api/v3/teams";
+  getTeamsUrl: function getTeamsUrl(id, baseUrl, siteId) {
+    return baseUrl ? "".concat(baseUrl, "/gateway/api/v4/teams/").concat(id, "?siteId=").concat(siteId !== null && siteId !== void 0 ? siteId : 'None') : "/gateway/api/v4/teams/".concat(id, "?siteId=").concat(siteId !== null && siteId !== void 0 ? siteId : 'None');
   }
 };

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

@@ -86,7 +86,7 @@ var isOptionData = function isOptionData(option) {
   return option.name !== undefined;
 };
 var hydrateTeamIds = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(baseUrl, values) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(baseUrl, values, siteId) {
     var legionPromises;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -100,7 +100,8 @@ var hydrateTeamIds = /*#__PURE__*/function () {
           legionPromises = values.map(function (value) {
             return hydrateTeamFromLegion({
               baseUrl: baseUrl,
-              id: value.id
+              id: value.id,
+              siteId: siteId
             });
           });
           _context.next = 5;
@@ -113,7 +114,7 @@ var hydrateTeamIds = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function hydrateTeamIds(_x, _x2) {
+  return function hydrateTeamIds(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -159,15 +160,15 @@ var hydrateAccountIds = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function hydrateAccountIds(_x3, _x4, _x5) {
+  return function hydrateAccountIds(_x4, _x5, _x6) {
     return _ref2.apply(this, arguments);
   };
 }();
-function hydrateDefaultValues(_x6, _x7, _x8) {
+function hydrateDefaultValues(_x7, _x8, _x9, _x10) {
   return _hydrateDefaultValues.apply(this, arguments);
 }
 function _hydrateDefaultValues() {
-  _hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(baseUrl, value, productKey) {
+  _hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(baseUrl, value, productKey, siteId) {
     var values, _yield$Promise$all, _yield$Promise$all2, hydratedUsers, hydratedTeams, hydratedOptions;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -192,7 +193,7 @@ function _hydrateDefaultValues() {
             return !isOptionData(val) && val.type === 'user';
           })), hydrateTeamIds(baseUrl, values.filter(function (val) {
             return !isOptionData(val) && val.type === 'team';
-          }))]);
+          }), siteId)]);
         case 7:
           _yield$Promise$all = _context3.sent;
           _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);

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

@@ -12,7 +12,7 @@ var transformTeam = function transformTeam(team, id) {
   };
 };
 var hydrateTeamFromLegion = function hydrateTeamFromLegion(request) {
-  var url = "".concat(config.getTeamsUrl(request.baseUrl), "/").concat(request.id);
+  var url = config.getTeamsUrl(request.id, request.baseUrl, request.siteId);
   return fetch(url, {
     method: 'GET',
     credentials: 'include',

package/dist/types/config/index.d.ts

@@ -2,5 +2,5 @@ export declare const config: {
     getRecommendationServiceUrl(baseUrl: string): string;
     getUsersServiceUrl(productKey: string, baseUrl?: string): string;
     getGraphQLUrl(baseUrl?: string): string;
-    getTeamsUrl(baseUrl?: string): string;
+    getTeamsUrl(id: string, baseUrl?: string, siteId?: string): string;
 };

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

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

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

@@ -2,6 +2,7 @@ import { type Team } from '@atlaskit/user-picker';
 type LegionRequest = {
     baseUrl?: string;
     id: string;
+    siteId?: string;
 };
 export type LegionResponse = {
     id: string;

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

@@ -2,5 +2,5 @@ export declare const config: {
     getRecommendationServiceUrl(baseUrl: string): string;
     getUsersServiceUrl(productKey: string, baseUrl?: string): string;
     getGraphQLUrl(baseUrl?: string): string;
-    getTeamsUrl(baseUrl?: string): string;
+    getTeamsUrl(id: string, baseUrl?: string, siteId?: string): string;
 };

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

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

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

@@ -2,6 +2,7 @@ import { type Team } from '@atlaskit/user-picker';
 type LegionRequest = {
     baseUrl?: string;
     id: string;
+    siteId?: string;
 };
 export type LegionResponse = {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-user-picker",
-	"version": "7.0.1",
+	"version": "8.0.1",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,9 +39,9 @@
 		}
 	},
 	"dependencies": {
-		"@atlaskit/analytics-next": "^10.3.0",
-		"@atlaskit/ufo": "^0.3.0",
-		"@atlaskit/user-picker": "^10.31.0",
+		"@atlaskit/analytics-next": "^11.0.0",
+		"@atlaskit/ufo": "^0.4.0",
+		"@atlaskit/user-picker": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
@@ -49,11 +49,11 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"react": "^16.8.0 || ^17.0.0 || ^18.2.0",
-		"react-dom": "^16.8.0 || ^17.0.0 || ^18.2.0"
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0"
 	},
 	"devDependencies": {
-		"@atlaskit/select": "^18.10.0",
+		"@atlaskit/select": "^20.3.0",
 		"@atlaskit/util-data-test": "^18.0.0",
 		"@testing-library/dom": "^10.1.0",
 		"@testing-library/react": "^13.4.0",