@atlaskit/link-datasource 1.22.6 → 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.
Files changed (27) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/hooks/useDatasourceTableState.js +19 -11
  3. package/dist/cjs/ui/common/error-state/messages.js +2 -2
  4. package/dist/cjs/ui/common/error-state/provider-auth-required-svg.js +148 -430
  5. package/dist/cjs/ui/common/error-state/provider-auth-required.js +20 -15
  6. package/dist/cjs/ui/datasource-table-view/datasourceTableView.js +2 -0
  7. package/dist/cjs/ui/issue-like-table/draggable-table-heading.js +15 -15
  8. package/dist/cjs/ui/issue-like-table/index.js +4 -4
  9. package/dist/es2019/hooks/useDatasourceTableState.js +5 -1
  10. package/dist/es2019/ui/common/error-state/messages.js +2 -2
  11. package/dist/es2019/ui/common/error-state/provider-auth-required-svg.js +148 -430
  12. package/dist/es2019/ui/common/error-state/provider-auth-required.js +9 -4
  13. package/dist/es2019/ui/datasource-table-view/datasourceTableView.js +2 -0
  14. package/dist/es2019/ui/issue-like-table/draggable-table-heading.js +11 -11
  15. package/dist/es2019/ui/issue-like-table/index.js +3 -3
  16. package/dist/esm/hooks/useDatasourceTableState.js +19 -11
  17. package/dist/esm/ui/common/error-state/messages.js +2 -2
  18. package/dist/esm/ui/common/error-state/provider-auth-required-svg.js +148 -430
  19. package/dist/esm/ui/common/error-state/provider-auth-required.js +20 -15
  20. package/dist/esm/ui/datasource-table-view/datasourceTableView.js +2 -0
  21. package/dist/esm/ui/issue-like-table/draggable-table-heading.js +11 -11
  22. package/dist/esm/ui/issue-like-table/index.js +3 -3
  23. package/dist/types/hooks/useDatasourceTableState.d.ts +2 -0
  24. package/dist/types/ui/common/error-state/provider-auth-required.d.ts +2 -1
  25. package/dist/types-ts4.5/hooks/useDatasourceTableState.d.ts +2 -0
  26. package/dist/types-ts4.5/ui/common/error-state/provider-auth-required.d.ts +2 -1
  27. package/package.json +7 -7
@@ -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, {
@@ -11,14 +11,14 @@ var _react = require("react");
11
11
  var _react2 = require("@emotion/react");
12
12
  var _reactDom = _interopRequireDefault(require("react-dom"));
13
13
  var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
14
- var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
15
- var _boxWithoutTerminal = require("@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal");
16
- var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
17
- var _cancelUnhandled = require("@atlaskit/pragmatic-drag-and-drop/addon/cancel-unhandled");
18
- var _combine = require("@atlaskit/pragmatic-drag-and-drop/util/combine");
19
- var _disableNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/util/disable-native-drag-preview");
20
- var _offsetFromPointer = require("@atlaskit/pragmatic-drag-and-drop/util/offset-from-pointer");
21
- var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview");
14
+ var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge");
15
+ var _boxWithoutTerminal = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box-without-terminal");
16
+ var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
17
+ var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
18
+ var _disableNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/element/disable-native-drag-preview");
19
+ var _pointerOutsideOfPreview = require("@atlaskit/pragmatic-drag-and-drop/element/pointer-outside-of-preview");
20
+ var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview");
21
+ var _preventUnhandled = require("@atlaskit/pragmatic-drag-and-drop/prevent-unhandled");
22
22
  var _styled = require("./styled");
23
23
  var _utils = require("./utils");
24
24
  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; }
@@ -104,7 +104,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
104
104
  (0, _react.useEffect)(function () {
105
105
  var cell = mainHeaderCellRef.current;
106
106
  (0, _tinyInvariant.default)(cell);
107
- return (0, _combine.combine)((0, _element.draggable)({
107
+ return (0, _combine.combine)((0, _adapter.draggable)({
108
108
  element: cell,
109
109
  getInitialData: function getInitialData() {
110
110
  return {
@@ -117,7 +117,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
117
117
  onGenerateDragPreview: function onGenerateDragPreview(_ref2) {
118
118
  var nativeSetDragImage = _ref2.nativeSetDragImage;
119
119
  (0, _setCustomNativeDragPreview.setCustomNativeDragPreview)({
120
- getOffset: (0, _offsetFromPointer.offsetFromPointer)({
120
+ getOffset: (0, _pointerOutsideOfPreview.pointerOutsideOfPreview)({
121
121
  x: '18px',
122
122
  y: '18px'
123
123
  }),
@@ -152,7 +152,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
152
152
  (0, _react.useEffect)(function () {
153
153
  var dropTarget = dropTargetRef.current;
154
154
  (0, _tinyInvariant.default)(dropTarget);
155
- return (0, _element.dropTargetForElements)({
155
+ return (0, _adapter.dropTargetForElements)({
156
156
  element: dropTarget,
157
157
  getIsSticky: function getIsSticky() {
158
158
  return true;
@@ -189,7 +189,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
189
189
 
190
190
  // During dragging anywhere we want to remove `pointerEvents: 'none'` from all the drop targets
191
191
  (0, _react.useEffect)(function () {
192
- return (0, _element.monitorForElements)({
192
+ return (0, _adapter.monitorForElements)({
193
193
  canMonitor: function canMonitor(_ref5) {
194
194
  var source = _ref5.source;
195
195
  return source.data.type === 'table-header' && source.data.tableId === tableId;
@@ -215,7 +215,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
215
215
  (0, _tinyInvariant.default)(resizeHandle);
216
216
  var mainHeaderCell = mainHeaderCellRef.current;
217
217
  (0, _tinyInvariant.default)(mainHeaderCell);
218
- return (0, _element.draggable)({
218
+ return (0, _adapter.draggable)({
219
219
  element: resizeHandle,
220
220
  getInitialData: function getInitialData() {
221
221
  // metadata related to currently dragging item (can be read by drop events etc)
@@ -234,7 +234,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
234
234
  nativeSetDragImage: nativeSetDragImage
235
235
  });
236
236
  // Block drag operations outside `@atlaskit/pragmatic-drag-and-drop`
237
- _cancelUnhandled.cancelUnhandled.start();
237
+ _preventUnhandled.preventUnhandled.start();
238
238
  setState({
239
239
  type: 'resizing',
240
240
  initialWidth: width
@@ -253,7 +253,7 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
253
253
  mainHeaderCell.style.setProperty('width', "".concat(proposedWidth, "px"));
254
254
  },
255
255
  onDrop: function onDrop() {
256
- _cancelUnhandled.cancelUnhandled.stop();
256
+ _preventUnhandled.preventUnhandled.stop();
257
257
  setState(idleState);
258
258
  if (onWidthChange) {
259
259
  var cssWidth = +mainHeaderCell.style.getPropertyValue('width').slice(0, -2);
@@ -19,11 +19,11 @@ var _reactIntlNext = require("react-intl-next");
19
19
  var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
20
20
  var _heading = _interopRequireDefault(require("@atlaskit/heading"));
21
21
  var _linkingCommon = require("@atlaskit/linking-common");
22
- var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
22
+ var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge");
23
23
  var _reorderWithEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/util/reorder-with-edge");
24
24
  var _pragmaticDragAndDropReactBeautifulDndAutoscroll = require("@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll");
25
- var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
26
- var _combine = require("@atlaskit/pragmatic-drag-and-drop/util/combine");
25
+ var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
26
+ var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
27
27
  var _primitives = require("@atlaskit/primitives");
28
28
  var _colors = require("@atlaskit/theme/colors");
29
29
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -326,7 +326,7 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
326
326
  if (!onVisibleColumnKeysChange || !hasData) {
327
327
  return;
328
328
  }
329
- return (0, _combine.combine)((0, _element.monitorForElements)({
329
+ return (0, _combine.combine)((0, _adapter.monitorForElements)({
330
330
  onDragStart: function onDragStart(_ref8) {
331
331
  var location = _ref8.location,
332
332
  source = _ref8.source;
@@ -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: {