@atlaskit/profilecard 16.0.0 → 16.2.0
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/client/ProfileCardClient.js +33 -0
- package/dist/cjs/client/TeamCentralCardClient.js +162 -0
- package/dist/cjs/components/Team/lazyTeamProfileCard.js +3 -5
- package/dist/cjs/components/User/ProfileCard.js +20 -3
- package/dist/cjs/components/User/ProfileCardResourced.js +16 -8
- package/dist/cjs/components/User/ProfileCardTrigger.js +27 -12
- package/dist/cjs/components/User/ReportingLinesDetails.js +90 -0
- package/dist/cjs/components/User/index.js +3 -17
- package/dist/cjs/components/User/lazyProfileCard.js +23 -0
- package/dist/cjs/index.js +0 -1
- package/dist/cjs/messages.js +10 -0
- package/dist/cjs/mocks/mock-profile-client.js +42 -3
- package/dist/cjs/mocks/reporting-lines-data.js +28 -0
- package/dist/cjs/styled/ReportingLines.js +38 -0
- package/dist/cjs/util/analytics.js +1 -1
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/client/ProfileCardClient.js +25 -0
- package/dist/es2019/client/TeamCentralCardClient.js +109 -0
- package/dist/es2019/components/Team/lazyTeamProfileCard.js +2 -3
- package/dist/es2019/components/User/ProfileCard.js +15 -3
- package/dist/es2019/components/User/ProfileCardResourced.js +13 -6
- package/dist/es2019/components/User/ProfileCardTrigger.js +18 -10
- package/dist/es2019/components/User/ReportingLinesDetails.js +71 -0
- package/dist/es2019/components/User/index.js +2 -4
- package/dist/es2019/components/User/lazyProfileCard.js +4 -0
- package/dist/es2019/index.js +1 -2
- package/dist/es2019/messages.js +10 -0
- package/dist/es2019/mocks/mock-profile-client.js +25 -0
- package/dist/es2019/mocks/reporting-lines-data.js +14 -0
- package/dist/es2019/styled/ReportingLines.js +28 -0
- package/dist/es2019/util/analytics.js +1 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/client/ProfileCardClient.js +32 -0
- package/dist/esm/client/TeamCentralCardClient.js +147 -0
- package/dist/esm/components/Team/lazyTeamProfileCard.js +3 -5
- package/dist/esm/components/User/ProfileCard.js +19 -3
- package/dist/esm/components/User/ProfileCardResourced.js +16 -8
- package/dist/esm/components/User/ProfileCardTrigger.js +21 -12
- package/dist/esm/components/User/ReportingLinesDetails.js +73 -0
- package/dist/esm/components/User/index.js +2 -4
- package/dist/esm/components/User/lazyProfileCard.js +6 -0
- package/dist/esm/index.js +1 -2
- package/dist/esm/messages.js +10 -0
- package/dist/esm/mocks/mock-profile-client.js +42 -3
- package/dist/esm/mocks/reporting-lines-data.js +16 -0
- package/dist/esm/styled/ReportingLines.js +12 -0
- package/dist/esm/util/analytics.js +1 -1
- package/dist/esm/version.json +1 -1
- package/dist/types/client/ProfileCardClient.d.ts +4 -1
- package/dist/types/client/TeamCentralCardClient.d.ts +22 -0
- package/dist/types/components/User/ProfileCardResourced.d.ts +2 -2
- package/dist/types/components/User/ProfileCardTrigger.d.ts +2 -2
- package/dist/types/components/User/ReportingLinesDetails.d.ts +7 -0
- package/dist/types/components/User/index.d.ts +2 -4
- package/dist/types/components/User/lazyProfileCard.d.ts +2 -0
- package/dist/types/messages.d.ts +10 -0
- package/dist/types/mocks/reporting-lines-data.d.ts +2 -0
- package/dist/types/styled/ReportingLines.d.ts +6 -0
- package/dist/types/types.d.ts +31 -0
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# @atlaskit/profilecard
|
|
2
2
|
|
|
3
|
+
## 16.2.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`4039320b130`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4039320b130) - Support lazy loading in the ProfileCardTrigger component
|
|
8
|
+
|
|
9
|
+
## 16.1.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- [`a5c73ccaa58`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a5c73ccaa58) - Added manager and direct reports section to profile hover card"
|
|
14
|
+
|
|
15
|
+
## 16.0.2
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [`c55c736ecea`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c55c736ecea) - Patch VULN AFP-3486 AFP-3487 AFP-3488 AFP-3489
|
|
20
|
+
|
|
21
|
+
## 16.0.1
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- [`82099b76445`](https://bitbucket.org/atlassian/atlassian-frontend/commits/82099b76445) - Add optional `testId` prop to `ProfileCardTrigger` to ease testing
|
|
26
|
+
|
|
3
27
|
## 16.0.0
|
|
4
28
|
|
|
5
29
|
### Major Changes
|
|
@@ -7,26 +7,38 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
|
|
10
12
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
13
|
|
|
12
14
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
15
|
|
|
16
|
+
var _TeamCentralCardClient = _interopRequireDefault(require("./TeamCentralCardClient"));
|
|
17
|
+
|
|
14
18
|
var _TeamProfileCardClient = _interopRequireDefault(require("./TeamProfileCardClient"));
|
|
15
19
|
|
|
16
20
|
var _UserProfileCardClient = _interopRequireDefault(require("./UserProfileCardClient"));
|
|
17
21
|
|
|
22
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
23
|
+
|
|
24
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
25
|
+
|
|
18
26
|
var ProfileCardClient = /*#__PURE__*/function () {
|
|
19
27
|
function ProfileCardClient(config, clients) {
|
|
20
28
|
(0, _classCallCheck2.default)(this, ProfileCardClient);
|
|
21
29
|
this.userClient = (clients === null || clients === void 0 ? void 0 : clients.userClient) || new _UserProfileCardClient.default(config);
|
|
22
30
|
this.teamClient = (clients === null || clients === void 0 ? void 0 : clients.teamClient) || new _TeamProfileCardClient.default(config);
|
|
31
|
+
this.tcClient = maybeCreateTeamCentralClient(config, clients);
|
|
23
32
|
}
|
|
24
33
|
|
|
25
34
|
(0, _createClass2.default)(ProfileCardClient, [{
|
|
26
35
|
key: "flushCache",
|
|
27
36
|
value: function flushCache() {
|
|
37
|
+
var _this$tcClient;
|
|
38
|
+
|
|
28
39
|
this.userClient.flushCache();
|
|
29
40
|
this.teamClient.flushCache();
|
|
41
|
+
(_this$tcClient = this.tcClient) === null || _this$tcClient === void 0 ? void 0 : _this$tcClient.flushCache();
|
|
30
42
|
}
|
|
31
43
|
}, {
|
|
32
44
|
key: "getProfile",
|
|
@@ -38,9 +50,30 @@ var ProfileCardClient = /*#__PURE__*/function () {
|
|
|
38
50
|
value: function getTeamProfile(teamId, orgId, analytics) {
|
|
39
51
|
return this.teamClient.getProfile(teamId, orgId, analytics);
|
|
40
52
|
}
|
|
53
|
+
}, {
|
|
54
|
+
key: "getReportingLines",
|
|
55
|
+
value: function getReportingLines(userId) {
|
|
56
|
+
var _this$tcClient2;
|
|
57
|
+
|
|
58
|
+
return ((_this$tcClient2 = this.tcClient) === null || _this$tcClient2 === void 0 ? void 0 : _this$tcClient2.getReportingLines(userId)) || Promise.resolve({
|
|
59
|
+
managers: [],
|
|
60
|
+
reports: []
|
|
61
|
+
});
|
|
62
|
+
}
|
|
41
63
|
}]);
|
|
42
64
|
return ProfileCardClient;
|
|
43
65
|
}();
|
|
44
66
|
|
|
67
|
+
function maybeCreateTeamCentralClient(config, clients) {
|
|
68
|
+
if (clients !== null && clients !== void 0 && clients.teamCentralClient) {
|
|
69
|
+
return clients.teamCentralClient;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
var teamCentralUrl = config.teamCentralUrl;
|
|
73
|
+
return teamCentralUrl ? new _TeamCentralCardClient.default(_objectSpread(_objectSpread({}, config), {}, {
|
|
74
|
+
teamCentralUrl: teamCentralUrl
|
|
75
|
+
})) : undefined;
|
|
76
|
+
}
|
|
77
|
+
|
|
45
78
|
var _default = ProfileCardClient;
|
|
46
79
|
exports.default = _default;
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = void 0;
|
|
9
|
+
|
|
10
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
+
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
+
|
|
14
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
15
|
+
|
|
16
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
17
|
+
|
|
18
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
19
|
+
|
|
20
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
21
|
+
|
|
22
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
23
|
+
|
|
24
|
+
var _CachingClient2 = _interopRequireDefault(require("./CachingClient"));
|
|
25
|
+
|
|
26
|
+
var _graphqlUtils = require("./graphqlUtils");
|
|
27
|
+
|
|
28
|
+
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); }; }
|
|
29
|
+
|
|
30
|
+
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; } }
|
|
31
|
+
|
|
32
|
+
var buildReportingLinesQuery = function buildReportingLinesQuery(aaid) {
|
|
33
|
+
return {
|
|
34
|
+
query: "\n fragment ReportingLinesUserPII on UserPII {\n name\n picture\n }\n\n fragment ReportingLinesUserFragment on ReportingLinesUser {\n accountIdentifier\n identifierType\n pii {\n ...ReportingLinesUserPII\n }\n }\n\n query ReportingLines($aaid: String) {\n reportingLines(aaidOrHash: $aaid) {\n managers {\n ...ReportingLinesUserFragment\n }\n reports {\n ...ReportingLinesUserFragment\n }\n }\n }\n ",
|
|
35
|
+
variables: {
|
|
36
|
+
aaid: aaid
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
var TeamCentralCardClient = /*#__PURE__*/function (_CachingClient) {
|
|
42
|
+
(0, _inherits2.default)(TeamCentralCardClient, _CachingClient);
|
|
43
|
+
|
|
44
|
+
var _super = _createSuper(TeamCentralCardClient);
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Simple circuit breaker to avoid making unnecessary calls to Team Central on auth failures
|
|
48
|
+
* This is to handle the case where products may have provided teamCentralUrl, but the site itself
|
|
49
|
+
* doesn't actually have any TC product.
|
|
50
|
+
*
|
|
51
|
+
* There's currently no way to reset this circuit breaker, but that's fine. This is meant to
|
|
52
|
+
* catch a pretty specific edge case.
|
|
53
|
+
*/
|
|
54
|
+
function TeamCentralCardClient(options) {
|
|
55
|
+
var _this;
|
|
56
|
+
|
|
57
|
+
(0, _classCallCheck2.default)(this, TeamCentralCardClient);
|
|
58
|
+
_this = _super.call(this, options);
|
|
59
|
+
_this.options = options;
|
|
60
|
+
_this.bypassOnFailure = false;
|
|
61
|
+
return _this;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
(0, _createClass2.default)(TeamCentralCardClient, [{
|
|
65
|
+
key: "makeRequest",
|
|
66
|
+
value: function () {
|
|
67
|
+
var _makeRequest = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(userId) {
|
|
68
|
+
var query, response;
|
|
69
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
70
|
+
while (1) {
|
|
71
|
+
switch (_context.prev = _context.next) {
|
|
72
|
+
case 0:
|
|
73
|
+
if (this.options.teamCentralUrl) {
|
|
74
|
+
_context.next = 2;
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
throw new Error('options.teamCentralUrl is a required parameter for retrieving Team Central data');
|
|
79
|
+
|
|
80
|
+
case 2:
|
|
81
|
+
query = buildReportingLinesQuery(userId);
|
|
82
|
+
_context.next = 5;
|
|
83
|
+
return (0, _graphqlUtils.graphqlQuery)(this.options.teamCentralUrl, query);
|
|
84
|
+
|
|
85
|
+
case 5:
|
|
86
|
+
response = _context.sent;
|
|
87
|
+
return _context.abrupt("return", response.reportingLines);
|
|
88
|
+
|
|
89
|
+
case 7:
|
|
90
|
+
case "end":
|
|
91
|
+
return _context.stop();
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}, _callee, this);
|
|
95
|
+
}));
|
|
96
|
+
|
|
97
|
+
function makeRequest(_x) {
|
|
98
|
+
return _makeRequest.apply(this, arguments);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return makeRequest;
|
|
102
|
+
}()
|
|
103
|
+
}, {
|
|
104
|
+
key: "getReportingLines",
|
|
105
|
+
value: function getReportingLines(userId) {
|
|
106
|
+
var _this2 = this;
|
|
107
|
+
|
|
108
|
+
if (!userId) {
|
|
109
|
+
return Promise.reject(new Error('userId missing'));
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
var cache = this.getCachedProfile(userId);
|
|
113
|
+
|
|
114
|
+
if (cache) {
|
|
115
|
+
return Promise.resolve(cache);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
if (this.bypassOnFailure) {
|
|
119
|
+
return Promise.resolve({});
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
return new Promise(function (resolve) {
|
|
123
|
+
_this2.makeRequest(userId).then(function (data) {
|
|
124
|
+
var enhancedData = {
|
|
125
|
+
managers: _this2.filterReportingLinesUser(data === null || data === void 0 ? void 0 : data.managers),
|
|
126
|
+
reports: _this2.filterReportingLinesUser(data === null || data === void 0 ? void 0 : data.reports)
|
|
127
|
+
};
|
|
128
|
+
|
|
129
|
+
if (_this2.cache) {
|
|
130
|
+
_this2.setCachedProfile(userId, enhancedData);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
resolve(enhancedData);
|
|
134
|
+
}).catch(function (error) {
|
|
135
|
+
if ((error === null || error === void 0 ? void 0 : error.status) === 401 || (error === null || error === void 0 ? void 0 : error.status) === 403) {
|
|
136
|
+
// Trigger circuit breaker
|
|
137
|
+
_this2.bypassOnFailure = true;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Reporting lines aren't part of the critical path of profile card.
|
|
141
|
+
* Just resolve with empty values instead of bubbling up the error.
|
|
142
|
+
*/
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
resolve({});
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
}, {
|
|
150
|
+
key: "filterReportingLinesUser",
|
|
151
|
+
value: function filterReportingLinesUser() {
|
|
152
|
+
var users = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
153
|
+
return users.filter(function (user) {
|
|
154
|
+
return user.identifierType === 'ATLASSIAN_ID';
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
}]);
|
|
158
|
+
return TeamCentralCardClient;
|
|
159
|
+
}(_CachingClient2.default);
|
|
160
|
+
|
|
161
|
+
var _default = TeamCentralCardClient;
|
|
162
|
+
exports.default = _default;
|
|
@@ -16,10 +16,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
16
16
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || (0, _typeof2.default)(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; }
|
|
17
17
|
|
|
18
18
|
var TeamProfileCardLazy = /*#__PURE__*/(0, _react.lazy)(function () {
|
|
19
|
-
return (
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
})
|
|
23
|
-
);
|
|
19
|
+
return Promise.resolve().then(function () {
|
|
20
|
+
return _interopRequireWildcard(require('./TeamProfileCard'));
|
|
21
|
+
});
|
|
24
22
|
});
|
|
25
23
|
exports.TeamProfileCardLazy = TeamProfileCardLazy;
|
|
@@ -55,6 +55,8 @@ var _Error = require("../Error");
|
|
|
55
55
|
|
|
56
56
|
var _Icon = require("../Icon");
|
|
57
57
|
|
|
58
|
+
var _ReportingLinesDetails = _interopRequireDefault(require("./ReportingLinesDetails"));
|
|
59
|
+
|
|
58
60
|
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); }; }
|
|
59
61
|
|
|
60
62
|
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; } }
|
|
@@ -148,6 +150,8 @@ var Profilecard = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
148
150
|
}, {
|
|
149
151
|
key: "renderCardDetailsDefault",
|
|
150
152
|
value: function renderCardDetailsDefault() {
|
|
153
|
+
var _this4 = this;
|
|
154
|
+
|
|
151
155
|
var _this$props2 = this.props,
|
|
152
156
|
meta = _this$props2.meta,
|
|
153
157
|
location = _this$props2.location,
|
|
@@ -163,7 +167,15 @@ var Profilecard = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
163
167
|
icon: "companyName"
|
|
164
168
|
}, companyName), /*#__PURE__*/_react.default.createElement(_Icon.IconLabel, {
|
|
165
169
|
icon: "location"
|
|
166
|
-
}, location)
|
|
170
|
+
}, location), /*#__PURE__*/_react.default.createElement(_ReportingLinesDetails.default, {
|
|
171
|
+
reportingLines: this.props.reportingLines,
|
|
172
|
+
reportingLinesProfileUrl: this.props.reportingLinesProfileUrl,
|
|
173
|
+
onReportingLinesClick: this.props.onReportingLinesClick,
|
|
174
|
+
analytics: this.props.analytics,
|
|
175
|
+
getDuration: function getDuration() {
|
|
176
|
+
return _this4.durationSince(_this4.timeOpen);
|
|
177
|
+
}
|
|
178
|
+
}));
|
|
167
179
|
}
|
|
168
180
|
}, {
|
|
169
181
|
key: "renderCardDetailsForDisabledAccount",
|
|
@@ -284,7 +296,8 @@ var Profilecard = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
284
296
|
var _this$props8 = this.props,
|
|
285
297
|
fullName = _this$props8.fullName,
|
|
286
298
|
status = _this$props8.status,
|
|
287
|
-
withoutElevation = _this$props8.withoutElevation
|
|
299
|
+
withoutElevation = _this$props8.withoutElevation,
|
|
300
|
+
reportingLines = _this$props8.reportingLines;
|
|
288
301
|
var cardContent = null; // @FIXME do closed users have empty fullName field?
|
|
289
302
|
|
|
290
303
|
var canRender = fullName || status === 'closed';
|
|
@@ -295,10 +308,14 @@ var Profilecard = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
295
308
|
} else if (this.props.isLoading) {
|
|
296
309
|
cardContent = /*#__PURE__*/_react.default.createElement(_Card.SpinnerContainer, null, /*#__PURE__*/_react.default.createElement(_spinner.default, null));
|
|
297
310
|
} else if (canRender) {
|
|
311
|
+
var _reportingLines$manag, _reportingLines$repor;
|
|
312
|
+
|
|
298
313
|
var isDisabledUser = status === 'inactive' || status === 'closed';
|
|
299
314
|
var actions = this.renderActionsButtons();
|
|
300
315
|
this.callAnalytics(_analytics.AnalyticsName.PROFILE_CARD_LOADED, {
|
|
301
|
-
duration: this.durationSince(this.timeOpen)
|
|
316
|
+
duration: this.durationSince(this.timeOpen),
|
|
317
|
+
managersCount: (reportingLines === null || reportingLines === void 0 ? void 0 : (_reportingLines$manag = reportingLines.managers) === null || _reportingLines$manag === void 0 ? void 0 : _reportingLines$manag.length) || 0,
|
|
318
|
+
directReportsCount: (reportingLines === null || reportingLines === void 0 ? void 0 : (_reportingLines$repor = reportingLines.reports) === null || _reportingLines$repor === void 0 ? void 0 : _reportingLines$repor.length) || 0
|
|
302
319
|
});
|
|
303
320
|
cardContent = /*#__PURE__*/_react.default.createElement(_Card.CardContainer, {
|
|
304
321
|
isDisabledUser: isDisabledUser,
|
|
@@ -66,7 +66,8 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
66
66
|
isLoading: undefined,
|
|
67
67
|
hasError: false,
|
|
68
68
|
error: null,
|
|
69
|
-
data: null
|
|
69
|
+
data: null,
|
|
70
|
+
reportingLinesData: undefined
|
|
70
71
|
});
|
|
71
72
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callAnalytics", function (id) {
|
|
72
73
|
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
@@ -92,8 +93,9 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
92
93
|
hasError: false,
|
|
93
94
|
data: null
|
|
94
95
|
}, function () {
|
|
95
|
-
_this.props.resourceClient.getProfile(cloudId, userId).
|
|
96
|
-
|
|
96
|
+
var requests = Promise.all([_this.props.resourceClient.getProfile(cloudId, userId), _this.props.resourceClient.getReportingLines(userId)]);
|
|
97
|
+
requests.then(function (res) {
|
|
98
|
+
return _this.handleClientSuccess(res[0], res[1]);
|
|
97
99
|
}, function (err) {
|
|
98
100
|
return _this.handleClientError(err);
|
|
99
101
|
}).catch(function (err) {
|
|
@@ -139,7 +141,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
139
141
|
}
|
|
140
142
|
}, {
|
|
141
143
|
key: "handleClientSuccess",
|
|
142
|
-
value: function handleClientSuccess(
|
|
144
|
+
value: function handleClientSuccess(profileData, reportingLinesData) {
|
|
143
145
|
if (!this._isMounted) {
|
|
144
146
|
return;
|
|
145
147
|
}
|
|
@@ -147,7 +149,8 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
147
149
|
this.setState({
|
|
148
150
|
isLoading: false,
|
|
149
151
|
hasError: false,
|
|
150
|
-
data:
|
|
152
|
+
data: profileData,
|
|
153
|
+
reportingLinesData: reportingLinesData
|
|
151
154
|
});
|
|
152
155
|
}
|
|
153
156
|
}, {
|
|
@@ -170,8 +173,11 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
170
173
|
isLoading = _this$state.isLoading,
|
|
171
174
|
hasError = _this$state.hasError,
|
|
172
175
|
error = _this$state.error,
|
|
173
|
-
data = _this$state.data
|
|
174
|
-
|
|
176
|
+
data = _this$state.data,
|
|
177
|
+
reportingLinesData = _this$state.reportingLinesData;
|
|
178
|
+
var _this$props3 = this.props,
|
|
179
|
+
analytics = _this$props3.analytics,
|
|
180
|
+
onReportingLinesClick = _this$props3.onReportingLinesClick;
|
|
175
181
|
var isFetchingOrNotStartToFetchYet = isLoading === true || isLoading === undefined;
|
|
176
182
|
|
|
177
183
|
if (isFetchingOrNotStartToFetchYet) {
|
|
@@ -187,7 +193,9 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
187
193
|
hasError: hasError,
|
|
188
194
|
errorType: error,
|
|
189
195
|
clientFetchProfile: this.clientFetchProfile,
|
|
190
|
-
analytics: analytics
|
|
196
|
+
analytics: analytics,
|
|
197
|
+
reportingLines: reportingLinesData,
|
|
198
|
+
onReportingLinesClick: onReportingLinesClick
|
|
191
199
|
}, data);
|
|
192
200
|
|
|
193
201
|
return /*#__PURE__*/_react.default.createElement(_Card.CardWrapper, null, /*#__PURE__*/_react.default.createElement(_ProfileCard.default, (0, _extends2.default)({}, newProps, {
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
+
|
|
5
7
|
Object.defineProperty(exports, "__esModule", {
|
|
6
8
|
value: true
|
|
7
9
|
});
|
|
@@ -25,7 +27,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
25
27
|
|
|
26
28
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
27
29
|
|
|
28
|
-
var _react =
|
|
30
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
29
31
|
|
|
30
32
|
var _popup = _interopRequireDefault(require("@atlaskit/popup"));
|
|
31
33
|
|
|
@@ -37,10 +39,14 @@ var _Card = require("../../styled/Card");
|
|
|
37
39
|
|
|
38
40
|
var _config = require("../../util/config");
|
|
39
41
|
|
|
40
|
-
var
|
|
42
|
+
var _lazyProfileCard = require("./lazyProfileCard");
|
|
41
43
|
|
|
42
44
|
var _UserLoadingState = _interopRequireDefault(require("./UserLoadingState"));
|
|
43
45
|
|
|
46
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
47
|
+
|
|
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
|
+
|
|
44
50
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
45
51
|
|
|
46
52
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
@@ -106,7 +112,8 @@ var ProfilecardTrigger = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
106
112
|
isLoading: undefined,
|
|
107
113
|
hasError: false,
|
|
108
114
|
error: null,
|
|
109
|
-
data: null
|
|
115
|
+
data: null,
|
|
116
|
+
reportingLinesData: undefined
|
|
110
117
|
});
|
|
111
118
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clientFetchProfile", function () {
|
|
112
119
|
var _this$props = _this.props,
|
|
@@ -124,8 +131,9 @@ var ProfilecardTrigger = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
124
131
|
hasError: false,
|
|
125
132
|
data: null
|
|
126
133
|
}, function () {
|
|
127
|
-
_this.props.resourceClient.getProfile(cloudId || '', userId).
|
|
128
|
-
|
|
134
|
+
var requests = Promise.all([_this.props.resourceClient.getProfile(cloudId || '', userId), _this.props.resourceClient.getReportingLines(userId)]);
|
|
135
|
+
requests.then(function (res) {
|
|
136
|
+
return _this.handleClientSuccess(res[0], res[1]);
|
|
129
137
|
}, function (err) {
|
|
130
138
|
return _this.handleClientError(err);
|
|
131
139
|
}).catch(function (err) {
|
|
@@ -174,7 +182,7 @@ var ProfilecardTrigger = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
174
182
|
}
|
|
175
183
|
}, {
|
|
176
184
|
key: "handleClientSuccess",
|
|
177
|
-
value: function handleClientSuccess(
|
|
185
|
+
value: function handleClientSuccess(profileData, reportingLinesData) {
|
|
178
186
|
if (!this._isMounted) {
|
|
179
187
|
return;
|
|
180
188
|
}
|
|
@@ -182,7 +190,8 @@ var ProfilecardTrigger = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
182
190
|
this.setState({
|
|
183
191
|
isLoading: false,
|
|
184
192
|
hasError: false,
|
|
185
|
-
data:
|
|
193
|
+
data: profileData,
|
|
194
|
+
reportingLinesData: reportingLinesData
|
|
186
195
|
});
|
|
187
196
|
}
|
|
188
197
|
}, {
|
|
@@ -206,21 +215,26 @@ var ProfilecardTrigger = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
206
215
|
}, {
|
|
207
216
|
key: "renderProfileCard",
|
|
208
217
|
value: function renderProfileCard() {
|
|
209
|
-
var newProps = _objectSpread({
|
|
218
|
+
var newProps = _objectSpread(_objectSpread({
|
|
210
219
|
clientFetchProfile: this.clientFetchProfile,
|
|
211
220
|
analytics: this.props.analytics
|
|
212
|
-
}, this.state.data)
|
|
221
|
+
}, this.state.data), {}, {
|
|
222
|
+
reportingLines: this.state.reportingLinesData,
|
|
223
|
+
onReportingLinesClick: this.props.onReportingLinesClick
|
|
224
|
+
});
|
|
213
225
|
|
|
214
226
|
var wrapperProps = this.props.trigger === 'hover' ? {
|
|
215
227
|
onMouseEnter: this.showProfilecard,
|
|
216
228
|
onMouseLeave: this.hideProfilecard
|
|
217
229
|
} : {};
|
|
218
|
-
return /*#__PURE__*/_react.default.createElement("div", wrapperProps, /*#__PURE__*/_react.default.createElement(
|
|
230
|
+
return /*#__PURE__*/_react.default.createElement("div", wrapperProps, this.state.visible && /*#__PURE__*/_react.default.createElement(_react.Suspense, {
|
|
231
|
+
fallback: null
|
|
232
|
+
}, /*#__PURE__*/_react.default.createElement(_lazyProfileCard.ProfileCardLazy, (0, _extends2.default)({}, newProps, {
|
|
219
233
|
actions: this.filterActions(),
|
|
220
234
|
hasError: this.state.hasError,
|
|
221
235
|
errorType: this.state.error,
|
|
222
236
|
withoutElevation: true
|
|
223
|
-
})));
|
|
237
|
+
}))));
|
|
224
238
|
}
|
|
225
239
|
}, {
|
|
226
240
|
key: "renderWithTrigger",
|
|
@@ -236,7 +250,8 @@ var ProfilecardTrigger = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
236
250
|
var ref = triggerProps.ref,
|
|
237
251
|
innerProps = (0, _objectWithoutProperties2.default)(triggerProps, ["ref"]);
|
|
238
252
|
return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, innerProps, _this2.containerListeners, {
|
|
239
|
-
ref: ref
|
|
253
|
+
ref: ref,
|
|
254
|
+
"data-testid": _this2.props.testId
|
|
240
255
|
}), _this2.props.children);
|
|
241
256
|
},
|
|
242
257
|
zIndex: _constants.layers.modal()
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = void 0;
|
|
9
|
+
|
|
10
|
+
var _react = _interopRequireDefault(require("react"));
|
|
11
|
+
|
|
12
|
+
var _reactIntlNext = require("react-intl-next");
|
|
13
|
+
|
|
14
|
+
var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
|
|
15
|
+
|
|
16
|
+
var _avatarGroup = _interopRequireDefault(require("@atlaskit/avatar-group"));
|
|
17
|
+
|
|
18
|
+
var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
|
|
19
|
+
|
|
20
|
+
var _analytics = require("../../internal/analytics");
|
|
21
|
+
|
|
22
|
+
var _messages = _interopRequireDefault(require("../../messages"));
|
|
23
|
+
|
|
24
|
+
var _ReportingLines = require("../../styled/ReportingLines");
|
|
25
|
+
|
|
26
|
+
function getProfileHref(userId, profileUrl) {
|
|
27
|
+
return profileUrl ? profileUrl + userId : undefined;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
var ReportingLinesDetails = function ReportingLinesDetails(props) {
|
|
31
|
+
var _manager$pii, _manager$pii2;
|
|
32
|
+
|
|
33
|
+
var _props$reportingLines = props.reportingLines,
|
|
34
|
+
reportingLines = _props$reportingLines === void 0 ? {} : _props$reportingLines,
|
|
35
|
+
reportingLinesProfileUrl = props.reportingLinesProfileUrl,
|
|
36
|
+
onReportingLinesClick = props.onReportingLinesClick,
|
|
37
|
+
_props$analytics = props.analytics,
|
|
38
|
+
analytics = _props$analytics === void 0 ? function () {} : _props$analytics,
|
|
39
|
+
getDuration = props.getDuration;
|
|
40
|
+
var _reportingLines$manag = reportingLines.managers,
|
|
41
|
+
managers = _reportingLines$manag === void 0 ? [] : _reportingLines$manag,
|
|
42
|
+
_reportingLines$repor = reportingLines.reports,
|
|
43
|
+
reports = _reportingLines$repor === void 0 ? [] : _reportingLines$repor;
|
|
44
|
+
var manager = managers.length >= 1 ? managers[0] : undefined;
|
|
45
|
+
var hasReports = reports.length > 0;
|
|
46
|
+
|
|
47
|
+
var getReportingLinesOnClick = function getReportingLinesOnClick(user, analyticsId) {
|
|
48
|
+
return onReportingLinesClick ? function () {
|
|
49
|
+
analytics(_analytics.AnalyticsName.PROFILE_CARD_CLICK, {
|
|
50
|
+
id: analyticsId,
|
|
51
|
+
duration: getDuration()
|
|
52
|
+
});
|
|
53
|
+
onReportingLinesClick(user);
|
|
54
|
+
} : undefined;
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, manager && /*#__PURE__*/_react.default.createElement(_ReportingLines.ReportingLinesSection, null, /*#__PURE__*/_react.default.createElement(_ReportingLines.ReportingLinesHeading, {
|
|
58
|
+
style: {
|
|
59
|
+
marginBottom: 0
|
|
60
|
+
}
|
|
61
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.default.managerSectionHeading)), /*#__PURE__*/_react.default.createElement(_ReportingLines.OffsetWrapper, null, /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
|
|
62
|
+
appearance: "subtle",
|
|
63
|
+
spacing: "none",
|
|
64
|
+
href: getProfileHref(manager.accountIdentifier, reportingLinesProfileUrl),
|
|
65
|
+
onClick: getReportingLinesOnClick(manager, 'reporting-lines-manager'),
|
|
66
|
+
isDisabled: !onReportingLinesClick
|
|
67
|
+
}, /*#__PURE__*/_react.default.createElement(_ReportingLines.ManagerSection, null, /*#__PURE__*/_react.default.createElement(_avatar.default, {
|
|
68
|
+
size: "xsmall",
|
|
69
|
+
src: (_manager$pii = manager.pii) === null || _manager$pii === void 0 ? void 0 : _manager$pii.picture
|
|
70
|
+
}), /*#__PURE__*/_react.default.createElement(_ReportingLines.ManagerName, null, (_manager$pii2 = manager.pii) === null || _manager$pii2 === void 0 ? void 0 : _manager$pii2.name))))), hasReports && /*#__PURE__*/_react.default.createElement(_ReportingLines.ReportingLinesSection, null, /*#__PURE__*/_react.default.createElement(_ReportingLines.ReportingLinesHeading, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.default.directReportsSectionHeading)), /*#__PURE__*/_react.default.createElement(_avatarGroup.default, {
|
|
71
|
+
appearance: "stack",
|
|
72
|
+
size: "small",
|
|
73
|
+
data: reports.map(function (member, index) {
|
|
74
|
+
var _member$pii, _member$pii2;
|
|
75
|
+
|
|
76
|
+
return {
|
|
77
|
+
key: member.accountIdentifier,
|
|
78
|
+
name: ((_member$pii = member.pii) === null || _member$pii === void 0 ? void 0 : _member$pii.name) || '',
|
|
79
|
+
src: (_member$pii2 = member.pii) === null || _member$pii2 === void 0 ? void 0 : _member$pii2.picture,
|
|
80
|
+
href: getProfileHref(member.accountIdentifier, reportingLinesProfileUrl),
|
|
81
|
+
onClick: getReportingLinesOnClick(member, 'reporting-lines-direct-report')
|
|
82
|
+
};
|
|
83
|
+
}),
|
|
84
|
+
maxCount: 5,
|
|
85
|
+
testId: "profilecard-reports-avatar-group"
|
|
86
|
+
})));
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
var _default = ReportingLinesDetails;
|
|
90
|
+
exports.default = _default;
|
|
@@ -17,33 +17,19 @@ Object.defineProperty(exports, "DELAY_MS_SHOW", {
|
|
|
17
17
|
return _config.DELAY_MS_SHOW;
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
|
-
Object.defineProperty(exports, "
|
|
20
|
+
Object.defineProperty(exports, "ProfileCardLazy", {
|
|
21
21
|
enumerable: true,
|
|
22
22
|
get: function get() {
|
|
23
|
-
return
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
Object.defineProperty(exports, "ProfileCardResourced", {
|
|
27
|
-
enumerable: true,
|
|
28
|
-
get: function get() {
|
|
29
|
-
return _ProfileCardResourced.default;
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
Object.defineProperty(exports, "ProfileCardTrigger", {
|
|
33
|
-
enumerable: true,
|
|
34
|
-
get: function get() {
|
|
35
|
-
return _ProfileCardTrigger.default;
|
|
23
|
+
return _lazyProfileCard.ProfileCardLazy;
|
|
36
24
|
}
|
|
37
25
|
});
|
|
38
26
|
exports.default = void 0;
|
|
39
27
|
|
|
40
28
|
var _config = require("../../util/config");
|
|
41
29
|
|
|
42
|
-
var
|
|
30
|
+
var _lazyProfileCard = require("./lazyProfileCard");
|
|
43
31
|
|
|
44
32
|
var _ProfileCardTrigger = _interopRequireDefault(require("./ProfileCardTrigger"));
|
|
45
33
|
|
|
46
|
-
var _ProfileCardResourced = _interopRequireDefault(require("./ProfileCardResourced"));
|
|
47
|
-
|
|
48
34
|
var _default = _ProfileCardTrigger.default;
|
|
49
35
|
exports.default = _default;
|