@atlaskit/profilecard 26.1.0 → 26.1.1

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 CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/profilecard
2
2
 
3
+ ## 26.1.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`48fdf96c8650a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/48fdf96c8650a) -
8
+ Remove disallowed aria attributes from agent profile card trigger
9
+ - Updated dependencies
10
+
3
11
  ## 26.1.0
4
12
 
5
13
  ### Minor Changes
@@ -11,7 +11,7 @@ var _graphqlUtils = require("./graphqlUtils");
11
11
  var ORG_ID_FROM_CLOUD_ID_QUERY = "query OrgIdFromCloudId($cloudId: ID!) {\n\ttenantContexts(cloudIds: [$cloudId]) {\n\t\torgId\n\t}\n}";
12
12
  var addHeaders = function addHeaders(headers) {
13
13
  headers.append('atl-client-name', "@atlaskit/profilecard");
14
- headers.append('atl-client-version', "26.0.3");
14
+ headers.append('atl-client-version', "26.1.1");
15
15
  return headers;
16
16
  };
17
17
  function getOrgIdForCloudIdFromAGG(_x, _x2) {
@@ -66,7 +66,7 @@ var addHeaders = exports.addHeaders = function addHeaders(headers) {
66
66
  headers.append('X-ExperimentalApi', 'teams-beta');
67
67
  headers.append('X-ExperimentalApi', 'team-members-beta');
68
68
  headers.append('atl-client-name', "@atlaskit/profilecard");
69
- headers.append('atl-client-version', "26.0.3");
69
+ headers.append('atl-client-version', "26.1.1");
70
70
  return headers;
71
71
  };
72
72
  function getTeamFromAGG(_x, _x2, _x3) {
@@ -173,7 +173,7 @@ var ProfileCardDetails = exports.ProfileCardDetails = function ProfileCardDetail
173
173
  icon: "companyName"
174
174
  }, props.companyName), /*#__PURE__*/_react.default.createElement(_Icon.IconLabel, {
175
175
  icon: "location"
176
- }, props.location)), !((0, _platformFeatureFlags.fg)('jira_ai_profilecard_hide_reportinglines') && props.hideReportingLines) && /*#__PURE__*/_react.default.createElement(_ReportingLinesDetails.default, {
176
+ }, props.location)), /*#__PURE__*/_react.default.createElement(_ReportingLinesDetails.default, {
177
177
  reportingLines: props.reportingLines,
178
178
  reportingLinesProfileUrl: props.reportingLinesProfileUrl,
179
179
  onReportingLinesClick: props.onReportingLinesClick,
@@ -16,7 +16,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
16
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
17
  var _react = _interopRequireWildcard(require("react"));
18
18
  var _giveKudos = require("@atlaskit/give-kudos");
19
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
20
19
  var _teamsAppInternalAnalytics = require("@atlaskit/teams-app-internal-analytics");
21
20
  var _filterActions = _interopRequireDefault(require("../../internal/filterActions"));
22
21
  var _UserTrigger = require("../../styled/UserTrigger");
@@ -75,11 +74,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
75
74
  hasError: false,
76
75
  data: null
77
76
  }, function () {
78
- var shouldHideReportingLines = (0, _platformFeatureFlags.fg)('jira_ai_profilecard_hide_reportinglines') && _this.props.hideReportingLines;
79
- var requests = Promise.all([_this.props.resourceClient.getProfile(cloudId, userId, _this.fireAnalytics), shouldHideReportingLines ? Promise.resolve({
80
- managers: [],
81
- reports: []
82
- }) : _this.props.resourceClient.getReportingLines(userId), _this.props.resourceClient.shouldShowGiveKudos(), _this.props.resourceClient.getTeamCentralBaseUrl({
77
+ var requests = Promise.all([_this.props.resourceClient.getProfile(cloudId, userId, _this.fireAnalytics), _this.props.resourceClient.getReportingLines(userId), _this.props.resourceClient.shouldShowGiveKudos(), _this.props.resourceClient.getTeamCentralBaseUrl({
83
78
  withOrgContext: true,
84
79
  withSiteContext: true
85
80
  })]);
@@ -175,8 +170,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
175
170
  onReportingLinesClick = _this$props4.onReportingLinesClick,
176
171
  cloudId = _this$props4.cloudId,
177
172
  userId = _this$props4.userId,
178
- addFlag = _this$props4.addFlag,
179
- hideReportingLines = _this$props4.hideReportingLines;
173
+ addFlag = _this$props4.addFlag;
180
174
  var isFetchingOrNotStartToFetchYet = isLoading === true || isLoading === undefined;
181
175
  if (isFetchingOrNotStartToFetchYet) {
182
176
  return /*#__PURE__*/_react.default.createElement(_UserTrigger.CardWrapper, null, /*#__PURE__*/_react.default.createElement(_UserLoadingState.default, {
@@ -203,8 +197,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
203
197
  }, data), {}, {
204
198
  isKudosEnabled: isKudosEnabled,
205
199
  teamCentralBaseUrl: teamCentralBaseUrl,
206
- openKudosDrawer: this.openKudosDrawer,
207
- hideReportingLines: (0, _platformFeatureFlags.fg)('jira_ai_profilecard_hide_reportinglines') && hideReportingLines
200
+ openKudosDrawer: this.openKudosDrawer
208
201
  });
209
202
  return /*#__PURE__*/_react.default.createElement(_UserTrigger.CardWrapper, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isKudosEnabled && newProps.teamCentralBaseUrl && /*#__PURE__*/_react.default.createElement(_react.Suspense, {
210
203
  fallback: null
@@ -103,7 +103,6 @@ function ProfilecardTriggerNext(_ref2) {
103
103
  hideAgentMoreActions = _ref2.hideAgentMoreActions,
104
104
  hideAiDisclaimer = _ref2.hideAiDisclaimer,
105
105
  hideAgentConversationStarters = _ref2.hideAgentConversationStarters,
106
- hideReportingLines = _ref2.hideReportingLines,
107
106
  _ref2$ariaHideProfile = _ref2.ariaHideProfileTrigger,
108
107
  ariaHideProfileTrigger = _ref2$ariaHideProfile === void 0 ? false : _ref2$ariaHideProfile,
109
108
  propsIsVisible = _ref2.isVisible,
@@ -244,7 +243,7 @@ function ProfilecardTriggerNext(_ref2) {
244
243
  setError(err);
245
244
  }, [setHasError, setIsLoading, setError]);
246
245
  var clientFetchProfile = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
247
- var shouldHideReportingLines, requests, responses, _t;
246
+ var requests, responses, _t;
248
247
  return _regenerator.default.wrap(function (_context) {
249
248
  while (1) switch (_context.prev = _context.next) {
250
249
  case 0:
@@ -259,11 +258,7 @@ function ProfilecardTriggerNext(_ref2) {
259
258
  setError(null);
260
259
  setData(null);
261
260
  _context.prev = 2;
262
- shouldHideReportingLines = (0, _platformFeatureFlags.fg)('jira_ai_profilecard_hide_reportinglines') && hideReportingLines;
263
- requests = Promise.all([resourceClient.getProfile(cloudId || '', userId, fireAnalytics), shouldHideReportingLines ? Promise.resolve({
264
- managers: [],
265
- reports: []
266
- }) : resourceClient.getReportingLines(userId), resourceClient.shouldShowGiveKudos(), resourceClient.getTeamCentralBaseUrl({
261
+ requests = Promise.all([resourceClient.getProfile(cloudId || '', userId, fireAnalytics), resourceClient.getReportingLines(userId), resourceClient.shouldShowGiveKudos(), resourceClient.getTeamCentralBaseUrl({
267
262
  withOrgContext: true,
268
263
  withSiteContext: true
269
264
  })]);
@@ -283,7 +278,7 @@ function ProfilecardTriggerNext(_ref2) {
283
278
  return _context.stop();
284
279
  }
285
280
  }, _callee, null, [[2, 4]]);
286
- })), [cloudId, fireAnalytics, isLoading, resourceClient, userId, handleClientSuccess, handleClientError, hideReportingLines]);
281
+ })), [cloudId, fireAnalytics, isLoading, resourceClient, userId, handleClientSuccess, handleClientError]);
287
282
  var showProfilecard = (0, _react.useCallback)(function () {
288
283
  clearTimeout(hideTimer.current);
289
284
  clearTimeout(showTimer.current);
@@ -388,7 +383,6 @@ function ProfilecardTriggerNext(_ref2) {
388
383
  openKudosDrawer: openKudosDrawer,
389
384
  isTriggeredUsingKeyboard: isTriggeredUsingKeyboard,
390
385
  disabledAriaAttributes: disabledAriaAttributes,
391
- hideReportingLines: (0, _platformFeatureFlags.fg)('jira_ai_profilecard_hide_reportinglines') && hideReportingLines,
392
386
  hideAgentConversationStarters: (0, _platformFeatureFlags.fg)('jira_ai_hide_conversation_starters_profilecard') && hideAgentConversationStarters
393
387
  });
394
388
  var ssrPlaceholderProp = ssrPlaceholderId ? {
@@ -13,6 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
13
13
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
14
14
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
15
15
  var _react = _interopRequireWildcard(require("react"));
16
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
17
  var _popup = _interopRequireDefault(require("@atlaskit/popup"));
17
18
  var _constants = require("@atlaskit/theme/constants");
18
19
  var _analytics = require("../../util/analytics");
@@ -22,7 +23,8 @@ var _LoadingState = require("./LoadingState");
22
23
  var _PopupTrigger = require("./PopupTrigger");
23
24
  var _ProfileCardWrapper = require("./ProfileCardWrapper");
24
25
  var _excluded = ["trigger", "ariaLabelledBy", "children", "renderProfileCard", "fetchProfile", "disabledAriaAttributes", "profileCardType", "testId", "fireAnalytics"],
25
- _excluded2 = ["aria-expanded", "aria-haspopup"];
26
+ _excluded2 = ["aria-expanded", "aria-haspopup", "aria-controls"],
27
+ _excluded3 = ["aria-expanded", "aria-haspopup"];
26
28
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
27
29
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
28
30
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -109,18 +111,34 @@ function ProfileCardTriggerInner(_ref, ref) {
109
111
  zIndex: _constants.layers.modal(),
110
112
  shouldFitContainer: false,
111
113
  trigger: function trigger(triggerProps) {
112
- var _ = triggerProps['aria-expanded'],
113
- __ = triggerProps['aria-haspopup'],
114
- restInnerProps = (0, _objectWithoutProperties2.default)(triggerProps, _excluded2);
115
- return /*#__PURE__*/_react.default.createElement(_PopupTrigger.PopupTrigger, (0, _extends2.default)({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
116
- ref: triggerProps.ref,
117
- hideProfilecard: hideProfilecard,
118
- showProfilecard: showProfilecard,
119
- children: children,
120
- ariaLabelledBy: ariaLabelledBy,
121
- trigger: _trigger,
122
- "data-testid": testId
123
- }));
114
+ if ((0, _platformFeatureFlags.fg)('fix_aria_attribute_violation_on_agent_card_trigger')) {
115
+ var _ = triggerProps['aria-expanded'],
116
+ __ = triggerProps['aria-haspopup'],
117
+ ___ = triggerProps['aria-controls'],
118
+ restInnerProps = (0, _objectWithoutProperties2.default)(triggerProps, _excluded2);
119
+ return /*#__PURE__*/_react.default.createElement(_PopupTrigger.PopupTrigger, (0, _extends2.default)({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
120
+ ref: triggerProps.ref,
121
+ hideProfilecard: hideProfilecard,
122
+ showProfilecard: showProfilecard,
123
+ children: children,
124
+ ariaLabelledBy: ariaLabelledBy,
125
+ trigger: _trigger,
126
+ "data-testid": testId
127
+ }));
128
+ } else {
129
+ var _2 = triggerProps['aria-expanded'],
130
+ _3 = triggerProps['aria-haspopup'],
131
+ _restInnerProps = (0, _objectWithoutProperties2.default)(triggerProps, _excluded3);
132
+ return /*#__PURE__*/_react.default.createElement(_PopupTrigger.PopupTrigger, (0, _extends2.default)({}, disabledAriaAttributes ? _restInnerProps : triggerProps, {
133
+ ref: triggerProps.ref,
134
+ hideProfilecard: hideProfilecard,
135
+ showProfilecard: showProfilecard,
136
+ children: children,
137
+ ariaLabelledBy: ariaLabelledBy,
138
+ trigger: _trigger,
139
+ "data-testid": testId
140
+ }));
141
+ }
124
142
  },
125
143
  content: function content() {
126
144
  return /*#__PURE__*/_react.default.createElement("div", {
@@ -12,7 +12,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
12
12
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
13
13
  var PACKAGE_META_DATA = exports.PACKAGE_META_DATA = {
14
14
  packageName: (_process$env$_PACKAGE = "@atlaskit/profilecard") !== null && _process$env$_PACKAGE !== void 0 ? _process$env$_PACKAGE : '',
15
- packageVersion: (_process$env$_PACKAGE2 = "26.0.3") !== null && _process$env$_PACKAGE2 !== void 0 ? _process$env$_PACKAGE2 : ''
15
+ packageVersion: (_process$env$_PACKAGE2 = "26.1.1") !== null && _process$env$_PACKAGE2 !== void 0 ? _process$env$_PACKAGE2 : ''
16
16
  };
17
17
  var TEAM_SUBJECT = 'teamProfileCard';
18
18
  var USER_SUBJECT = 'profilecard';
@@ -31,7 +31,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
31
31
  actionSubjectId: actionSubjectId,
32
32
  attributes: _objectSpread(_objectSpread({
33
33
  packageName: "@atlaskit/profilecard",
34
- packageVersion: "26.0.3"
34
+ packageVersion: "26.1.1"
35
35
  }, attributes), {}, {
36
36
  firedAt: Math.round((0, _performance.getPageTime)())
37
37
  })
@@ -6,7 +6,7 @@ const ORG_ID_FROM_CLOUD_ID_QUERY = `query OrgIdFromCloudId($cloudId: ID!) {
6
6
  }`;
7
7
  const addHeaders = headers => {
8
8
  headers.append('atl-client-name', "@atlaskit/profilecard");
9
- headers.append('atl-client-version', "26.0.3");
9
+ headers.append('atl-client-version', "26.1.1");
10
10
  return headers;
11
11
  };
12
12
  export async function getOrgIdForCloudIdFromAGG(url, cloudId) {
@@ -78,7 +78,7 @@ export const addHeaders = headers => {
78
78
  headers.append('X-ExperimentalApi', 'teams-beta');
79
79
  headers.append('X-ExperimentalApi', 'team-members-beta');
80
80
  headers.append('atl-client-name', "@atlaskit/profilecard");
81
- headers.append('atl-client-version', "26.0.3");
81
+ headers.append('atl-client-version', "26.1.1");
82
82
  return headers;
83
83
  };
84
84
  export async function getTeamFromAGG(url, teamId, siteId) {
@@ -167,7 +167,7 @@ export const ProfileCardDetails = props => {
167
167
  icon: "companyName"
168
168
  }, props.companyName), /*#__PURE__*/React.createElement(IconLabel, {
169
169
  icon: "location"
170
- }, props.location)), !(fg('jira_ai_profilecard_hide_reportinglines') && props.hideReportingLines) && /*#__PURE__*/React.createElement(ReportingLinesDetails, {
170
+ }, props.location)), /*#__PURE__*/React.createElement(ReportingLinesDetails, {
171
171
  reportingLines: props.reportingLines,
172
172
  reportingLinesProfileUrl: props.reportingLinesProfileUrl,
173
173
  onReportingLinesClick: props.onReportingLinesClick,
@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  import React, { Suspense } from 'react';
4
4
  import { GiveKudosLauncherLazy, KudosType } from '@atlaskit/give-kudos';
5
- import { fg } from '@atlaskit/platform-feature-flags';
6
5
  import { useAnalyticsEvents } from '@atlaskit/teams-app-internal-analytics';
7
6
  import filterActions from '../../internal/filterActions';
8
7
  import { CardWrapper } from '../../styled/UserTrigger';
@@ -50,11 +49,7 @@ class ProfileCardResourced extends React.PureComponent {
50
49
  hasError: false,
51
50
  data: null
52
51
  }, () => {
53
- const shouldHideReportingLines = fg('jira_ai_profilecard_hide_reportinglines') && this.props.hideReportingLines;
54
- const requests = Promise.all([this.props.resourceClient.getProfile(cloudId, userId, this.fireAnalytics), shouldHideReportingLines ? Promise.resolve({
55
- managers: [],
56
- reports: []
57
- }) : this.props.resourceClient.getReportingLines(userId), this.props.resourceClient.shouldShowGiveKudos(), this.props.resourceClient.getTeamCentralBaseUrl({
52
+ const requests = Promise.all([this.props.resourceClient.getProfile(cloudId, userId, this.fireAnalytics), this.props.resourceClient.getReportingLines(userId), this.props.resourceClient.shouldShowGiveKudos(), this.props.resourceClient.getTeamCentralBaseUrl({
58
53
  withOrgContext: true,
59
54
  withSiteContext: true
60
55
  })]);
@@ -129,8 +124,7 @@ class ProfileCardResourced extends React.PureComponent {
129
124
  onReportingLinesClick,
130
125
  cloudId,
131
126
  userId,
132
- addFlag,
133
- hideReportingLines
127
+ addFlag
134
128
  } = this.props;
135
129
  const isFetchingOrNotStartToFetchYet = isLoading === true || isLoading === undefined;
136
130
  if (isFetchingOrNotStartToFetchYet) {
@@ -158,8 +152,7 @@ class ProfileCardResourced extends React.PureComponent {
158
152
  ...data,
159
153
  isKudosEnabled,
160
154
  teamCentralBaseUrl,
161
- openKudosDrawer: this.openKudosDrawer,
162
- hideReportingLines: fg('jira_ai_profilecard_hide_reportinglines') && hideReportingLines
155
+ openKudosDrawer: this.openKudosDrawer
163
156
  };
164
157
  return /*#__PURE__*/React.createElement(CardWrapper, null, /*#__PURE__*/React.createElement(React.Fragment, null, isKudosEnabled && newProps.teamCentralBaseUrl && /*#__PURE__*/React.createElement(Suspense, {
165
158
  fallback: null
@@ -82,7 +82,6 @@ export default function ProfilecardTriggerNext({
82
82
  hideAgentMoreActions,
83
83
  hideAiDisclaimer,
84
84
  hideAgentConversationStarters,
85
- hideReportingLines,
86
85
  ariaHideProfileTrigger = false,
87
86
  isVisible: propsIsVisible,
88
87
  isRenderedInPortal,
@@ -201,11 +200,7 @@ export default function ProfilecardTriggerNext({
201
200
  setError(null);
202
201
  setData(null);
203
202
  try {
204
- const shouldHideReportingLines = fg('jira_ai_profilecard_hide_reportinglines') && hideReportingLines;
205
- const requests = Promise.all([resourceClient.getProfile(cloudId || '', userId, fireAnalytics), shouldHideReportingLines ? Promise.resolve({
206
- managers: [],
207
- reports: []
208
- }) : resourceClient.getReportingLines(userId), resourceClient.shouldShowGiveKudos(), resourceClient.getTeamCentralBaseUrl({
203
+ const requests = Promise.all([resourceClient.getProfile(cloudId || '', userId, fireAnalytics), resourceClient.getReportingLines(userId), resourceClient.shouldShowGiveKudos(), resourceClient.getTeamCentralBaseUrl({
209
204
  withOrgContext: true,
210
205
  withSiteContext: true
211
206
  })]);
@@ -214,7 +209,7 @@ export default function ProfilecardTriggerNext({
214
209
  } catch (err) {
215
210
  handleClientError(err);
216
211
  }
217
- }, [cloudId, fireAnalytics, isLoading, resourceClient, userId, handleClientSuccess, handleClientError, hideReportingLines]);
212
+ }, [cloudId, fireAnalytics, isLoading, resourceClient, userId, handleClientSuccess, handleClientError]);
218
213
  const showProfilecard = useCallback(() => {
219
214
  clearTimeout(hideTimer.current);
220
215
  clearTimeout(showTimer.current);
@@ -318,7 +313,6 @@ export default function ProfilecardTriggerNext({
318
313
  openKudosDrawer: openKudosDrawer,
319
314
  isTriggeredUsingKeyboard: isTriggeredUsingKeyboard,
320
315
  disabledAriaAttributes: disabledAriaAttributes,
321
- hideReportingLines: fg('jira_ai_profilecard_hide_reportinglines') && hideReportingLines,
322
316
  hideAgentConversationStarters: fg('jira_ai_hide_conversation_starters_profilecard') && hideAgentConversationStarters
323
317
  };
324
318
  const ssrPlaceholderProp = ssrPlaceholderId ? {
@@ -1,5 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
3
+ import { fg } from '@atlaskit/platform-feature-flags';
3
4
  import Popup from '@atlaskit/popup';
4
5
  import { layers } from '@atlaskit/theme/constants';
5
6
  import { getActionSubject, PACKAGE_META_DATA } from '../../util/analytics';
@@ -80,20 +81,38 @@ function ProfileCardTriggerInner({
80
81
  zIndex: layers.modal(),
81
82
  shouldFitContainer: false,
82
83
  trigger: triggerProps => {
83
- const {
84
- 'aria-expanded': _,
85
- 'aria-haspopup': __,
86
- ...restInnerProps
87
- } = triggerProps;
88
- return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
89
- ref: triggerProps.ref,
90
- hideProfilecard: hideProfilecard,
91
- showProfilecard: showProfilecard,
92
- children: children,
93
- ariaLabelledBy: ariaLabelledBy,
94
- trigger: trigger,
95
- "data-testid": testId
96
- }));
84
+ if (fg('fix_aria_attribute_violation_on_agent_card_trigger')) {
85
+ const {
86
+ 'aria-expanded': _,
87
+ 'aria-haspopup': __,
88
+ 'aria-controls': ___,
89
+ ...restInnerProps
90
+ } = triggerProps;
91
+ return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
92
+ ref: triggerProps.ref,
93
+ hideProfilecard: hideProfilecard,
94
+ showProfilecard: showProfilecard,
95
+ children: children,
96
+ ariaLabelledBy: ariaLabelledBy,
97
+ trigger: trigger,
98
+ "data-testid": testId
99
+ }));
100
+ } else {
101
+ const {
102
+ 'aria-expanded': _,
103
+ 'aria-haspopup': __,
104
+ ...restInnerProps
105
+ } = triggerProps;
106
+ return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
107
+ ref: triggerProps.ref,
108
+ hideProfilecard: hideProfilecard,
109
+ showProfilecard: showProfilecard,
110
+ children: children,
111
+ ariaLabelledBy: ariaLabelledBy,
112
+ trigger: trigger,
113
+ "data-testid": testId
114
+ }));
115
+ }
97
116
  },
98
117
  content: () => /*#__PURE__*/React.createElement("div", {
99
118
  onMouseEnter: onMouseEnter,
@@ -2,7 +2,7 @@ var _process$env$_PACKAGE, _process$env$_PACKAGE2;
2
2
  import { getPageTime } from './performance';
3
3
  export const PACKAGE_META_DATA = {
4
4
  packageName: (_process$env$_PACKAGE = "@atlaskit/profilecard") !== null && _process$env$_PACKAGE !== void 0 ? _process$env$_PACKAGE : '',
5
- packageVersion: (_process$env$_PACKAGE2 = "26.0.3") !== null && _process$env$_PACKAGE2 !== void 0 ? _process$env$_PACKAGE2 : ''
5
+ packageVersion: (_process$env$_PACKAGE2 = "26.1.1") !== null && _process$env$_PACKAGE2 !== void 0 ? _process$env$_PACKAGE2 : ''
6
6
  };
7
7
  const TEAM_SUBJECT = 'teamProfileCard';
8
8
  const USER_SUBJECT = 'profilecard';
@@ -19,7 +19,7 @@ const createEvent = (eventType, action, actionSubject, actionSubjectId, attribut
19
19
  actionSubjectId,
20
20
  attributes: {
21
21
  packageName: "@atlaskit/profilecard",
22
- packageVersion: "26.0.3",
22
+ packageVersion: "26.1.1",
23
23
  ...attributes,
24
24
  firedAt: Math.round(getPageTime())
25
25
  }
@@ -4,7 +4,7 @@ import { AGGQuery } from './graphqlUtils';
4
4
  var ORG_ID_FROM_CLOUD_ID_QUERY = "query OrgIdFromCloudId($cloudId: ID!) {\n\ttenantContexts(cloudIds: [$cloudId]) {\n\t\torgId\n\t}\n}";
5
5
  var addHeaders = function addHeaders(headers) {
6
6
  headers.append('atl-client-name', "@atlaskit/profilecard");
7
- headers.append('atl-client-version', "26.0.3");
7
+ headers.append('atl-client-version', "26.1.1");
8
8
  return headers;
9
9
  };
10
10
  export function getOrgIdForCloudIdFromAGG(_x, _x2) {
@@ -59,7 +59,7 @@ export var addHeaders = function addHeaders(headers) {
59
59
  headers.append('X-ExperimentalApi', 'teams-beta');
60
60
  headers.append('X-ExperimentalApi', 'team-members-beta');
61
61
  headers.append('atl-client-name', "@atlaskit/profilecard");
62
- headers.append('atl-client-version', "26.0.3");
62
+ headers.append('atl-client-version', "26.1.1");
63
63
  return headers;
64
64
  };
65
65
  export function getTeamFromAGG(_x, _x2, _x3) {
@@ -164,7 +164,7 @@ export var ProfileCardDetails = function ProfileCardDetails(props) {
164
164
  icon: "companyName"
165
165
  }, props.companyName), /*#__PURE__*/React.createElement(IconLabel, {
166
166
  icon: "location"
167
- }, props.location)), !(fg('jira_ai_profilecard_hide_reportinglines') && props.hideReportingLines) && /*#__PURE__*/React.createElement(ReportingLinesDetails, {
167
+ }, props.location)), /*#__PURE__*/React.createElement(ReportingLinesDetails, {
168
168
  reportingLines: props.reportingLines,
169
169
  reportingLinesProfileUrl: props.reportingLinesProfileUrl,
170
170
  onReportingLinesClick: props.onReportingLinesClick,
@@ -12,7 +12,6 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
12
12
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
13
13
  import React, { Suspense } from 'react';
14
14
  import { GiveKudosLauncherLazy, KudosType } from '@atlaskit/give-kudos';
15
- import { fg } from '@atlaskit/platform-feature-flags';
16
15
  import { useAnalyticsEvents } from '@atlaskit/teams-app-internal-analytics';
17
16
  import filterActions from '../../internal/filterActions';
18
17
  import { CardWrapper } from '../../styled/UserTrigger';
@@ -66,11 +65,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
66
65
  hasError: false,
67
66
  data: null
68
67
  }, function () {
69
- var shouldHideReportingLines = fg('jira_ai_profilecard_hide_reportinglines') && _this.props.hideReportingLines;
70
- var requests = Promise.all([_this.props.resourceClient.getProfile(cloudId, userId, _this.fireAnalytics), shouldHideReportingLines ? Promise.resolve({
71
- managers: [],
72
- reports: []
73
- }) : _this.props.resourceClient.getReportingLines(userId), _this.props.resourceClient.shouldShowGiveKudos(), _this.props.resourceClient.getTeamCentralBaseUrl({
68
+ var requests = Promise.all([_this.props.resourceClient.getProfile(cloudId, userId, _this.fireAnalytics), _this.props.resourceClient.getReportingLines(userId), _this.props.resourceClient.shouldShowGiveKudos(), _this.props.resourceClient.getTeamCentralBaseUrl({
74
69
  withOrgContext: true,
75
70
  withSiteContext: true
76
71
  })]);
@@ -166,8 +161,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
166
161
  onReportingLinesClick = _this$props4.onReportingLinesClick,
167
162
  cloudId = _this$props4.cloudId,
168
163
  userId = _this$props4.userId,
169
- addFlag = _this$props4.addFlag,
170
- hideReportingLines = _this$props4.hideReportingLines;
164
+ addFlag = _this$props4.addFlag;
171
165
  var isFetchingOrNotStartToFetchYet = isLoading === true || isLoading === undefined;
172
166
  if (isFetchingOrNotStartToFetchYet) {
173
167
  return /*#__PURE__*/React.createElement(CardWrapper, null, /*#__PURE__*/React.createElement(UserLoadingState, {
@@ -194,8 +188,7 @@ var ProfileCardResourced = /*#__PURE__*/function (_React$PureComponent) {
194
188
  }, data), {}, {
195
189
  isKudosEnabled: isKudosEnabled,
196
190
  teamCentralBaseUrl: teamCentralBaseUrl,
197
- openKudosDrawer: this.openKudosDrawer,
198
- hideReportingLines: fg('jira_ai_profilecard_hide_reportinglines') && hideReportingLines
191
+ openKudosDrawer: this.openKudosDrawer
199
192
  });
200
193
  return /*#__PURE__*/React.createElement(CardWrapper, null, /*#__PURE__*/React.createElement(React.Fragment, null, isKudosEnabled && newProps.teamCentralBaseUrl && /*#__PURE__*/React.createElement(Suspense, {
201
194
  fallback: null
@@ -94,7 +94,6 @@ export default function ProfilecardTriggerNext(_ref2) {
94
94
  hideAgentMoreActions = _ref2.hideAgentMoreActions,
95
95
  hideAiDisclaimer = _ref2.hideAiDisclaimer,
96
96
  hideAgentConversationStarters = _ref2.hideAgentConversationStarters,
97
- hideReportingLines = _ref2.hideReportingLines,
98
97
  _ref2$ariaHideProfile = _ref2.ariaHideProfileTrigger,
99
98
  ariaHideProfileTrigger = _ref2$ariaHideProfile === void 0 ? false : _ref2$ariaHideProfile,
100
99
  propsIsVisible = _ref2.isVisible,
@@ -235,7 +234,7 @@ export default function ProfilecardTriggerNext(_ref2) {
235
234
  setError(err);
236
235
  }, [setHasError, setIsLoading, setError]);
237
236
  var clientFetchProfile = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
238
- var shouldHideReportingLines, requests, responses, _t;
237
+ var requests, responses, _t;
239
238
  return _regeneratorRuntime.wrap(function (_context) {
240
239
  while (1) switch (_context.prev = _context.next) {
241
240
  case 0:
@@ -250,11 +249,7 @@ export default function ProfilecardTriggerNext(_ref2) {
250
249
  setError(null);
251
250
  setData(null);
252
251
  _context.prev = 2;
253
- shouldHideReportingLines = fg('jira_ai_profilecard_hide_reportinglines') && hideReportingLines;
254
- requests = Promise.all([resourceClient.getProfile(cloudId || '', userId, fireAnalytics), shouldHideReportingLines ? Promise.resolve({
255
- managers: [],
256
- reports: []
257
- }) : resourceClient.getReportingLines(userId), resourceClient.shouldShowGiveKudos(), resourceClient.getTeamCentralBaseUrl({
252
+ requests = Promise.all([resourceClient.getProfile(cloudId || '', userId, fireAnalytics), resourceClient.getReportingLines(userId), resourceClient.shouldShowGiveKudos(), resourceClient.getTeamCentralBaseUrl({
258
253
  withOrgContext: true,
259
254
  withSiteContext: true
260
255
  })]);
@@ -274,7 +269,7 @@ export default function ProfilecardTriggerNext(_ref2) {
274
269
  return _context.stop();
275
270
  }
276
271
  }, _callee, null, [[2, 4]]);
277
- })), [cloudId, fireAnalytics, isLoading, resourceClient, userId, handleClientSuccess, handleClientError, hideReportingLines]);
272
+ })), [cloudId, fireAnalytics, isLoading, resourceClient, userId, handleClientSuccess, handleClientError]);
278
273
  var showProfilecard = useCallback(function () {
279
274
  clearTimeout(hideTimer.current);
280
275
  clearTimeout(showTimer.current);
@@ -379,7 +374,6 @@ export default function ProfilecardTriggerNext(_ref2) {
379
374
  openKudosDrawer: openKudosDrawer,
380
375
  isTriggeredUsingKeyboard: isTriggeredUsingKeyboard,
381
376
  disabledAriaAttributes: disabledAriaAttributes,
382
- hideReportingLines: fg('jira_ai_profilecard_hide_reportinglines') && hideReportingLines,
383
377
  hideAgentConversationStarters: fg('jira_ai_hide_conversation_starters_profilecard') && hideAgentConversationStarters
384
378
  });
385
379
  var ssrPlaceholderProp = ssrPlaceholderId ? {
@@ -4,11 +4,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
4
4
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
5
5
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
6
6
  var _excluded = ["trigger", "ariaLabelledBy", "children", "renderProfileCard", "fetchProfile", "disabledAriaAttributes", "profileCardType", "testId", "fireAnalytics"],
7
- _excluded2 = ["aria-expanded", "aria-haspopup"];
7
+ _excluded2 = ["aria-expanded", "aria-haspopup", "aria-controls"],
8
+ _excluded3 = ["aria-expanded", "aria-haspopup"];
8
9
  import _regeneratorRuntime from "@babel/runtime/regenerator";
9
10
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
10
11
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
11
12
  import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
12
14
  import Popup from '@atlaskit/popup';
13
15
  import { layers } from '@atlaskit/theme/constants';
14
16
  import { getActionSubject, PACKAGE_META_DATA } from '../../util/analytics';
@@ -100,18 +102,34 @@ function ProfileCardTriggerInner(_ref, ref) {
100
102
  zIndex: layers.modal(),
101
103
  shouldFitContainer: false,
102
104
  trigger: function trigger(triggerProps) {
103
- var _ = triggerProps['aria-expanded'],
104
- __ = triggerProps['aria-haspopup'],
105
- restInnerProps = _objectWithoutProperties(triggerProps, _excluded2);
106
- return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
107
- ref: triggerProps.ref,
108
- hideProfilecard: hideProfilecard,
109
- showProfilecard: showProfilecard,
110
- children: children,
111
- ariaLabelledBy: ariaLabelledBy,
112
- trigger: _trigger,
113
- "data-testid": testId
114
- }));
105
+ if (fg('fix_aria_attribute_violation_on_agent_card_trigger')) {
106
+ var _ = triggerProps['aria-expanded'],
107
+ __ = triggerProps['aria-haspopup'],
108
+ ___ = triggerProps['aria-controls'],
109
+ restInnerProps = _objectWithoutProperties(triggerProps, _excluded2);
110
+ return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, disabledAriaAttributes ? restInnerProps : triggerProps, {
111
+ ref: triggerProps.ref,
112
+ hideProfilecard: hideProfilecard,
113
+ showProfilecard: showProfilecard,
114
+ children: children,
115
+ ariaLabelledBy: ariaLabelledBy,
116
+ trigger: _trigger,
117
+ "data-testid": testId
118
+ }));
119
+ } else {
120
+ var _2 = triggerProps['aria-expanded'],
121
+ _3 = triggerProps['aria-haspopup'],
122
+ _restInnerProps = _objectWithoutProperties(triggerProps, _excluded3);
123
+ return /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, disabledAriaAttributes ? _restInnerProps : triggerProps, {
124
+ ref: triggerProps.ref,
125
+ hideProfilecard: hideProfilecard,
126
+ showProfilecard: showProfilecard,
127
+ children: children,
128
+ ariaLabelledBy: ariaLabelledBy,
129
+ trigger: _trigger,
130
+ "data-testid": testId
131
+ }));
132
+ }
115
133
  },
116
134
  content: function content() {
117
135
  return /*#__PURE__*/React.createElement("div", {
@@ -5,7 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
5
5
  import { getPageTime } from './performance';
6
6
  export var PACKAGE_META_DATA = {
7
7
  packageName: (_process$env$_PACKAGE = "@atlaskit/profilecard") !== null && _process$env$_PACKAGE !== void 0 ? _process$env$_PACKAGE : '',
8
- packageVersion: (_process$env$_PACKAGE2 = "26.0.3") !== null && _process$env$_PACKAGE2 !== void 0 ? _process$env$_PACKAGE2 : ''
8
+ packageVersion: (_process$env$_PACKAGE2 = "26.1.1") !== null && _process$env$_PACKAGE2 !== void 0 ? _process$env$_PACKAGE2 : ''
9
9
  };
10
10
  var TEAM_SUBJECT = 'teamProfileCard';
11
11
  var USER_SUBJECT = 'profilecard';
@@ -24,7 +24,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
24
24
  actionSubjectId: actionSubjectId,
25
25
  attributes: _objectSpread(_objectSpread({
26
26
  packageName: "@atlaskit/profilecard",
27
- packageVersion: "26.0.3"
27
+ packageVersion: "26.1.1"
28
28
  }, attributes), {}, {
29
29
  firedAt: Math.round(getPageTime())
30
30
  })
@@ -1,3 +1,3 @@
1
1
  import React from 'react';
2
2
  import { type ProfileCardTriggerProps } from '../../types';
3
- export default function ProfilecardTriggerNext({ autoFocus, trigger, userId, cloudId, resourceClient, actions, position, children, testId, addFlag, onReportingLinesClick, ariaLabel, ariaLabelledBy, prepopulatedData, disabledAriaAttributes, onVisibilityChange, offset, viewingUserId, product, agentActions, hideAgentMoreActions, hideAiDisclaimer, hideAgentConversationStarters, hideReportingLines, ariaHideProfileTrigger, isVisible: propsIsVisible, isRenderedInPortal, ssrPlaceholderId, showDelay: customShowDelay, hideDelay: customHideDelay, }: ProfileCardTriggerProps): React.JSX.Element;
3
+ export default function ProfilecardTriggerNext({ autoFocus, trigger, userId, cloudId, resourceClient, actions, position, children, testId, addFlag, onReportingLinesClick, ariaLabel, ariaLabelledBy, prepopulatedData, disabledAriaAttributes, onVisibilityChange, offset, viewingUserId, product, agentActions, hideAgentMoreActions, hideAiDisclaimer, hideAgentConversationStarters, ariaHideProfileTrigger, isVisible: propsIsVisible, isRenderedInPortal, ssrPlaceholderId, showDelay: customShowDelay, hideDelay: customHideDelay, }: ProfileCardTriggerProps): React.JSX.Element;
@@ -146,8 +146,6 @@ export interface ProfileCardResourcedProps {
146
146
  trigger?: TriggerType;
147
147
  children?: React.ReactNode;
148
148
  addFlag?: (flag: any) => void;
149
- /** When true (and feature-gated), skip fetching and hide the reporting lines section */
150
- hideReportingLines?: boolean;
151
149
  }
152
150
  export interface ProfileCardResourcedState {
153
151
  visible?: boolean;
@@ -217,11 +215,6 @@ export interface ProfileCardTriggerProps {
217
215
  hideAiDisclaimer?: boolean;
218
216
  /** Hide the conversation starters. Defaults to false (conversation starters are shown by default). */
219
217
  hideAgentConversationStarters?: boolean;
220
- /**
221
- * When true, skip fetching Townsquare's reporting lines data and hide the reporting lines section
222
- * currentky only working when the flag jira_ai_profilecard_hide_reportinglines is enabled
223
- * */
224
- hideReportingLines?: boolean;
225
218
  }
226
219
  export interface ProfileCardTriggerState {
227
220
  visible?: boolean;
@@ -481,8 +474,6 @@ export interface ProfilecardProps {
481
474
  isTriggeredUsingKeyboard?: boolean;
482
475
  disabledAriaAttributes?: boolean;
483
476
  agentActions?: AgentActionsType;
484
- /** When true (and feature-gated), hide the reporting lines section */
485
- hideReportingLines?: boolean;
486
477
  /** When true (and feature-gated), hide the agent conversation starters section */
487
478
  hideAgentConversationStarters?: boolean;
488
479
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/profilecard",
3
- "version": "26.1.0",
3
+ "version": "26.1.1",
4
4
  "description": "A React component to display a card with user information.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -67,7 +67,7 @@
67
67
  "@atlaskit/teams-avatar": "^3.0.0",
68
68
  "@atlaskit/teams-public": "^2.0.0",
69
69
  "@atlaskit/theme": "^26.0.0",
70
- "@atlaskit/tmp-editor-statsig": "^106.0.0",
70
+ "@atlaskit/tmp-editor-statsig": "^107.1.0",
71
71
  "@atlaskit/tokens": "^14.0.0",
72
72
  "@atlaskit/tooltip": "^23.0.0",
73
73
  "@atlassian/studio-entry-link": "^1.1.0",
@@ -145,9 +145,6 @@
145
145
  "cover-header-image-team-profilecard": {
146
146
  "type": "boolean"
147
147
  },
148
- "jira_ai_profilecard_hide_reportinglines": {
149
- "type": "boolean"
150
- },
151
148
  "enable_profilecard_text_truncation_tooltip": {
152
149
  "type": "boolean"
153
150
  },
@@ -186,6 +183,9 @@
186
183
  },
187
184
  "teams_app_react_19_upgrade": {
188
185
  "type": "boolean"
186
+ },
187
+ "fix_aria_attribute_violation_on_agent_card_trigger": {
188
+ "type": "boolean"
189
189
  }
190
190
  },
191
191
  "sideEffects": [