@atlaskit/user-picker 8.3.1 → 8.3.5

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/user-picker
 
+## 8.3.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.3.4
+
+### Patch Changes
+
+- [`7f48efc8487`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7f48efc8487) - Use baseUrl prop in default user value hydration query
+
+## 8.3.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.3.2
+
+### Patch Changes
+
+- [`9fd6117d5e4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9fd6117d5e4) - Fix behavior of base URL so that API calls use baseUrl as base url
+
 ## 8.3.1
 
 ### Patch Changes

package/dist/cjs/components/smart-user-picker/components/index.js

@@ -114,7 +114,7 @@ function isOptionData(option) {
  */
 
 
-function hydrateDefaultValues(_x, _x2) {
+function hydrateDefaultValues(_x, _x2, _x3) {
   return _hydrateDefaultValues.apply(this, arguments);
 }
 /**
@@ -123,7 +123,7 @@ function hydrateDefaultValues(_x, _x2) {
 
 
 function _hydrateDefaultValues() {
-  _hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(value, productKey) {
+  _hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(value, productKey, baseUrl) {
     var accountIds, results;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -183,7 +183,8 @@ function _hydrateDefaultValues() {
             _context3.next = 16;
             return (0, _UsersClient.default)({
               productKey: productKey,
-              accountIds: accountIds
+              accountIds: accountIds,
+              baseUrl: baseUrl
             });
 
           case 16:
@@ -495,7 +496,7 @@ var SmartUserPicker = /*#__PURE__*/function (_React$Component) {
               case 0:
                 _context2.prev = 0;
                 _context2.next = 3;
-                return hydrateDefaultValues(this.props.defaultValue, this.props.productKey);
+                return hydrateDefaultValues(this.props.defaultValue, this.props.productKey, this.props.baseUrl);
 
               case 3:
                 value = _context2.sent;

package/dist/cjs/components/smart-user-picker/config/index.js

@@ -16,10 +16,11 @@ var LOCAL_CONFIG = {
 };
 var PRD_CONFIG = {
   getRecommendationServiceUrl: function getRecommendationServiceUrl(baseUrl) {
-    return baseUrl ? "/".concat(baseUrl, "/gateway/api/v1/recommendations") : '/gateway/api/v1/recommendations';
+    return baseUrl ? "".concat(baseUrl, "/gateway/api/v1/recommendations") : '/gateway/api/v1/recommendations';
   },
   getUsersServiceUrl: function getUsersServiceUrl(productKey) {
-    return productKey === 'jira' ? "/rest/api/3/user/bulk" : "/wiki/rest/api/user/bulk";
+    var baseUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    return productKey === 'jira' ? "".concat(baseUrl, "/rest/api/3/user/bulk") : "".concat(baseUrl, "/wiki/rest/api/user/bulk");
   }
 };
 /**

package/dist/cjs/components/smart-user-picker/service/UsersClient.js

@@ -10,7 +10,7 @@ var _config = require("../config");
 var _types = require("../../../types");
 
 var getUsersById = function getUsersById(request) {
-  var url = "".concat((0, _config.getConfig)().getUsersServiceUrl(request.productKey));
+  var url = "".concat((0, _config.getConfig)().getUsersServiceUrl(request.productKey, request.baseUrl));
   var params = new URLSearchParams();
   request.accountIds.map(function (id) {
     return params.append('accountId', id);

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.3.1",
+	"version": "8.3.5",
 	"sideEffects": false
 }

package/dist/es2019/components/smart-user-picker/components/index.js

@@ -60,7 +60,7 @@ function isOptionData(option) {
  */
 
 
-export async function hydrateDefaultValues(value, productKey) {
+export async function hydrateDefaultValues(value, productKey, baseUrl) {
   //return if no value
   if (!value) {
     return [];
@@ -96,7 +96,8 @@ export async function hydrateDefaultValues(value, productKey) {
 
   const results = await getUsersById({
     productKey,
-    accountIds
+    accountIds,
+    baseUrl
   });
   return sortResults(results, accountIds);
 }
@@ -319,7 +320,7 @@ class SmartUserPicker extends React.Component {
 
   async componentDidMount() {
     try {
-      const value = await hydrateDefaultValues(this.props.defaultValue, this.props.productKey);
+      const value = await hydrateDefaultValues(this.props.defaultValue, this.props.productKey, this.props.baseUrl);
       this.setState({
         defaultValue: value
       });

package/dist/es2019/components/smart-user-picker/config/index.js

@@ -12,11 +12,11 @@ const LOCAL_CONFIG = {
 };
 const PRD_CONFIG = {
   getRecommendationServiceUrl(baseUrl) {
-    return baseUrl ? `/${baseUrl}/gateway/api/v1/recommendations` : '/gateway/api/v1/recommendations';
+    return baseUrl ? `${baseUrl}/gateway/api/v1/recommendations` : '/gateway/api/v1/recommendations';
   },
 
-  getUsersServiceUrl(productKey) {
-    return productKey === 'jira' ? `/rest/api/3/user/bulk` : `/wiki/rest/api/user/bulk`;
+  getUsersServiceUrl(productKey, baseUrl = '') {
+    return productKey === 'jira' ? `${baseUrl}/rest/api/3/user/bulk` : `${baseUrl}/wiki/rest/api/user/bulk`;
   }
 
 };

package/dist/es2019/components/smart-user-picker/service/UsersClient.js

@@ -5,7 +5,7 @@ import { UserType } from '../../../types';
  */
 
 const getUsersById = request => {
-  const url = `${getConfig().getUsersServiceUrl(request.productKey)}`;
+  const url = `${getConfig().getUsersServiceUrl(request.productKey, request.baseUrl)}`;
   let params = new URLSearchParams();
   request.accountIds.map(id => params.append('accountId', id));
   params.append('maxResults', '2000');

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.3.1",
+	"version": "8.3.5",
 	"sideEffects": false
 }

package/dist/esm/components/smart-user-picker/components/index.js

@@ -84,7 +84,7 @@ function isOptionData(option) {
  */
 
 
-export function hydrateDefaultValues(_x, _x2) {
+export function hydrateDefaultValues(_x, _x2, _x3) {
   return _hydrateDefaultValues.apply(this, arguments);
 }
 /**
@@ -92,7 +92,7 @@ export function hydrateDefaultValues(_x, _x2) {
  */
 
 function _hydrateDefaultValues() {
-  _hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(value, productKey) {
+  _hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(value, productKey, baseUrl) {
     var accountIds, results;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
@@ -152,7 +152,8 @@ function _hydrateDefaultValues() {
             _context3.next = 16;
             return getUsersById({
               productKey: productKey,
-              accountIds: accountIds
+              accountIds: accountIds,
+              baseUrl: baseUrl
             });
 
           case 16:
@@ -474,7 +475,7 @@ var SmartUserPicker = /*#__PURE__*/function (_React$Component) {
               case 0:
                 _context2.prev = 0;
                 _context2.next = 3;
-                return hydrateDefaultValues(this.props.defaultValue, this.props.productKey);
+                return hydrateDefaultValues(this.props.defaultValue, this.props.productKey, this.props.baseUrl);
 
               case 3:
                 value = _context2.sent;

package/dist/esm/components/smart-user-picker/config/index.js

@@ -10,10 +10,11 @@ var LOCAL_CONFIG = {
 };
 var PRD_CONFIG = {
   getRecommendationServiceUrl: function getRecommendationServiceUrl(baseUrl) {
-    return baseUrl ? "/".concat(baseUrl, "/gateway/api/v1/recommendations") : '/gateway/api/v1/recommendations';
+    return baseUrl ? "".concat(baseUrl, "/gateway/api/v1/recommendations") : '/gateway/api/v1/recommendations';
   },
   getUsersServiceUrl: function getUsersServiceUrl(productKey) {
-    return productKey === 'jira' ? "/rest/api/3/user/bulk" : "/wiki/rest/api/user/bulk";
+    var baseUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    return productKey === 'jira' ? "".concat(baseUrl, "/rest/api/3/user/bulk") : "".concat(baseUrl, "/wiki/rest/api/user/bulk");
   }
 };
 /**

package/dist/esm/components/smart-user-picker/service/UsersClient.js

@@ -5,7 +5,7 @@ import { UserType } from '../../../types';
  */
 
 var getUsersById = function getUsersById(request) {
-  var url = "".concat(getConfig().getUsersServiceUrl(request.productKey));
+  var url = "".concat(getConfig().getUsersServiceUrl(request.productKey, request.baseUrl));
   var params = new URLSearchParams();
   request.accountIds.map(function (id) {
     return params.append('accountId', id);

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.3.1",
+	"version": "8.3.5",
 	"sideEffects": false
 }

package/dist/types/components/smart-user-picker/components/index.d.ts

@@ -180,7 +180,7 @@ export interface RecommendationRequest {
 /**
  * @deprecated Please use @atlassian/smart-user-picker
  */
-export declare function hydrateDefaultValues(value: DefaultValue, productKey: SupportedProduct): Promise<User[]>;
+export declare function hydrateDefaultValues(value: DefaultValue, productKey: SupportedProduct, baseUrl?: string): Promise<User[]>;
 /**
  * @deprecated
  */

package/dist/types/components/smart-user-picker/config/index.d.ts

@@ -1,6 +1,6 @@
 interface Config {
     getRecommendationServiceUrl(baseUrl: string): string;
-    getUsersServiceUrl(productKey: string): string;
+    getUsersServiceUrl(productKey: string, baseUrl?: string): string;
 }
 /**
  * @deprecated Please use @atlassian/smart-user-picker

package/dist/types/components/smart-user-picker/service/UsersClient.d.ts

@@ -5,6 +5,7 @@ import { User } from '../../../types';
 export interface UsersRequest {
     accountIds: string[];
     productKey: 'jira' | 'confluence';
+    baseUrl?: string;
 }
 declare const getUsersById: (request: UsersRequest) => Promise<User[]>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/user-picker",
-  "version": "8.3.1",
+  "version": "8.3.5",
   "description": "Fabric component for display a dropdown to select a user from",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -34,7 +34,7 @@
     "@atlaskit/select": "^15.2.0",
     "@atlaskit/spinner": "^15.1.4",
     "@atlaskit/theme": "^12.1.0",
-    "@atlaskit/tokens": "^0.4.0",
+    "@atlaskit/tokens": "^0.6.0",
     "@atlaskit/tooltip": "^17.5.0",
     "@babel/runtime": "^7.0.0",
     "lodash": "^4.17.21",
@@ -57,7 +57,7 @@
     "@atlaskit/range": "^5.0.11",
     "@atlaskit/section-message": "^6.0.0",
     "@atlaskit/textfield": "^5.0.0",
-    "@atlaskit/util-data-test": "^17.1.0",
+    "@atlaskit/util-data-test": "^17.2.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@testing-library/dom": "^7.7.3",
     "@testing-library/jest-dom": "^4.1.0",
@@ -76,10 +76,5 @@
     "fabric",
     "ui"
   ],
-  "techstack": {
-    "@repo/internal": {
-      "theming": "tokens"
-    }
-  },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"
 }