@atlaskit/link-datasource 1.22.7 → 1.22.8

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.
@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.ProviderAuthRequired = void 0;
9
9
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
10
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
  var _react2 = require("@emotion/react");
14
14
  var _reactIntlNext = require("react-intl-next");
@@ -32,13 +32,16 @@ var ProviderAuthRequired = exports.ProviderAuthRequired = function ProviderAuthR
32
32
  auth = _ref$auth === void 0 ? [] : _ref$auth,
33
33
  onAuthSuccess = _ref.onAuthSuccess,
34
34
  onAuthError = _ref.onAuthError,
35
- extensionKey = _ref.extensionKey;
35
+ extensionKey = _ref.extensionKey,
36
+ providerName = _ref.providerName;
36
37
  var _useIntl = (0, _reactIntlNext.useIntl)(),
37
38
  formatMessage = _useIntl.formatMessage;
38
39
  var _useErrorLogger = (0, _useErrorLogger2.default)(),
39
40
  captureError = _useErrorLogger.captureError;
40
41
  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
41
42
  fireEvent = _useDatasourceAnalyti.fireEvent;
43
+ var _auth = (0, _slicedToArray2.default)(auth, 1),
44
+ authInfo = _auth[0];
42
45
  (0, _react.useEffect)(function () {
43
46
  fireEvent('ui.error.shown', {
44
47
  reason: 'access'
@@ -46,25 +49,23 @@ var ProviderAuthRequired = exports.ProviderAuthRequired = function ProviderAuthR
46
49
  }, [fireEvent]);
47
50
  var onAuthRequest = /*#__PURE__*/function () {
48
51
  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
49
- var _auth, authInfo;
50
52
  return _regenerator.default.wrap(function _callee$(_context) {
51
53
  while (1) switch (_context.prev = _context.next) {
52
54
  case 0:
53
- _auth = (0, _slicedToArray2.default)(auth, 1), authInfo = _auth[0];
54
- _context.prev = 1;
55
- _context.next = 4;
55
+ _context.prev = 0;
56
+ _context.next = 3;
56
57
  return (0, _outboundAuthFlowClient.auth)(authInfo.url);
57
- case 4:
58
+ case 3:
58
59
  fireEvent('operational.provider.authSuccess', {
59
60
  extensionKey: extensionKey,
60
61
  experience: 'datasource'
61
62
  });
62
63
  onAuthSuccess === null || onAuthSuccess === void 0 || onAuthSuccess();
63
- _context.next = 13;
64
+ _context.next = 12;
64
65
  break;
65
- case 8:
66
- _context.prev = 8;
67
- _context.t0 = _context["catch"](1);
66
+ case 7:
67
+ _context.prev = 7;
68
+ _context.t0 = _context["catch"](0);
68
69
  fireEvent('operational.provider.authFailure', {
69
70
  reason: _context.t0 instanceof _outboundAuthFlowClient.AuthError && _context.t0.type ? _context.t0.type : null,
70
71
  extensionKey: extensionKey,
@@ -72,18 +73,20 @@ var ProviderAuthRequired = exports.ProviderAuthRequired = function ProviderAuthR
72
73
  });
73
74
  captureError('ProviderOnAuthRequest', _context.t0);
74
75
  onAuthError === null || onAuthError === void 0 || onAuthError();
75
- case 13:
76
+ case 12:
76
77
  case "end":
77
78
  return _context.stop();
78
79
  }
79
- }, _callee, null, [[1, 8]]);
80
+ }, _callee, null, [[0, 7]]);
80
81
  }));
81
82
  return function onAuthRequest() {
82
83
  return _ref2.apply(this, arguments);
83
84
  };
84
85
  }();
85
86
  var renderAuthDescription = function renderAuthDescription() {
86
- return (0, _react2.jsx)(_react.default.Fragment, null, formatMessage(_messages.loadingErrorMessages.authScreenDescriptionText), ' ', (0, _react2.jsx)("a", {
87
+ return (0, _react2.jsx)(_react.default.Fragment, null, formatMessage(_messages.loadingErrorMessages.authScreenDescriptionText, {
88
+ providerName: providerName
89
+ }), ' ', (0, _react2.jsx)("a", {
87
90
  href: learnMoreAboutSmartLinksUrl,
88
91
  target: "_blank",
89
92
  rel: "noreferrer noopener"
@@ -98,7 +101,9 @@ var ProviderAuthRequired = exports.ProviderAuthRequired = function ProviderAuthR
98
101
  };
99
102
  return (0, _react2.jsx)(_emptyState.default, {
100
103
  testId: "datasource--access-required-with-auth",
101
- header: formatMessage(_messages.loadingErrorMessages.authScreenHeaderText),
104
+ header: formatMessage(_messages.loadingErrorMessages.authScreenHeaderText, {
105
+ providerName: providerName
106
+ }),
102
107
  description: renderAuthDescription(),
103
108
  renderImage: _providerAuthRequiredSvg.ProviderAuthRequiredSVG,
104
109
  primaryAction: renderAuthConnectButton()
@@ -55,6 +55,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
55
55
  loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
56
56
  _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
57
57
  extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
58
+ providerName = _useDatasourceTableSt.providerName,
58
59
  destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes,
59
60
  authDetails = _useDatasourceTableSt.authDetails;
60
61
  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
@@ -135,6 +136,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
135
136
  return authDetails !== null && authDetails !== void 0 && authDetails.length && authDetails.length > 0 ? (0, _react2.jsx)(_providerAuthRequired.ProviderAuthRequired, {
136
137
  auth: authDetails,
137
138
  extensionKey: extensionKey,
139
+ providerName: providerName,
138
140
  onAuthSuccess: forcedReset,
139
141
  onAuthError: forcedReset
140
142
  }) : (0, _react2.jsx)(_accessRequired.AccessRequired, {
@@ -32,6 +32,7 @@ export const useDatasourceTableState = ({
32
32
  const [shouldForceRequest, setShouldForceRequest] = useState(false);
33
33
  const [destinationObjectTypes, setDestinationObjectTypes] = useState([]);
34
34
  const [extensionKey, setExtensionKey] = useState();
35
+ const [providerName, setProviderName] = useState(undefined);
35
36
  const {
36
37
  getDatasourceData,
37
38
  getDatasourceDetails
@@ -132,7 +133,8 @@ export const useDatasourceTableState = ({
132
133
  access,
133
134
  destinationObjectTypes,
134
135
  extensionKey,
135
- auth
136
+ auth,
137
+ providerName
136
138
  },
137
139
  data: {
138
140
  items,
@@ -142,6 +144,7 @@ export const useDatasourceTableState = ({
142
144
  }
143
145
  } = await getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
144
146
  setExtensionKey(extensionKey);
147
+ setProviderName(providerName);
145
148
  if (access === 'unauthorized' || access === 'forbidden') {
146
149
  setStatus(access);
147
150
  setAuthDetails(auth || initialEmptyArray);
@@ -256,6 +259,7 @@ export const useDatasourceTableState = ({
256
259
  defaultVisibleColumnKeys,
257
260
  totalCount,
258
261
  extensionKey,
262
+ providerName,
259
263
  destinationObjectTypes,
260
264
  authDetails
261
265
  };
@@ -57,12 +57,12 @@ export const loadingErrorMessages = defineMessages({
57
57
  },
58
58
  authScreenHeaderText: {
59
59
  id: 'linkDataSource.datasource.table.authScreenHeaderText',
60
- defaultMessage: 'Connect your account',
60
+ defaultMessage: 'Connect your {providerName} account',
61
61
  description: 'Header text to be displayed in the auth screen UI.'
62
62
  },
63
63
  authScreenDescriptionText: {
64
64
  id: 'linkDataSource.datasource.table.authScreenDescriptionText',
65
- defaultMessage: 'Connect your account to collaborate on work across Atlassian products.',
65
+ defaultMessage: 'Connect your {providerName} account to collaborate on work across Atlassian products.',
66
66
  description: 'Description text to be displayed in the auth screen UI.'
67
67
  },
68
68
  learnMoreAboutSmartLinks: {