@atlaskit/user-picker 8.3.0 → 8.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/dist/cjs/analytics.js +2 -2
- package/dist/cjs/clients/UserSourceProvider.js +3 -3
- package/dist/cjs/components/ClearIndicator.js +2 -2
- package/dist/cjs/components/ExternalUserOption/main.js +2 -0
- package/dist/cjs/components/ExternalUserSourcesContainer.js +2 -1
- package/dist/cjs/components/MessagesIntlProvider.js +2 -2
- package/dist/cjs/components/MultiValue.js +3 -1
- package/dist/cjs/components/MultiValueContainer.js +5 -3
- package/dist/cjs/components/SingleValue.js +3 -1
- package/dist/cjs/components/SingleValueContainer.js +3 -1
- package/dist/cjs/components/SizeableAvatar.js +4 -5
- package/dist/cjs/components/UserPicker.js +2 -2
- package/dist/cjs/components/components.js +2 -2
- package/dist/cjs/components/smart-user-picker/components/index.js +7 -6
- package/dist/cjs/components/smart-user-picker/config/index.js +3 -2
- package/dist/cjs/components/smart-user-picker/service/UsersClient.js +1 -1
- package/dist/cjs/components/smart-user-picker/service/recommendationClient.js +2 -2
- package/dist/cjs/components/styles.js +9 -5
- package/dist/cjs/components/utils.js +2 -2
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/clients/UserSourceProvider.js +3 -3
- package/dist/es2019/components/ExternalUserOption/main.js +2 -0
- package/dist/es2019/components/ExternalUserSourcesContainer.js +2 -1
- package/dist/es2019/components/smart-user-picker/components/index.js +4 -3
- package/dist/es2019/components/smart-user-picker/config/index.js +3 -3
- package/dist/es2019/components/smart-user-picker/service/UsersClient.js +1 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/analytics.js +2 -2
- package/dist/esm/clients/UserSourceProvider.js +3 -3
- package/dist/esm/components/ClearIndicator.js +2 -2
- package/dist/esm/components/ExternalUserOption/main.js +2 -0
- package/dist/esm/components/ExternalUserSourcesContainer.js +2 -1
- package/dist/esm/components/MessagesIntlProvider.js +2 -2
- package/dist/esm/components/MultiValue.js +2 -1
- package/dist/esm/components/MultiValueContainer.js +4 -3
- package/dist/esm/components/SingleValue.js +2 -1
- package/dist/esm/components/SingleValueContainer.js +2 -1
- package/dist/esm/components/SizeableAvatar.js +3 -3
- package/dist/esm/components/UserPicker.js +2 -2
- package/dist/esm/components/components.js +2 -2
- package/dist/esm/components/smart-user-picker/components/index.js +7 -6
- package/dist/esm/components/smart-user-picker/config/index.js +3 -2
- package/dist/esm/components/smart-user-picker/service/UsersClient.js +1 -1
- package/dist/esm/components/smart-user-picker/service/recommendationClient.js +2 -2
- package/dist/esm/components/styles.js +8 -5
- package/dist/esm/components/utils.js +2 -2
- package/dist/esm/version.json +1 -1
- package/dist/types/clients/UserSourceProvider.d.ts +1 -1
- package/dist/types/components/ExternalUserSourcesContainer.d.ts +1 -0
- package/dist/types/components/smart-user-picker/components/index.d.ts +1 -1
- package/dist/types/components/smart-user-picker/config/index.d.ts +1 -1
- package/dist/types/components/smart-user-picker/service/UsersClient.d.ts +1 -0
- package/dist/types/types.d.ts +1 -0
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# @atlaskit/user-picker
|
|
2
2
|
|
|
3
|
+
## 8.3.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`7f48efc8487`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7f48efc8487) - Use baseUrl prop in default user value hydration query
|
|
8
|
+
|
|
9
|
+
## 8.3.3
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 8.3.2
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [`9fd6117d5e4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9fd6117d5e4) - Fix behavior of base URL so that API calls use baseUrl as base url
|
|
20
|
+
|
|
21
|
+
## 8.3.1
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- [`e75137a9eff`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e75137a9eff) - Adding ability to mark which external users need their sources hydrated
|
|
26
|
+
|
|
3
27
|
## 8.3.0
|
|
4
28
|
|
|
5
29
|
### Minor Changes
|
package/dist/cjs/analytics.js
CHANGED
|
@@ -17,9 +17,9 @@ var _version = require("./version.json");
|
|
|
17
17
|
|
|
18
18
|
var _utils = require("./components/utils");
|
|
19
19
|
|
|
20
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
20
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
|
|
22
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
22
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
23
23
|
|
|
24
24
|
var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
|
|
25
25
|
var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
|
|
@@ -33,7 +33,7 @@ var ExusUserSourceProvider = function ExusUserSourceProvider(_ref) {
|
|
|
33
33
|
|
|
34
34
|
exports.ExusUserSourceProvider = ExusUserSourceProvider;
|
|
35
35
|
|
|
36
|
-
var useUserSource = function useUserSource(accountId, existingSources) {
|
|
36
|
+
var useUserSource = function useUserSource(accountId, shouldFetchSources, existingSources) {
|
|
37
37
|
var _useContext = (0, _react.useContext)(ExusUserSourceContext),
|
|
38
38
|
fetchUserSource = _useContext.fetchUserSource;
|
|
39
39
|
|
|
@@ -67,7 +67,7 @@ var useUserSource = function useUserSource(accountId, existingSources) {
|
|
|
67
67
|
isMounted = false;
|
|
68
68
|
};
|
|
69
69
|
|
|
70
|
-
if (!fetchUserSource) {
|
|
70
|
+
if (!fetchUserSource || !shouldFetchSources) {
|
|
71
71
|
setLoading(false);
|
|
72
72
|
return cleanup;
|
|
73
73
|
}
|
|
@@ -86,7 +86,7 @@ var useUserSource = function useUserSource(accountId, existingSources) {
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
return cleanup;
|
|
89
|
-
}, [fetchUserSource, accountId, sources, abortController]);
|
|
89
|
+
}, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
|
|
90
90
|
return {
|
|
91
91
|
sources: Array.from(sources),
|
|
92
92
|
loading: loading,
|
|
@@ -29,9 +29,9 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
29
29
|
|
|
30
30
|
var _select = require("@atlaskit/select");
|
|
31
31
|
|
|
32
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
32
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
33
33
|
|
|
34
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
34
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
35
35
|
|
|
36
36
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
37
37
|
|
|
@@ -177,9 +177,11 @@ var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
177
177
|
value: function formattedTooltipContent() {
|
|
178
178
|
var _this$props$user2 = this.props.user,
|
|
179
179
|
id = _this$props$user2.id,
|
|
180
|
+
requiresSourceHydration = _this$props$user2.requiresSourceHydration,
|
|
180
181
|
sources = _this$props$user2.sources;
|
|
181
182
|
return /*#__PURE__*/_react.default.createElement(_ExternalUserSourcesContainer.ExternalUserSourcesContainer, {
|
|
182
183
|
accountId: id,
|
|
184
|
+
shouldFetchSources: Boolean(requiresSourceHydration),
|
|
183
185
|
initialSources: sources
|
|
184
186
|
}, function (_ref) {
|
|
185
187
|
var sources = _ref.sources,
|
|
@@ -14,10 +14,11 @@ var _UserSourceProvider = require("../clients/UserSourceProvider");
|
|
|
14
14
|
var ExternalUserSourcesContainer = function ExternalUserSourcesContainer(_ref) {
|
|
15
15
|
var children = _ref.children,
|
|
16
16
|
accountId = _ref.accountId,
|
|
17
|
+
shouldFetchSources = _ref.shouldFetchSources,
|
|
17
18
|
_ref$initialSources = _ref.initialSources,
|
|
18
19
|
initialSources = _ref$initialSources === void 0 ? [] : _ref$initialSources;
|
|
19
20
|
|
|
20
|
-
var _useUserSource = (0, _UserSourceProvider.useUserSource)(accountId, initialSources),
|
|
21
|
+
var _useUserSource = (0, _UserSourceProvider.useUserSource)(accountId, shouldFetchSources, initialSources),
|
|
21
22
|
sources = _useUserSource.sources,
|
|
22
23
|
sourcesLoading = _useUserSource.loading,
|
|
23
24
|
sourcesError = _useUserSource.error;
|
|
@@ -23,9 +23,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
23
23
|
|
|
24
24
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
25
25
|
|
|
26
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
26
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
27
27
|
|
|
28
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
28
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
29
29
|
|
|
30
30
|
var EMPTY = {};
|
|
31
31
|
|
|
@@ -45,6 +45,8 @@ var _utils = require("./utils");
|
|
|
45
45
|
|
|
46
46
|
var _people = _interopRequireDefault(require("@atlaskit/icon/glyph/people"));
|
|
47
47
|
|
|
48
|
+
var _excluded = ["children", "innerProps"];
|
|
49
|
+
|
|
48
50
|
var _templateObject, _templateObject2;
|
|
49
51
|
|
|
50
52
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
@@ -153,7 +155,7 @@ var MultiValue = /*#__PURE__*/function (_React$Component) {
|
|
|
153
155
|
var _this$props3 = this.props,
|
|
154
156
|
children = _this$props3.children,
|
|
155
157
|
innerProps = _this$props3.innerProps,
|
|
156
|
-
rest = (0, _objectWithoutProperties2.default)(_this$props3,
|
|
158
|
+
rest = (0, _objectWithoutProperties2.default)(_this$props3, _excluded);
|
|
157
159
|
return /*#__PURE__*/_react.default.createElement(_select.components.MultiValue, (0, _extends2.default)({}, rest, {
|
|
158
160
|
innerProps: {
|
|
159
161
|
ref: this.containerRef
|
|
@@ -35,9 +35,11 @@ var _i18n = require("./i18n");
|
|
|
35
35
|
|
|
36
36
|
var _utils = require("./utils");
|
|
37
37
|
|
|
38
|
-
|
|
38
|
+
var _excluded = ["children", "innerProps"];
|
|
39
39
|
|
|
40
|
-
function
|
|
40
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
41
|
+
|
|
42
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
41
43
|
|
|
42
44
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
43
45
|
|
|
@@ -139,7 +141,7 @@ var MultiValueContainer = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
139
141
|
var _this$props = this.props,
|
|
140
142
|
children = _this$props.children,
|
|
141
143
|
innerProps = _this$props.innerProps,
|
|
142
|
-
valueContainerProps = (0, _objectWithoutProperties2.default)(_this$props,
|
|
144
|
+
valueContainerProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
|
|
143
145
|
|
|
144
146
|
var props = _objectSpread(_objectSpread({}, valueContainerProps), {}, {
|
|
145
147
|
innerProps: this.valueContainerInnerProps
|
|
@@ -21,6 +21,8 @@ var _SizeableAvatar = require("./SizeableAvatar");
|
|
|
21
21
|
|
|
22
22
|
var _utils = require("./utils");
|
|
23
23
|
|
|
24
|
+
var _excluded = ["ref"];
|
|
25
|
+
|
|
24
26
|
var _templateObject;
|
|
25
27
|
|
|
26
28
|
var AvatarItemComponent = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n border: none !important;\n padding: 0 !important;\n width: auto;\n overflow: hidden;\n /* IE 11 needs this prop explicitly to flex items */\n flex: 1 1 auto;\n min-width: 100px;\n\n & > span {\n box-sizing: border-box;\n }\n\n &:hover {\n width: auto;\n padding: 0;\n border: none;\n }\n"])));
|
|
@@ -42,7 +44,7 @@ var SingleValue = function SingleValue(props) {
|
|
|
42
44
|
primaryText: label
|
|
43
45
|
}, function (_ref) {
|
|
44
46
|
var ref = _ref.ref,
|
|
45
|
-
props = (0, _objectWithoutProperties2.default)(_ref,
|
|
47
|
+
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
46
48
|
return /*#__PURE__*/_react.default.createElement(AvatarItemComponent, props);
|
|
47
49
|
}) : null;
|
|
48
50
|
};
|
|
@@ -35,6 +35,8 @@ var _SizeableAvatar = require("./SizeableAvatar");
|
|
|
35
35
|
|
|
36
36
|
var _styles = require("./styles");
|
|
37
37
|
|
|
38
|
+
var _excluded = ["children"];
|
|
39
|
+
|
|
38
40
|
var _templateObject;
|
|
39
41
|
|
|
40
42
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
@@ -88,7 +90,7 @@ var SingleValueContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
88
90
|
value: function render() {
|
|
89
91
|
var _this$props2 = this.props,
|
|
90
92
|
children = _this$props2.children,
|
|
91
|
-
valueContainerProps = (0, _objectWithoutProperties2.default)(_this$props2,
|
|
93
|
+
valueContainerProps = (0, _objectWithoutProperties2.default)(_this$props2, _excluded);
|
|
92
94
|
return /*#__PURE__*/_react.default.createElement(_select.components.ValueContainer, valueContainerProps, /*#__PURE__*/_react.default.createElement(PlaceholderIconContainer, null, this.renderAvatar()), children);
|
|
93
95
|
}
|
|
94
96
|
}]);
|
|
@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.SizeableAvatar = exports.Props = void 0;
|
|
9
9
|
|
|
10
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
-
|
|
12
10
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
13
11
|
|
|
14
12
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
15
13
|
|
|
16
14
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
17
15
|
|
|
16
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
17
|
+
|
|
18
18
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
19
19
|
|
|
20
20
|
var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
|
|
@@ -27,10 +27,9 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
|
|
|
27
27
|
|
|
28
28
|
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
29
29
|
|
|
30
|
-
var Props = function Props() {
|
|
30
|
+
var Props = /*#__PURE__*/(0, _createClass2.default)(function Props() {
|
|
31
31
|
(0, _classCallCheck2.default)(this, Props);
|
|
32
|
-
};
|
|
33
|
-
|
|
32
|
+
});
|
|
34
33
|
exports.Props = Props;
|
|
35
34
|
|
|
36
35
|
var SizeableAvatar = /*#__PURE__*/function (_React$PureComponent) {
|
|
@@ -47,9 +47,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
47
47
|
|
|
48
48
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
49
49
|
|
|
50
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
50
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
51
51
|
|
|
52
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
52
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
53
53
|
|
|
54
54
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
55
55
|
|
|
@@ -29,9 +29,9 @@ var _PopupInput = require("./PopupInput");
|
|
|
29
29
|
|
|
30
30
|
var _PopupControl = require("./PopupControl");
|
|
31
31
|
|
|
32
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
32
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
33
33
|
|
|
34
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
34
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
35
35
|
|
|
36
36
|
/**
|
|
37
37
|
* Memoize getComponents to avoid rerenders.
|
|
@@ -52,9 +52,9 @@ var _UsersClient = _interopRequireDefault(require("../service/UsersClient"));
|
|
|
52
52
|
|
|
53
53
|
var _MessagesIntlProvider = _interopRequireDefault(require("../../MessagesIntlProvider"));
|
|
54
54
|
|
|
55
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
55
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
56
56
|
|
|
57
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
57
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
58
58
|
|
|
59
59
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
60
60
|
|
|
@@ -114,7 +114,7 @@ function isOptionData(option) {
|
|
|
114
114
|
*/
|
|
115
115
|
|
|
116
116
|
|
|
117
|
-
function hydrateDefaultValues(_x, _x2) {
|
|
117
|
+
function hydrateDefaultValues(_x, _x2, _x3) {
|
|
118
118
|
return _hydrateDefaultValues.apply(this, arguments);
|
|
119
119
|
}
|
|
120
120
|
/**
|
|
@@ -123,7 +123,7 @@ function hydrateDefaultValues(_x, _x2) {
|
|
|
123
123
|
|
|
124
124
|
|
|
125
125
|
function _hydrateDefaultValues() {
|
|
126
|
-
_hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(value, productKey) {
|
|
126
|
+
_hydrateDefaultValues = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(value, productKey, baseUrl) {
|
|
127
127
|
var accountIds, results;
|
|
128
128
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
129
129
|
while (1) {
|
|
@@ -183,7 +183,8 @@ function _hydrateDefaultValues() {
|
|
|
183
183
|
_context3.next = 16;
|
|
184
184
|
return (0, _UsersClient.default)({
|
|
185
185
|
productKey: productKey,
|
|
186
|
-
accountIds: accountIds
|
|
186
|
+
accountIds: accountIds,
|
|
187
|
+
baseUrl: baseUrl
|
|
187
188
|
});
|
|
188
189
|
|
|
189
190
|
case 16:
|
|
@@ -495,7 +496,7 @@ var SmartUserPicker = /*#__PURE__*/function (_React$Component) {
|
|
|
495
496
|
case 0:
|
|
496
497
|
_context2.prev = 0;
|
|
497
498
|
_context2.next = 3;
|
|
498
|
-
return hydrateDefaultValues(this.props.defaultValue, this.props.productKey);
|
|
499
|
+
return hydrateDefaultValues(this.props.defaultValue, this.props.productKey, this.props.baseUrl);
|
|
499
500
|
|
|
500
501
|
case 3:
|
|
501
502
|
value = _context2.sent;
|
|
@@ -16,10 +16,11 @@ var LOCAL_CONFIG = {
|
|
|
16
16
|
};
|
|
17
17
|
var PRD_CONFIG = {
|
|
18
18
|
getRecommendationServiceUrl: function getRecommendationServiceUrl(baseUrl) {
|
|
19
|
-
return baseUrl ? "
|
|
19
|
+
return baseUrl ? "".concat(baseUrl, "/gateway/api/v1/recommendations") : '/gateway/api/v1/recommendations';
|
|
20
20
|
},
|
|
21
21
|
getUsersServiceUrl: function getUsersServiceUrl(productKey) {
|
|
22
|
-
|
|
22
|
+
var baseUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
23
|
+
return productKey === 'jira' ? "".concat(baseUrl, "/rest/api/3/user/bulk") : "".concat(baseUrl, "/wiki/rest/api/user/bulk");
|
|
23
24
|
}
|
|
24
25
|
};
|
|
25
26
|
/**
|
|
@@ -10,7 +10,7 @@ var _config = require("../config");
|
|
|
10
10
|
var _types = require("../../../types");
|
|
11
11
|
|
|
12
12
|
var getUsersById = function getUsersById(request) {
|
|
13
|
-
var url = "".concat((0, _config.getConfig)().getUsersServiceUrl(request.productKey));
|
|
13
|
+
var url = "".concat((0, _config.getConfig)().getUsersServiceUrl(request.productKey, request.baseUrl));
|
|
14
14
|
var params = new URLSearchParams();
|
|
15
15
|
request.accountIds.map(function (id) {
|
|
16
16
|
return params.append('accountId', id);
|
|
@@ -13,9 +13,9 @@ var _usersTransformer = require("./users-transformer");
|
|
|
13
13
|
|
|
14
14
|
var _config = require("../config");
|
|
15
15
|
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
16
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
17
17
|
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
18
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
19
|
|
|
20
20
|
var getUserRecommendations = function getUserRecommendations(request, intl) {
|
|
21
21
|
var _request$context, _request$context$prod;
|
|
@@ -23,9 +23,13 @@ var _utils = require("./utils");
|
|
|
23
23
|
|
|
24
24
|
var _select = require("@atlaskit/select");
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
var _excluded = ["paddingTop", "paddingBottom", "paddingLeft", "paddingRight"],
|
|
27
|
+
_excluded2 = ["paddingTop", "paddingBottom", "position"],
|
|
28
|
+
_excluded3 = ["margin"];
|
|
27
29
|
|
|
28
|
-
function
|
|
30
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
31
|
+
|
|
32
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
29
33
|
|
|
30
34
|
var BORDER_PADDING = 6;
|
|
31
35
|
exports.BORDER_PADDING = BORDER_PADDING;
|
|
@@ -71,7 +75,7 @@ var getStyles = (0, _memoizeOne.default)(function (width, isMulti, overrideStyle
|
|
|
71
75
|
paddingBottom = _ref.paddingBottom,
|
|
72
76
|
paddingLeft = _ref.paddingLeft,
|
|
73
77
|
paddingRight = _ref.paddingRight,
|
|
74
|
-
css = (0, _objectWithoutProperties2.default)(_ref,
|
|
78
|
+
css = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
75
79
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
76
80
|
opacity: 0,
|
|
77
81
|
transition: css.transition + ', opacity 150ms',
|
|
@@ -91,7 +95,7 @@ var getStyles = (0, _memoizeOne.default)(function (width, isMulti, overrideStyle
|
|
|
91
95
|
var paddingTop = _ref2.paddingTop,
|
|
92
96
|
paddingBottom = _ref2.paddingBottom,
|
|
93
97
|
position = _ref2.position,
|
|
94
|
-
css = (0, _objectWithoutProperties2.default)(_ref2,
|
|
98
|
+
css = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
|
|
95
99
|
var isCompact = state.selectProps.appearance === 'compact';
|
|
96
100
|
var isMulti = state.selectProps.isMulti;
|
|
97
101
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
@@ -159,7 +163,7 @@ var getStyles = (0, _memoizeOne.default)(function (width, isMulti, overrideStyle
|
|
|
159
163
|
},
|
|
160
164
|
input: function input(_ref3) {
|
|
161
165
|
var margin = _ref3.margin,
|
|
162
|
-
css = (0, _objectWithoutProperties2.default)(_ref3,
|
|
166
|
+
css = (0, _objectWithoutProperties2.default)(_ref3, _excluded3);
|
|
163
167
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
164
168
|
display: 'flex',
|
|
165
169
|
alignSelf: 'center',
|
|
@@ -17,9 +17,9 @@ var _types = require("../types");
|
|
|
17
17
|
|
|
18
18
|
var _select = require("@atlaskit/select");
|
|
19
19
|
|
|
20
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
20
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
|
|
22
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
22
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
23
23
|
|
|
24
24
|
var isExternalUser = function isExternalUser(option) {
|
|
25
25
|
return isUser(option) && Boolean(option.isExternal);
|
package/dist/cjs/version.json
CHANGED
|
@@ -8,7 +8,7 @@ export const ExusUserSourceProvider = ({
|
|
|
8
8
|
fetchUserSource
|
|
9
9
|
}
|
|
10
10
|
}, children);
|
|
11
|
-
export const useUserSource = (accountId, existingSources) => {
|
|
11
|
+
export const useUserSource = (accountId, shouldFetchSources, existingSources) => {
|
|
12
12
|
const {
|
|
13
13
|
fetchUserSource
|
|
14
14
|
} = useContext(ExusUserSourceContext);
|
|
@@ -30,7 +30,7 @@ export const useUserSource = (accountId, existingSources) => {
|
|
|
30
30
|
isMounted = false;
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
-
if (!fetchUserSource) {
|
|
33
|
+
if (!fetchUserSource || !shouldFetchSources) {
|
|
34
34
|
setLoading(false);
|
|
35
35
|
return cleanup;
|
|
36
36
|
}
|
|
@@ -47,7 +47,7 @@ export const useUserSource = (accountId, existingSources) => {
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
return cleanup;
|
|
50
|
-
}, [fetchUserSource, accountId, sources, abortController]);
|
|
50
|
+
}, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
|
|
51
51
|
return {
|
|
52
52
|
sources: Array.from(sources),
|
|
53
53
|
loading,
|
|
@@ -120,11 +120,13 @@ export class ExternalUserOption extends React.PureComponent {
|
|
|
120
120
|
const {
|
|
121
121
|
user: {
|
|
122
122
|
id,
|
|
123
|
+
requiresSourceHydration,
|
|
123
124
|
sources
|
|
124
125
|
}
|
|
125
126
|
} = this.props;
|
|
126
127
|
return /*#__PURE__*/React.createElement(ExternalUserSourcesContainer, {
|
|
127
128
|
accountId: id,
|
|
129
|
+
shouldFetchSources: Boolean(requiresSourceHydration),
|
|
128
130
|
initialSources: sources
|
|
129
131
|
}, ({
|
|
130
132
|
sources,
|
|
@@ -3,13 +3,14 @@ import { useUserSource } from '../clients/UserSourceProvider';
|
|
|
3
3
|
export const ExternalUserSourcesContainer = ({
|
|
4
4
|
children,
|
|
5
5
|
accountId,
|
|
6
|
+
shouldFetchSources,
|
|
6
7
|
initialSources = []
|
|
7
8
|
}) => {
|
|
8
9
|
const {
|
|
9
10
|
sources,
|
|
10
11
|
loading: sourcesLoading,
|
|
11
12
|
error: sourcesError
|
|
12
|
-
} = useUserSource(accountId, initialSources);
|
|
13
|
+
} = useUserSource(accountId, shouldFetchSources, initialSources);
|
|
13
14
|
|
|
14
15
|
if (typeof children === 'function') {
|
|
15
16
|
return children({
|
|
@@ -60,7 +60,7 @@ function isOptionData(option) {
|
|
|
60
60
|
*/
|
|
61
61
|
|
|
62
62
|
|
|
63
|
-
export async function hydrateDefaultValues(value, productKey) {
|
|
63
|
+
export async function hydrateDefaultValues(value, productKey, baseUrl) {
|
|
64
64
|
//return if no value
|
|
65
65
|
if (!value) {
|
|
66
66
|
return [];
|
|
@@ -96,7 +96,8 @@ export async function hydrateDefaultValues(value, productKey) {
|
|
|
96
96
|
|
|
97
97
|
const results = await getUsersById({
|
|
98
98
|
productKey,
|
|
99
|
-
accountIds
|
|
99
|
+
accountIds,
|
|
100
|
+
baseUrl
|
|
100
101
|
});
|
|
101
102
|
return sortResults(results, accountIds);
|
|
102
103
|
}
|
|
@@ -319,7 +320,7 @@ class SmartUserPicker extends React.Component {
|
|
|
319
320
|
|
|
320
321
|
async componentDidMount() {
|
|
321
322
|
try {
|
|
322
|
-
const value = await hydrateDefaultValues(this.props.defaultValue, this.props.productKey);
|
|
323
|
+
const value = await hydrateDefaultValues(this.props.defaultValue, this.props.productKey, this.props.baseUrl);
|
|
323
324
|
this.setState({
|
|
324
325
|
defaultValue: value
|
|
325
326
|
});
|
|
@@ -12,11 +12,11 @@ const LOCAL_CONFIG = {
|
|
|
12
12
|
};
|
|
13
13
|
const PRD_CONFIG = {
|
|
14
14
|
getRecommendationServiceUrl(baseUrl) {
|
|
15
|
-
return baseUrl ?
|
|
15
|
+
return baseUrl ? `${baseUrl}/gateway/api/v1/recommendations` : '/gateway/api/v1/recommendations';
|
|
16
16
|
},
|
|
17
17
|
|
|
18
|
-
getUsersServiceUrl(productKey) {
|
|
19
|
-
return productKey === 'jira' ?
|
|
18
|
+
getUsersServiceUrl(productKey, baseUrl = '') {
|
|
19
|
+
return productKey === 'jira' ? `${baseUrl}/rest/api/3/user/bulk` : `${baseUrl}/wiki/rest/api/user/bulk`;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
};
|
|
@@ -5,7 +5,7 @@ import { UserType } from '../../../types';
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
const getUsersById = request => {
|
|
8
|
-
const url = `${getConfig().getUsersServiceUrl(request.productKey)}`;
|
|
8
|
+
const url = `${getConfig().getUsersServiceUrl(request.productKey, request.baseUrl)}`;
|
|
9
9
|
let params = new URLSearchParams();
|
|
10
10
|
request.accountIds.map(id => params.append('accountId', id));
|
|
11
11
|
params.append('maxResults', '2000');
|
package/dist/es2019/version.json
CHANGED
package/dist/esm/analytics.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
3
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
4
|
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
|
|
7
7
|
import { createAndFireEvent } from '@atlaskit/analytics-next';
|
|
8
8
|
import uuid from 'uuid/v4';
|
|
@@ -11,7 +11,7 @@ export var ExusUserSourceProvider = function ExusUserSourceProvider(_ref) {
|
|
|
11
11
|
}
|
|
12
12
|
}, children);
|
|
13
13
|
};
|
|
14
|
-
export var useUserSource = function useUserSource(accountId, existingSources) {
|
|
14
|
+
export var useUserSource = function useUserSource(accountId, shouldFetchSources, existingSources) {
|
|
15
15
|
var _useContext = useContext(ExusUserSourceContext),
|
|
16
16
|
fetchUserSource = _useContext.fetchUserSource;
|
|
17
17
|
|
|
@@ -45,7 +45,7 @@ export var useUserSource = function useUserSource(accountId, existingSources) {
|
|
|
45
45
|
isMounted = false;
|
|
46
46
|
};
|
|
47
47
|
|
|
48
|
-
if (!fetchUserSource) {
|
|
48
|
+
if (!fetchUserSource || !shouldFetchSources) {
|
|
49
49
|
setLoading(false);
|
|
50
50
|
return cleanup;
|
|
51
51
|
}
|
|
@@ -64,7 +64,7 @@ export var useUserSource = function useUserSource(accountId, existingSources) {
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
return cleanup;
|
|
67
|
-
}, [fetchUserSource, accountId, sources, abortController]);
|
|
67
|
+
}, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
|
|
68
68
|
return {
|
|
69
69
|
sources: Array.from(sources),
|
|
70
70
|
loading: loading,
|
|
@@ -7,9 +7,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
|
|
|
7
7
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
8
8
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
9
9
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
10
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
11
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
12
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
13
13
|
|
|
14
14
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
15
15
|
|
|
@@ -137,9 +137,11 @@ export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
137
137
|
value: function formattedTooltipContent() {
|
|
138
138
|
var _this$props$user2 = this.props.user,
|
|
139
139
|
id = _this$props$user2.id,
|
|
140
|
+
requiresSourceHydration = _this$props$user2.requiresSourceHydration,
|
|
140
141
|
sources = _this$props$user2.sources;
|
|
141
142
|
return /*#__PURE__*/React.createElement(ExternalUserSourcesContainer, {
|
|
142
143
|
accountId: id,
|
|
144
|
+
shouldFetchSources: Boolean(requiresSourceHydration),
|
|
143
145
|
initialSources: sources
|
|
144
146
|
}, function (_ref) {
|
|
145
147
|
var sources = _ref.sources,
|
|
@@ -3,10 +3,11 @@ import { useUserSource } from '../clients/UserSourceProvider';
|
|
|
3
3
|
export var ExternalUserSourcesContainer = function ExternalUserSourcesContainer(_ref) {
|
|
4
4
|
var children = _ref.children,
|
|
5
5
|
accountId = _ref.accountId,
|
|
6
|
+
shouldFetchSources = _ref.shouldFetchSources,
|
|
6
7
|
_ref$initialSources = _ref.initialSources,
|
|
7
8
|
initialSources = _ref$initialSources === void 0 ? [] : _ref$initialSources;
|
|
8
9
|
|
|
9
|
-
var _useUserSource = useUserSource(accountId, initialSources),
|
|
10
|
+
var _useUserSource = useUserSource(accountId, shouldFetchSources, initialSources),
|
|
10
11
|
sources = _useUserSource.sources,
|
|
11
12
|
sourcesLoading = _useUserSource.loading,
|
|
12
13
|
sourcesError = _useUserSource.error;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
3
3
|
|
|
4
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
4
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
5
|
|
|
6
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
|
|
8
8
|
import React, { useMemo } from 'react';
|
|
9
9
|
import { useIntl, IntlProvider } from 'react-intl-next';
|
|
@@ -8,6 +8,7 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
|
|
|
8
8
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
9
9
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
10
10
|
import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
|
|
11
|
+
var _excluded = ["children", "innerProps"];
|
|
11
12
|
|
|
12
13
|
var _templateObject, _templateObject2;
|
|
13
14
|
|
|
@@ -124,7 +125,7 @@ export var MultiValue = /*#__PURE__*/function (_React$Component) {
|
|
|
124
125
|
var _this$props3 = this.props,
|
|
125
126
|
children = _this$props3.children,
|
|
126
127
|
innerProps = _this$props3.innerProps,
|
|
127
|
-
rest = _objectWithoutProperties(_this$props3,
|
|
128
|
+
rest = _objectWithoutProperties(_this$props3, _excluded);
|
|
128
129
|
|
|
129
130
|
return /*#__PURE__*/React.createElement(components.MultiValue, _extends({}, rest, {
|
|
130
131
|
innerProps: {
|
|
@@ -6,10 +6,11 @@ import _inherits from "@babel/runtime/helpers/inherits";
|
|
|
6
6
|
import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
|
|
7
7
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
8
8
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
9
|
+
var _excluded = ["children", "innerProps"];
|
|
9
10
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
11
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
12
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
13
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
13
14
|
|
|
14
15
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
15
16
|
|
|
@@ -123,7 +124,7 @@ export var MultiValueContainer = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
123
124
|
var _this$props = this.props,
|
|
124
125
|
children = _this$props.children,
|
|
125
126
|
innerProps = _this$props.innerProps,
|
|
126
|
-
valueContainerProps = _objectWithoutProperties(_this$props,
|
|
127
|
+
valueContainerProps = _objectWithoutProperties(_this$props, _excluded);
|
|
127
128
|
|
|
128
129
|
var props = _objectSpread(_objectSpread({}, valueContainerProps), {}, {
|
|
129
130
|
innerProps: this.valueContainerInnerProps
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
2
2
|
import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
|
|
3
|
+
var _excluded = ["ref"];
|
|
3
4
|
|
|
4
5
|
var _templateObject;
|
|
5
6
|
|
|
@@ -26,7 +27,7 @@ export var SingleValue = function SingleValue(props) {
|
|
|
26
27
|
primaryText: label
|
|
27
28
|
}, function (_ref) {
|
|
28
29
|
var ref = _ref.ref,
|
|
29
|
-
props = _objectWithoutProperties(_ref,
|
|
30
|
+
props = _objectWithoutProperties(_ref, _excluded);
|
|
30
31
|
|
|
31
32
|
return /*#__PURE__*/React.createElement(AvatarItemComponent, props);
|
|
32
33
|
}) : null;
|
|
@@ -7,6 +7,7 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
|
|
|
7
7
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
8
8
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
9
9
|
import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
|
|
10
|
+
var _excluded = ["children"];
|
|
10
11
|
|
|
11
12
|
var _templateObject;
|
|
12
13
|
|
|
@@ -68,7 +69,7 @@ export var SingleValueContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
68
69
|
value: function render() {
|
|
69
70
|
var _this$props2 = this.props,
|
|
70
71
|
children = _this$props2.children,
|
|
71
|
-
valueContainerProps = _objectWithoutProperties(_this$props2,
|
|
72
|
+
valueContainerProps = _objectWithoutProperties(_this$props2, _excluded);
|
|
72
73
|
|
|
73
74
|
return /*#__PURE__*/React.createElement(components.ValueContainer, valueContainerProps, /*#__PURE__*/React.createElement(PlaceholderIconContainer, null, this.renderAvatar()), children);
|
|
74
75
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import _createClass from "@babel/runtime/helpers/createClass";
|
|
2
1
|
import _inherits from "@babel/runtime/helpers/inherits";
|
|
3
2
|
import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
|
|
4
3
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
4
|
+
import _createClass from "@babel/runtime/helpers/createClass";
|
|
5
5
|
import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
|
|
6
6
|
|
|
7
7
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
@@ -11,9 +11,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
|
|
|
11
11
|
import Avatar from '@atlaskit/avatar';
|
|
12
12
|
import React from 'react';
|
|
13
13
|
import { getAvatarSize } from './utils';
|
|
14
|
-
export var Props = function Props() {
|
|
14
|
+
export var Props = /*#__PURE__*/_createClass(function Props() {
|
|
15
15
|
_classCallCheck(this, Props);
|
|
16
|
-
};
|
|
16
|
+
});
|
|
17
17
|
export var SizeableAvatar = /*#__PURE__*/function (_React$PureComponent) {
|
|
18
18
|
_inherits(SizeableAvatar, _React$PureComponent);
|
|
19
19
|
|
|
@@ -6,9 +6,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
|
|
|
6
6
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
7
7
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
8
8
|
|
|
9
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
9
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
10
10
|
|
|
11
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
11
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
12
12
|
|
|
13
13
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
14
14
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
3
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
4
|
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
|
|
7
7
|
import memoizeOne from 'memoize-one';
|
|
8
8
|
import { ClearIndicator } from './ClearIndicator';
|
|
@@ -9,9 +9,9 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
|
9
9
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
10
10
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
11
11
|
|
|
12
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
12
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
13
13
|
|
|
14
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
14
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
15
15
|
|
|
16
16
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
17
17
|
|
|
@@ -84,7 +84,7 @@ function isOptionData(option) {
|
|
|
84
84
|
*/
|
|
85
85
|
|
|
86
86
|
|
|
87
|
-
export function hydrateDefaultValues(_x, _x2) {
|
|
87
|
+
export function hydrateDefaultValues(_x, _x2, _x3) {
|
|
88
88
|
return _hydrateDefaultValues.apply(this, arguments);
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
@@ -92,7 +92,7 @@ export function hydrateDefaultValues(_x, _x2) {
|
|
|
92
92
|
*/
|
|
93
93
|
|
|
94
94
|
function _hydrateDefaultValues() {
|
|
95
|
-
_hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(value, productKey) {
|
|
95
|
+
_hydrateDefaultValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(value, productKey, baseUrl) {
|
|
96
96
|
var accountIds, results;
|
|
97
97
|
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
98
98
|
while (1) {
|
|
@@ -152,7 +152,8 @@ function _hydrateDefaultValues() {
|
|
|
152
152
|
_context3.next = 16;
|
|
153
153
|
return getUsersById({
|
|
154
154
|
productKey: productKey,
|
|
155
|
-
accountIds: accountIds
|
|
155
|
+
accountIds: accountIds,
|
|
156
|
+
baseUrl: baseUrl
|
|
156
157
|
});
|
|
157
158
|
|
|
158
159
|
case 16:
|
|
@@ -474,7 +475,7 @@ var SmartUserPicker = /*#__PURE__*/function (_React$Component) {
|
|
|
474
475
|
case 0:
|
|
475
476
|
_context2.prev = 0;
|
|
476
477
|
_context2.next = 3;
|
|
477
|
-
return hydrateDefaultValues(this.props.defaultValue, this.props.productKey);
|
|
478
|
+
return hydrateDefaultValues(this.props.defaultValue, this.props.productKey, this.props.baseUrl);
|
|
478
479
|
|
|
479
480
|
case 3:
|
|
480
481
|
value = _context2.sent;
|
|
@@ -10,10 +10,11 @@ var LOCAL_CONFIG = {
|
|
|
10
10
|
};
|
|
11
11
|
var PRD_CONFIG = {
|
|
12
12
|
getRecommendationServiceUrl: function getRecommendationServiceUrl(baseUrl) {
|
|
13
|
-
return baseUrl ? "
|
|
13
|
+
return baseUrl ? "".concat(baseUrl, "/gateway/api/v1/recommendations") : '/gateway/api/v1/recommendations';
|
|
14
14
|
},
|
|
15
15
|
getUsersServiceUrl: function getUsersServiceUrl(productKey) {
|
|
16
|
-
|
|
16
|
+
var baseUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
17
|
+
return productKey === 'jira' ? "".concat(baseUrl, "/rest/api/3/user/bulk") : "".concat(baseUrl, "/wiki/rest/api/user/bulk");
|
|
17
18
|
}
|
|
18
19
|
};
|
|
19
20
|
/**
|
|
@@ -5,7 +5,7 @@ import { UserType } from '../../../types';
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
var getUsersById = function getUsersById(request) {
|
|
8
|
-
var url = "".concat(getConfig().getUsersServiceUrl(request.productKey));
|
|
8
|
+
var url = "".concat(getConfig().getUsersServiceUrl(request.productKey, request.baseUrl));
|
|
9
9
|
var params = new URLSearchParams();
|
|
10
10
|
request.accountIds.map(function (id) {
|
|
11
11
|
return params.append('accountId', id);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
3
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
4
|
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
|
|
7
7
|
import { transformUsers } from './users-transformer';
|
|
8
8
|
import { getConfig } from '../config';
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
|
+
var _excluded = ["paddingTop", "paddingBottom", "paddingLeft", "paddingRight"],
|
|
4
|
+
_excluded2 = ["paddingTop", "paddingBottom", "position"],
|
|
5
|
+
_excluded3 = ["margin"];
|
|
3
6
|
|
|
4
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
7
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
8
|
|
|
6
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
9
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
10
|
|
|
8
11
|
import { AVATAR_SIZES, BORDER_WIDTH } from '@atlaskit/avatar';
|
|
9
12
|
import { B100, N0, N10, N20, N30, N40, N100, R50, R400 } from '@atlaskit/theme/colors';
|
|
@@ -52,7 +55,7 @@ export var getStyles = memoizeOne(function (width, isMulti, overrideStyles) {
|
|
|
52
55
|
paddingBottom = _ref.paddingBottom,
|
|
53
56
|
paddingLeft = _ref.paddingLeft,
|
|
54
57
|
paddingRight = _ref.paddingRight,
|
|
55
|
-
css = _objectWithoutProperties(_ref,
|
|
58
|
+
css = _objectWithoutProperties(_ref, _excluded);
|
|
56
59
|
|
|
57
60
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
58
61
|
opacity: 0,
|
|
@@ -73,7 +76,7 @@ export var getStyles = memoizeOne(function (width, isMulti, overrideStyles) {
|
|
|
73
76
|
var paddingTop = _ref2.paddingTop,
|
|
74
77
|
paddingBottom = _ref2.paddingBottom,
|
|
75
78
|
position = _ref2.position,
|
|
76
|
-
css = _objectWithoutProperties(_ref2,
|
|
79
|
+
css = _objectWithoutProperties(_ref2, _excluded2);
|
|
77
80
|
|
|
78
81
|
var isCompact = state.selectProps.appearance === 'compact';
|
|
79
82
|
var isMulti = state.selectProps.isMulti;
|
|
@@ -142,7 +145,7 @@ export var getStyles = memoizeOne(function (width, isMulti, overrideStyles) {
|
|
|
142
145
|
},
|
|
143
146
|
input: function input(_ref3) {
|
|
144
147
|
var margin = _ref3.margin,
|
|
145
|
-
css = _objectWithoutProperties(_ref3,
|
|
148
|
+
css = _objectWithoutProperties(_ref3, _excluded3);
|
|
146
149
|
|
|
147
150
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
148
151
|
display: 'flex',
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import _typeof from "@babel/runtime/helpers/typeof";
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
3
|
|
|
4
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
4
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
5
|
|
|
6
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
|
|
8
8
|
import memoizeOne from 'memoize-one';
|
|
9
9
|
import { EmailType, TeamType, GroupType, UserType } from '../types';
|
package/dist/esm/version.json
CHANGED
|
@@ -4,7 +4,7 @@ export interface UserSourceContext {
|
|
|
4
4
|
fetchUserSource?: LoadUserSource;
|
|
5
5
|
}
|
|
6
6
|
export declare const ExusUserSourceProvider: React.FC<UserSourceContext>;
|
|
7
|
-
export declare const useUserSource: (accountId: string, existingSources?: UserSource[] | undefined) => {
|
|
7
|
+
export declare const useUserSource: (accountId: string, shouldFetchSources: boolean, existingSources?: UserSource[] | undefined) => {
|
|
8
8
|
sources: UserSource[];
|
|
9
9
|
loading: boolean;
|
|
10
10
|
error: string | null;
|
|
@@ -180,7 +180,7 @@ export interface RecommendationRequest {
|
|
|
180
180
|
/**
|
|
181
181
|
* @deprecated Please use @atlassian/smart-user-picker
|
|
182
182
|
*/
|
|
183
|
-
export declare function hydrateDefaultValues(value: DefaultValue, productKey: SupportedProduct): Promise<User[]>;
|
|
183
|
+
export declare function hydrateDefaultValues(value: DefaultValue, productKey: SupportedProduct, baseUrl?: string): Promise<User[]>;
|
|
184
184
|
/**
|
|
185
185
|
* @deprecated
|
|
186
186
|
*/
|
package/dist/types/types.d.ts
CHANGED
|
@@ -210,6 +210,7 @@ export interface OptionData {
|
|
|
210
210
|
export declare const UserType = "user";
|
|
211
211
|
export declare type UserSource = 'google' | 'slack' | 'microsoft' | 'github';
|
|
212
212
|
export interface ExternalUser extends User {
|
|
213
|
+
requiresSourceHydration?: boolean;
|
|
213
214
|
sources: UserSource[];
|
|
214
215
|
}
|
|
215
216
|
export interface User extends OptionData {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/user-picker",
|
|
3
|
-
"version": "8.3.
|
|
3
|
+
"version": "8.3.4",
|
|
4
4
|
"description": "Fabric component for display a dropdown to select a user from",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -28,13 +28,13 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@atlaskit/analytics-next": "^8.2.0",
|
|
30
30
|
"@atlaskit/avatar": "^20.5.0",
|
|
31
|
-
"@atlaskit/icon": "^21.
|
|
31
|
+
"@atlaskit/icon": "^21.10.0",
|
|
32
32
|
"@atlaskit/lozenge": "^11.0.0",
|
|
33
33
|
"@atlaskit/popper": "^5.0.0",
|
|
34
34
|
"@atlaskit/select": "^15.2.0",
|
|
35
35
|
"@atlaskit/spinner": "^15.1.4",
|
|
36
|
-
"@atlaskit/theme": "^12.
|
|
37
|
-
"@atlaskit/tokens": "^0.
|
|
36
|
+
"@atlaskit/theme": "^12.1.0",
|
|
37
|
+
"@atlaskit/tokens": "^0.5.0",
|
|
38
38
|
"@atlaskit/tooltip": "^17.5.0",
|
|
39
39
|
"@babel/runtime": "^7.0.0",
|
|
40
40
|
"lodash": "^4.17.21",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@atlaskit/range": "^5.0.11",
|
|
58
58
|
"@atlaskit/section-message": "^6.0.0",
|
|
59
59
|
"@atlaskit/textfield": "^5.0.0",
|
|
60
|
-
"@atlaskit/util-data-test": "^17.
|
|
60
|
+
"@atlaskit/util-data-test": "^17.1.0",
|
|
61
61
|
"@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
|
|
62
62
|
"@testing-library/dom": "^7.7.3",
|
|
63
63
|
"@testing-library/jest-dom": "^4.1.0",
|