@atlaskit/media-card 78.18.2 → 78.18.3
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 +9 -0
- package/dist/cjs/card/card.js +1 -1
- package/dist/cjs/card/fileCard.js +39 -35
- package/dist/cjs/card/media-card-analytics-error-boundary.js +1 -1
- package/dist/cjs/errors.js +0 -5
- package/dist/cjs/inline/loader.js +1 -1
- package/dist/cjs/inline/mediaInlineCard.js +5 -3
- package/dist/cjs/inline/mediaInlineCardAnalytics.js +5 -5
- package/dist/cjs/utils/analytics/analytics.js +15 -31
- package/dist/cjs/utils/ufoExperiences.js +1 -1
- package/dist/es2019/card/card.js +1 -1
- package/dist/es2019/card/fileCard.js +10 -11
- package/dist/es2019/card/media-card-analytics-error-boundary.js +1 -1
- package/dist/es2019/errors.js +0 -4
- package/dist/es2019/inline/loader.js +1 -1
- package/dist/es2019/inline/mediaInlineCard.js +6 -4
- package/dist/es2019/inline/mediaInlineCardAnalytics.js +5 -5
- package/dist/es2019/utils/analytics/analytics.js +24 -32
- package/dist/es2019/utils/ufoExperiences.js +1 -1
- package/dist/esm/card/card.js +1 -1
- package/dist/esm/card/fileCard.js +42 -38
- package/dist/esm/card/media-card-analytics-error-boundary.js +1 -1
- package/dist/esm/errors.js +0 -4
- package/dist/esm/inline/loader.js +1 -1
- package/dist/esm/inline/mediaInlineCard.js +6 -4
- package/dist/esm/inline/mediaInlineCardAnalytics.js +5 -5
- package/dist/esm/utils/analytics/analytics.js +16 -32
- package/dist/esm/utils/ufoExperiences.js +1 -1
- package/dist/types/errors.d.ts +0 -1
- package/dist/types/inline/mediaInlineCardAnalytics.d.ts +2 -2
- package/dist/types-ts4.5/errors.d.ts +0 -1
- package/dist/types-ts4.5/inline/mediaInlineCardAnalytics.d.ts +2 -2
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/media-card
|
|
2
2
|
|
|
3
|
+
## 78.18.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#102527](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102527)
|
|
8
|
+
[`a90d34cd14faf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a90d34cd14faf) -
|
|
9
|
+
Updated ErrorFileState deserialisation and error logging
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 78.18.2
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
package/dist/cjs/card/card.js
CHANGED
|
@@ -21,7 +21,7 @@ var _excluded = ["identifier"];
|
|
|
21
21
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
22
22
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
23
23
|
var packageName = "@atlaskit/media-card";
|
|
24
|
-
var packageVersion = "78.18.
|
|
24
|
+
var packageVersion = "78.18.3";
|
|
25
25
|
var CardBase = exports.CardBase = function CardBase(_ref) {
|
|
26
26
|
var identifier = _ref.identifier,
|
|
27
27
|
otherProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
@@ -87,7 +87,10 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
87
87
|
includeHashForDuplicateFiles = _ref.includeHashForDuplicateFiles;
|
|
88
88
|
var _useIntl = (0, _reactIntlNext.useIntl)(),
|
|
89
89
|
formatMessage = _useIntl.formatMessage;
|
|
90
|
-
var
|
|
90
|
+
var _useState = (0, _react.useState)(false),
|
|
91
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
92
|
+
isAbuseModalOpen = _useState2[0],
|
|
93
|
+
setIsAbuseModalOpen = _useState2[1];
|
|
91
94
|
var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
|
|
92
95
|
createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
|
|
93
96
|
//----------------------------------------------------------------//
|
|
@@ -95,10 +98,10 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
95
98
|
//----------------------------------------------------------------//
|
|
96
99
|
|
|
97
100
|
var mediaClient = (0, _mediaClientReact.useMediaClient)();
|
|
98
|
-
var
|
|
99
|
-
|
|
100
|
-
cardElement =
|
|
101
|
-
setCardElement =
|
|
101
|
+
var _useState3 = (0, _react.useState)(null),
|
|
102
|
+
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
103
|
+
cardElement = _useState4[0],
|
|
104
|
+
setCardElement = _useState4[1];
|
|
102
105
|
var cardDimensions = dimensions || (0, _cardDimensions.getDefaultCardDimensions)(appearance);
|
|
103
106
|
|
|
104
107
|
// Calculate the preview dimensions if card dimensions are "percentage" based
|
|
@@ -112,10 +115,10 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
112
115
|
})
|
|
113
116
|
);
|
|
114
117
|
}, [cardDimensions, cardElement]);
|
|
115
|
-
var
|
|
116
|
-
|
|
117
|
-
isCardVisible =
|
|
118
|
-
setIsCardVisible =
|
|
118
|
+
var _useState5 = (0, _react.useState)(!isLazy),
|
|
119
|
+
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
120
|
+
isCardVisible = _useState6[0],
|
|
121
|
+
setIsCardVisible = _useState6[1];
|
|
119
122
|
var _useFileState = (0, _mediaClientReact.useFileState)(identifier.id, {
|
|
120
123
|
skipRemote: !isCardVisible,
|
|
121
124
|
collectionName: identifier.collectionName,
|
|
@@ -156,22 +159,22 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
156
159
|
traceId: (0, _mediaCommon.getRandomHex)(8)
|
|
157
160
|
};
|
|
158
161
|
}, []);
|
|
159
|
-
var
|
|
160
|
-
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
161
|
-
status = _useState6[0],
|
|
162
|
-
setStatus = _useState6[1];
|
|
163
|
-
var _useState7 = (0, _react.useState)(false),
|
|
162
|
+
var _useState7 = (0, _react.useState)('loading'),
|
|
164
163
|
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
|
|
165
|
-
|
|
166
|
-
|
|
164
|
+
status = _useState8[0],
|
|
165
|
+
setStatus = _useState8[1];
|
|
167
166
|
var _useState9 = (0, _react.useState)(false),
|
|
168
167
|
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
|
|
169
|
-
|
|
170
|
-
|
|
168
|
+
isPlayingFile = _useState10[0],
|
|
169
|
+
setIsPlayingFile = _useState10[1];
|
|
171
170
|
var _useState11 = (0, _react.useState)(false),
|
|
172
171
|
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
|
|
173
|
-
|
|
174
|
-
|
|
172
|
+
shouldAutoplay = _useState12[0],
|
|
173
|
+
setShouldAutoplay = _useState12[1];
|
|
174
|
+
var _useState13 = (0, _react.useState)(false),
|
|
175
|
+
_useState14 = (0, _slicedToArray2.default)(_useState13, 2),
|
|
176
|
+
previewDidRender = _useState14[0],
|
|
177
|
+
setPreviewDidRender = _useState14[1];
|
|
175
178
|
var mediaBlobUrlAttrs = (0, _react.useMemo)(function () {
|
|
176
179
|
var id = identifier.id,
|
|
177
180
|
collection = identifier.collectionName;
|
|
@@ -209,18 +212,18 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
209
212
|
onImageLoadBase = _useFilePreview.onImageLoad,
|
|
210
213
|
getSsrScriptProps = _useFilePreview.getSsrScriptProps,
|
|
211
214
|
copyNodeRef = _useFilePreview.copyNodeRef;
|
|
212
|
-
var
|
|
213
|
-
|
|
214
|
-
error =
|
|
215
|
-
setError =
|
|
215
|
+
var _useState15 = (0, _react.useState)(),
|
|
216
|
+
_useState16 = (0, _slicedToArray2.default)(_useState15, 2),
|
|
217
|
+
error = _useState16[0],
|
|
218
|
+
setError = _useState16[1];
|
|
216
219
|
|
|
217
220
|
// CXP-2723 TODO: TEMPORARY VARIABLES
|
|
218
221
|
var finalError = error || (previewError && previewError.primaryReason !== 'failed-processing' && (fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.mimeType) !== 'image/svg+xml' ? previewError : undefined);
|
|
219
222
|
var finalStatus = finalError ? 'error' : status === 'failed-processing' && (fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.mimeType) === 'image/svg+xml' ? 'loading-preview' : status;
|
|
220
|
-
var
|
|
221
|
-
|
|
222
|
-
mediaViewerSelectedItem =
|
|
223
|
-
setMediaViewerSelectedItem =
|
|
223
|
+
var _useState17 = (0, _react.useState)(null),
|
|
224
|
+
_useState18 = (0, _slicedToArray2.default)(_useState17, 2),
|
|
225
|
+
mediaViewerSelectedItem = _useState18[0],
|
|
226
|
+
setMediaViewerSelectedItem = _useState18[1];
|
|
224
227
|
var uploadProgressRef = (0, _react.useRef)();
|
|
225
228
|
var metadata = (0, _react.useMemo)(function () {
|
|
226
229
|
var getProcessingStatusFromFileState = function getProcessingStatusFromFileState(status) {
|
|
@@ -285,7 +288,6 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
285
288
|
if (finalStatus === 'failed-processing' || shouldEnableDownloadButton) {
|
|
286
289
|
var handler = /*#__PURE__*/function () {
|
|
287
290
|
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
|
288
|
-
var _openModalRef$current;
|
|
289
291
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
290
292
|
while (1) switch (_context2.prev = _context2.next) {
|
|
291
293
|
case 0:
|
|
@@ -293,7 +295,7 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
293
295
|
_context2.next = 4;
|
|
294
296
|
break;
|
|
295
297
|
}
|
|
296
|
-
(
|
|
298
|
+
setIsAbuseModalOpen(true);
|
|
297
299
|
_context2.next = 6;
|
|
298
300
|
break;
|
|
299
301
|
case 4:
|
|
@@ -317,7 +319,7 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
317
319
|
} else {
|
|
318
320
|
return actions;
|
|
319
321
|
}
|
|
320
|
-
}, [actions, mediaClient.config.enforceDataSecurityPolicy, shouldEnableDownloadButton, finalStatus, formatMessage, fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.abuseClassification,
|
|
322
|
+
}, [actions, mediaClient.config.enforceDataSecurityPolicy, shouldEnableDownloadButton, finalStatus, formatMessage, fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.abuseClassification, downloadFn]);
|
|
321
323
|
|
|
322
324
|
//----------------------------------------------------------------//
|
|
323
325
|
//---------------------- Analytics ------------------------------//
|
|
@@ -539,7 +541,7 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
539
541
|
setStatus(newStatus);
|
|
540
542
|
uploadProgressRef.current = newProgress;
|
|
541
543
|
} else {
|
|
542
|
-
var e =
|
|
544
|
+
var e = (0, _mediaClient.toCommonMediaClientError)(fileState);
|
|
543
545
|
var errorReason = finalStatus === 'uploading' ? 'upload' : 'metadata-fetch';
|
|
544
546
|
setError(new _errors.MediaCardError(errorReason, e));
|
|
545
547
|
setStatus('error');
|
|
@@ -638,10 +640,12 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
|
|
|
638
640
|
|
|
639
641
|
var inlinePlayerFallback = isPlayingFile ? renderCard(false, 'loading', false) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
|
|
640
642
|
var collectionName = identifier.collectionName || '';
|
|
641
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_abuseModal.AbuseModal, {
|
|
642
|
-
|
|
643
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !!(fileStateValue !== null && fileStateValue !== void 0 && fileStateValue.abuseClassification) && /*#__PURE__*/_react.default.createElement(_abuseModal.AbuseModal, {
|
|
644
|
+
isOpen: isAbuseModalOpen,
|
|
643
645
|
onConfirm: downloadFn,
|
|
644
|
-
|
|
646
|
+
onClose: function onClose() {
|
|
647
|
+
return setIsAbuseModalOpen(false);
|
|
648
|
+
}
|
|
645
649
|
}), isPlayingFile ? /*#__PURE__*/_react.default.createElement(_react.Suspense, {
|
|
646
650
|
fallback: inlinePlayerFallback
|
|
647
651
|
}, /*#__PURE__*/_react.default.createElement(_inlinePlayerLazy.InlinePlayerLazy, {
|
|
@@ -87,7 +87,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
|
|
|
87
87
|
}(_react.default.Component);
|
|
88
88
|
(0, _defineProperty2.default)(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
|
|
89
89
|
var packageName = "@atlaskit/media-card";
|
|
90
|
-
var packageVersion = "78.18.
|
|
90
|
+
var packageVersion = "78.18.3";
|
|
91
91
|
|
|
92
92
|
// @ts-ignore: [PIT-1685] Fails in post-office due to backwards incompatibility issue with React 18
|
|
93
93
|
var MediaCardAnalyticsErrorBoundary = (0, _mediaCommon.withMediaAnalyticsContext)({
|
package/dist/cjs/errors.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.getImageLoadPrimaryReason = exports.ensureMediaCardError = exports.SsrPreviewError = exports.RemotePreviewError = exports.MediaCardError = exports.LocalPreviewError = exports.ImageLoadError = void 0;
|
|
8
8
|
exports.isImageLoadError = isImageLoadError;
|
|
9
|
-
exports.isKnownErrorType = isKnownErrorType;
|
|
10
9
|
exports.isLocalPreviewError = void 0;
|
|
11
10
|
exports.isMediaCardError = isMediaCardError;
|
|
12
11
|
exports.isPollingError = isPollingError;
|
|
@@ -20,7 +19,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
|
|
|
20
19
|
var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
|
|
21
20
|
var _mediaClient = require("@atlaskit/media-client");
|
|
22
21
|
var _mediaClientReact = require("@atlaskit/media-client-react");
|
|
23
|
-
var _mediaFilePreview = require("@atlaskit/media-file-preview");
|
|
24
22
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
25
23
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
26
24
|
/**
|
|
@@ -131,9 +129,6 @@ var ImageLoadError = exports.ImageLoadError = /*#__PURE__*/function (_MediaCardE
|
|
|
131
129
|
function isMediaCardError(err) {
|
|
132
130
|
return err instanceof MediaCardError;
|
|
133
131
|
}
|
|
134
|
-
function isKnownErrorType(err) {
|
|
135
|
-
return isMediaCardError(err) || (0, _mediaFilePreview.isMediaFilePreviewError)(err);
|
|
136
|
-
}
|
|
137
132
|
var isLocalPreviewError = exports.isLocalPreviewError = function isLocalPreviewError(err) {
|
|
138
133
|
return err instanceof LocalPreviewError;
|
|
139
134
|
};
|
|
@@ -117,7 +117,7 @@ var MediaInlineCardLoader = exports.default = /*#__PURE__*/function (_React$Pure
|
|
|
117
117
|
ErrorBoundary = _this$state.ErrorBoundary;
|
|
118
118
|
var analyticsContext = {
|
|
119
119
|
packageVersion: "@atlaskit/media-card",
|
|
120
|
-
packageName: "78.18.
|
|
120
|
+
packageName: "78.18.3",
|
|
121
121
|
componentName: 'mediaInlineCard',
|
|
122
122
|
component: 'mediaInlineCard'
|
|
123
123
|
};
|
|
@@ -59,7 +59,7 @@ var MediaInlineCardInternal = exports.MediaInlineCardInternal = function MediaIn
|
|
|
59
59
|
var fireFailedOperationalEvent = function fireFailedOperationalEvent() {
|
|
60
60
|
var error = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new _errors.MediaCardError('missing-error-data');
|
|
61
61
|
var failReason = arguments.length > 1 ? arguments[1] : undefined;
|
|
62
|
-
var payload = failReason ? (0, _mediaInlineCardAnalytics.getFailedProcessingStatusPayload)(fileState) : (0, _mediaInlineCardAnalytics.getErrorStatusPayload)(error, fileState);
|
|
62
|
+
var payload = failReason ? (0, _mediaInlineCardAnalytics.getFailedProcessingStatusPayload)(identifier.id, fileState) : (0, _mediaInlineCardAnalytics.getErrorStatusPayload)(identifier.id, error, fileState);
|
|
63
63
|
setIsFailedEventSent(true);
|
|
64
64
|
(0, _analytics.fireMediaCardEvent)(payload, createAnalyticsEvent);
|
|
65
65
|
};
|
|
@@ -135,7 +135,7 @@ var MediaInlineCardInternal = exports.MediaInlineCardInternal = function MediaIn
|
|
|
135
135
|
});
|
|
136
136
|
}
|
|
137
137
|
if ((fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'error') {
|
|
138
|
-
var error = new _errors.MediaCardError('error-file-state',
|
|
138
|
+
var error = new _errors.MediaCardError('error-file-state', (0, _mediaClient.toCommonMediaClientError)(fileState));
|
|
139
139
|
!isFailedEventSent && fireFailedOperationalEvent(error);
|
|
140
140
|
return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
|
|
141
141
|
innerRef: copyNodeRef,
|
|
@@ -146,7 +146,9 @@ var MediaInlineCardInternal = exports.MediaInlineCardInternal = function MediaIn
|
|
|
146
146
|
|
|
147
147
|
// Empty file handling
|
|
148
148
|
if (fileState && !fileState.name) {
|
|
149
|
-
var _error = new _errors.MediaCardError('metadata-fetch', new _mediaClient.FileFetcherError('emptyFileName',
|
|
149
|
+
var _error = new _errors.MediaCardError('metadata-fetch', new _mediaClient.FileFetcherError('emptyFileName', {
|
|
150
|
+
id: fileState.id
|
|
151
|
+
}));
|
|
150
152
|
!isFailedEventSent && fireFailedOperationalEvent(_error);
|
|
151
153
|
return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
|
|
152
154
|
innerRef: copyNodeRef,
|
|
@@ -27,7 +27,7 @@ var getSucceededStatusPayload = exports.getSucceededStatusPayload = function get
|
|
|
27
27
|
}
|
|
28
28
|
};
|
|
29
29
|
};
|
|
30
|
-
var getErrorStatusPayload = exports.getErrorStatusPayload = function getErrorStatusPayload(error, fileState) {
|
|
30
|
+
var getErrorStatusPayload = exports.getErrorStatusPayload = function getErrorStatusPayload(fileId, error, fileState) {
|
|
31
31
|
return {
|
|
32
32
|
eventType: 'operational',
|
|
33
33
|
action: 'failed',
|
|
@@ -35,13 +35,13 @@ var getErrorStatusPayload = exports.getErrorStatusPayload = function getErrorSta
|
|
|
35
35
|
attributes: _objectSpread({
|
|
36
36
|
status: 'fail',
|
|
37
37
|
fileAttributes: {
|
|
38
|
-
fileId:
|
|
38
|
+
fileId: fileId,
|
|
39
39
|
fileStatus: fileState === null || fileState === void 0 ? void 0 : fileState.status
|
|
40
40
|
}
|
|
41
41
|
}, (0, _analytics.extractErrorInfo)(error))
|
|
42
42
|
};
|
|
43
43
|
};
|
|
44
|
-
var getFailedProcessingStatusPayload = exports.getFailedProcessingStatusPayload = function getFailedProcessingStatusPayload(fileState) {
|
|
44
|
+
var getFailedProcessingStatusPayload = exports.getFailedProcessingStatusPayload = function getFailedProcessingStatusPayload(fileId, fileState) {
|
|
45
45
|
return {
|
|
46
46
|
eventType: 'operational',
|
|
47
47
|
action: 'failed',
|
|
@@ -49,7 +49,7 @@ var getFailedProcessingStatusPayload = exports.getFailedProcessingStatusPayload
|
|
|
49
49
|
attributes: {
|
|
50
50
|
status: 'fail',
|
|
51
51
|
fileAttributes: {
|
|
52
|
-
fileId:
|
|
52
|
+
fileId: fileId,
|
|
53
53
|
fileStatus: fileState === null || fileState === void 0 ? void 0 : fileState.status
|
|
54
54
|
},
|
|
55
55
|
failReason: 'failed-processing'
|
|
@@ -60,7 +60,7 @@ var fireFailedOperationalEvent = exports.fireFailedOperationalEvent = function f
|
|
|
60
60
|
var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new _errors.MediaCardError('missing-error-data');
|
|
61
61
|
var failReason = arguments.length > 2 ? arguments[2] : undefined;
|
|
62
62
|
var createAnalyticsEvent = arguments.length > 3 ? arguments[3] : undefined;
|
|
63
|
-
var payload = failReason ? getFailedProcessingStatusPayload(fileState) : getErrorStatusPayload(error, fileState);
|
|
63
|
+
var payload = failReason ? getFailedProcessingStatusPayload((fileState === null || fileState === void 0 ? void 0 : fileState.id) || 'unknown-id', fileState) : getErrorStatusPayload((fileState === null || fileState === void 0 ? void 0 : fileState.id) || 'unknown-id', error, fileState);
|
|
64
64
|
(0, _analytics.fireMediaCardEvent)(payload, createAnalyticsEvent);
|
|
65
65
|
};
|
|
66
66
|
var fireSucceededOperationalEvent = exports.fireSucceededOperationalEvent = function fireSucceededOperationalEvent(fileState, createAnalyticsEvent) {
|
|
@@ -9,10 +9,8 @@ exports.fireMediaCardEvent = fireMediaCardEvent;
|
|
|
9
9
|
exports.getRenderSucceededEventPayload = exports.getRenderPreviewableCardPayload = exports.getRenderFailedFileStatusPayload = exports.getRenderFailedExternalUriPayload = exports.getRenderErrorRequestMetadata = exports.getRenderErrorFailReason = exports.getRenderErrorEventPayload = exports.getRenderErrorErrorReason = exports.getRenderErrorErrorDetail = exports.getRemoteSuccessEventPayload = exports.getFileAttributes = exports.getErrorTraceContext = exports.getErrorEventPayload = exports.getDownloadSucceededEventPayload = exports.getDownloadFailedEventPayload = exports.getCacheHitEventPayload = void 0;
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
11
|
var _mediaClient = require("@atlaskit/media-client");
|
|
12
|
-
var _mediaClientReact = require("@atlaskit/media-client-react");
|
|
13
12
|
var _analytics = require("@atlaskit/media-common/analytics");
|
|
14
13
|
var _analyticsNext = require("@atlaskit/analytics-next");
|
|
15
|
-
var _errors = require("../../errors");
|
|
16
14
|
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; }
|
|
17
15
|
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; }
|
|
18
16
|
var getFileAttributes = exports.getFileAttributes = function getFileAttributes(metadata, fileStatus) {
|
|
@@ -100,47 +98,33 @@ var getRenderFailedExternalUriPayload = exports.getRenderFailedExternalUriPayloa
|
|
|
100
98
|
};
|
|
101
99
|
};
|
|
102
100
|
var getRenderErrorFailReason = exports.getRenderErrorFailReason = function getRenderErrorFailReason(error) {
|
|
103
|
-
|
|
104
|
-
return error.primaryReason;
|
|
105
|
-
} else {
|
|
106
|
-
return 'nativeError';
|
|
107
|
-
}
|
|
101
|
+
return error.primaryReason || 'nativeError';
|
|
108
102
|
};
|
|
109
103
|
var getRenderErrorErrorReason = exports.getRenderErrorErrorReason = function getRenderErrorErrorReason(error) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
return mediaClientReason;
|
|
114
|
-
}
|
|
104
|
+
var secondaryError = error.secondaryError;
|
|
105
|
+
if ((0, _mediaClient.isCommonMediaClientError)(secondaryError)) {
|
|
106
|
+
return secondaryError.reason;
|
|
115
107
|
}
|
|
116
108
|
return 'nativeError';
|
|
117
109
|
};
|
|
118
110
|
var getRenderErrorErrorDetail = exports.getRenderErrorErrorDetail = function getRenderErrorErrorDetail(error) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
return error.message;
|
|
111
|
+
var secondaryError = error.secondaryError;
|
|
112
|
+
if (secondaryError instanceof Error) {
|
|
113
|
+
return secondaryError.message;
|
|
123
114
|
}
|
|
115
|
+
return error.message;
|
|
124
116
|
};
|
|
125
117
|
var getErrorTraceContext = exports.getErrorTraceContext = function getErrorTraceContext(error) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
} else if ((0, _mediaClientReact.isMediaFileStateError)(error.secondaryError)) {
|
|
131
|
-
var _error$secondaryError2;
|
|
132
|
-
return (_error$secondaryError2 = error.secondaryError.details) === null || _error$secondaryError2 === void 0 || (_error$secondaryError2 = _error$secondaryError2.metadata) === null || _error$secondaryError2 === void 0 ? void 0 : _error$secondaryError2.traceContext;
|
|
133
|
-
}
|
|
118
|
+
var secondaryError = error.secondaryError;
|
|
119
|
+
if ((0, _mediaClient.isCommonMediaClientError)(secondaryError)) {
|
|
120
|
+
var _secondaryError$metad;
|
|
121
|
+
return (_secondaryError$metad = secondaryError.metadata) === null || _secondaryError$metad === void 0 ? void 0 : _secondaryError$metad.traceContext;
|
|
134
122
|
}
|
|
135
123
|
};
|
|
136
124
|
var getRenderErrorRequestMetadata = exports.getRenderErrorRequestMetadata = function getRenderErrorRequestMetadata(error) {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
} else if ((0, _mediaClientReact.isMediaFileStateError)(error.secondaryError)) {
|
|
141
|
-
var _error$secondaryError3;
|
|
142
|
-
return (_error$secondaryError3 = error.secondaryError.details) === null || _error$secondaryError3 === void 0 ? void 0 : _error$secondaryError3.metadata;
|
|
143
|
-
}
|
|
125
|
+
var secondaryError = error.secondaryError;
|
|
126
|
+
if ((0, _mediaClient.isCommonMediaClientError)(secondaryError)) {
|
|
127
|
+
return secondaryError.metadata;
|
|
144
128
|
}
|
|
145
129
|
};
|
|
146
130
|
var extractErrorInfo = exports.extractErrorInfo = function extractErrorInfo(error, metadataTraceContext) {
|
|
@@ -15,7 +15,7 @@ var _mediaClient = require("@atlaskit/media-client");
|
|
|
15
15
|
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; }
|
|
16
16
|
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; }
|
|
17
17
|
var packageName = "@atlaskit/media-card";
|
|
18
|
-
var packageVersion = "78.18.
|
|
18
|
+
var packageVersion = "78.18.3";
|
|
19
19
|
var concurrentExperience;
|
|
20
20
|
var getExperience = function getExperience(id) {
|
|
21
21
|
if (!concurrentExperience) {
|
package/dist/es2019/card/card.js
CHANGED
|
@@ -9,7 +9,7 @@ import { startResourceObserver, setAnalyticsContext } from '../utils/mediaPerfor
|
|
|
9
9
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
10
10
|
import UFOLabel from '@atlaskit/react-ufo/label';
|
|
11
11
|
const packageName = "@atlaskit/media-card";
|
|
12
|
-
const packageVersion = "78.18.
|
|
12
|
+
const packageVersion = "78.18.3";
|
|
13
13
|
export const CardBase = ({
|
|
14
14
|
identifier,
|
|
15
15
|
...otherProps
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
2
|
-
import { globalMediaEventEmitter, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState, isErrorFileState } from '@atlaskit/media-client';
|
|
3
|
-
import {
|
|
2
|
+
import { globalMediaEventEmitter, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState, isErrorFileState, toCommonMediaClientError } from '@atlaskit/media-client';
|
|
3
|
+
import { useFileState, useMediaClient } from '@atlaskit/media-client-react';
|
|
4
4
|
import { getRandomHex, isMimeTypeSupportedByBrowser, isVideoMimeTypeSupportedByBrowser } from '@atlaskit/media-common';
|
|
5
5
|
import { MediaViewer, MediaViewerWithPortal } from '@atlaskit/media-viewer';
|
|
6
|
-
import React, { Suspense, useEffect, useMemo, useRef, useState,
|
|
6
|
+
import React, { Suspense, useEffect, useMemo, useRef, useState, useCallback } from 'react';
|
|
7
7
|
import ReactDOM from 'react-dom';
|
|
8
8
|
import { useMergeRefs } from 'use-callback-ref';
|
|
9
9
|
import { MediaCardError } from '../errors';
|
|
@@ -69,7 +69,7 @@ export const FileCard = ({
|
|
|
69
69
|
const {
|
|
70
70
|
formatMessage
|
|
71
71
|
} = useIntl();
|
|
72
|
-
const
|
|
72
|
+
const [isAbuseModalOpen, setIsAbuseModalOpen] = useState(false);
|
|
73
73
|
const {
|
|
74
74
|
createAnalyticsEvent
|
|
75
75
|
} = useAnalyticsEvents();
|
|
@@ -226,8 +226,7 @@ export const FileCard = ({
|
|
|
226
226
|
if (finalStatus === 'failed-processing' || shouldEnableDownloadButton) {
|
|
227
227
|
const handler = async () => {
|
|
228
228
|
if (!!(fileStateValue !== null && fileStateValue !== void 0 && fileStateValue.abuseClassification)) {
|
|
229
|
-
|
|
230
|
-
(_openModalRef$current = openModalRef.current) === null || _openModalRef$current === void 0 ? void 0 : _openModalRef$current.call(openModalRef);
|
|
229
|
+
setIsAbuseModalOpen(true);
|
|
231
230
|
} else {
|
|
232
231
|
await downloadFn();
|
|
233
232
|
}
|
|
@@ -240,7 +239,7 @@ export const FileCard = ({
|
|
|
240
239
|
} else {
|
|
241
240
|
return actions;
|
|
242
241
|
}
|
|
243
|
-
}, [actions, mediaClient.config.enforceDataSecurityPolicy, shouldEnableDownloadButton, finalStatus, formatMessage, fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.abuseClassification,
|
|
242
|
+
}, [actions, mediaClient.config.enforceDataSecurityPolicy, shouldEnableDownloadButton, finalStatus, formatMessage, fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.abuseClassification, downloadFn]);
|
|
244
243
|
|
|
245
244
|
//----------------------------------------------------------------//
|
|
246
245
|
//---------------------- Analytics ------------------------------//
|
|
@@ -463,7 +462,7 @@ export const FileCard = ({
|
|
|
463
462
|
setStatus(newStatus);
|
|
464
463
|
uploadProgressRef.current = newProgress;
|
|
465
464
|
} else {
|
|
466
|
-
const e =
|
|
465
|
+
const e = toCommonMediaClientError(fileState);
|
|
467
466
|
const errorReason = finalStatus === 'uploading' ? 'upload' : 'metadata-fetch';
|
|
468
467
|
setError(new MediaCardError(errorReason, e));
|
|
469
468
|
setStatus('error');
|
|
@@ -562,10 +561,10 @@ export const FileCard = ({
|
|
|
562
561
|
|
|
563
562
|
const inlinePlayerFallback = isPlayingFile ? renderCard(false, 'loading', false) : /*#__PURE__*/React.createElement(React.Fragment, null);
|
|
564
563
|
const collectionName = identifier.collectionName || '';
|
|
565
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AbuseModal, {
|
|
566
|
-
|
|
564
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, !!(fileStateValue !== null && fileStateValue !== void 0 && fileStateValue.abuseClassification) && /*#__PURE__*/React.createElement(AbuseModal, {
|
|
565
|
+
isOpen: isAbuseModalOpen,
|
|
567
566
|
onConfirm: downloadFn,
|
|
568
|
-
|
|
567
|
+
onClose: () => setIsAbuseModalOpen(false)
|
|
569
568
|
}), isPlayingFile ? /*#__PURE__*/React.createElement(Suspense, {
|
|
570
569
|
fallback: inlinePlayerFallback
|
|
571
570
|
}, /*#__PURE__*/React.createElement(InlinePlayerLazy, {
|
|
@@ -66,7 +66,7 @@ class WrappedMediaCardAnalyticsErrorBoundary extends React.Component {
|
|
|
66
66
|
}
|
|
67
67
|
_defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
|
|
68
68
|
const packageName = "@atlaskit/media-card";
|
|
69
|
-
const packageVersion = "78.18.
|
|
69
|
+
const packageVersion = "78.18.3";
|
|
70
70
|
|
|
71
71
|
// @ts-ignore: [PIT-1685] Fails in post-office due to backwards incompatibility issue with React 18
|
|
72
72
|
const MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
|
package/dist/es2019/errors.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { isPollingError as isMediaClientPollingError, isRateLimitedError as isMediaClientRateLimitedError } from '@atlaskit/media-client';
|
|
2
2
|
import { isMediaFileStateError } from '@atlaskit/media-client-react';
|
|
3
|
-
import { isMediaFilePreviewError } from '@atlaskit/media-file-preview';
|
|
4
3
|
/**
|
|
5
4
|
* Primary reason is logged through Data Portal.
|
|
6
5
|
* Make sure all the values are whitelisted in Measure -> Event Regitry -> "mediaCardRender failed" event
|
|
@@ -86,9 +85,6 @@ export class ImageLoadError extends MediaCardError {
|
|
|
86
85
|
export function isMediaCardError(err) {
|
|
87
86
|
return err instanceof MediaCardError;
|
|
88
87
|
}
|
|
89
|
-
export function isKnownErrorType(err) {
|
|
90
|
-
return isMediaCardError(err) || isMediaFilePreviewError(err);
|
|
91
|
-
}
|
|
92
88
|
export const isLocalPreviewError = err => err instanceof LocalPreviewError;
|
|
93
89
|
export const isRemotePreviewError = err => err instanceof RemotePreviewError;
|
|
94
90
|
export const isUnsupportedLocalPreviewError = err => isMediaCardError(err) && err.primaryReason === 'local-preview-unsupported';
|
|
@@ -37,7 +37,7 @@ export default class MediaInlineCardLoader extends React.PureComponent {
|
|
|
37
37
|
} = this.state;
|
|
38
38
|
const analyticsContext = {
|
|
39
39
|
packageVersion: "@atlaskit/media-card",
|
|
40
|
-
packageName: "78.18.
|
|
40
|
+
packageName: "78.18.3",
|
|
41
41
|
componentName: 'mediaInlineCard',
|
|
42
42
|
component: 'mediaInlineCard'
|
|
43
43
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
2
|
-
import { FileFetcherError } from '@atlaskit/media-client';
|
|
2
|
+
import { FileFetcherError, toCommonMediaClientError } from '@atlaskit/media-client';
|
|
3
3
|
import { MediaInlineCardErroredView, MediaInlineCardLoadedView, MediaInlineCardLoadingView, messages } from '@atlaskit/media-ui';
|
|
4
4
|
import { formatDate } from '@atlaskit/media-ui/formatDate';
|
|
5
5
|
import { MimeTypeIcon } from '@atlaskit/media-ui/mime-type-icon';
|
|
@@ -33,7 +33,7 @@ export const MediaInlineCardInternal = ({
|
|
|
33
33
|
createAnalyticsEvent
|
|
34
34
|
} = useAnalyticsEvents();
|
|
35
35
|
const fireFailedOperationalEvent = (error = new MediaCardError('missing-error-data'), failReason) => {
|
|
36
|
-
const payload = failReason ? getFailedProcessingStatusPayload(fileState) : getErrorStatusPayload(error, fileState);
|
|
36
|
+
const payload = failReason ? getFailedProcessingStatusPayload(identifier.id, fileState) : getErrorStatusPayload(identifier.id, error, fileState);
|
|
37
37
|
setIsFailedEventSent(true);
|
|
38
38
|
fireMediaCardEvent(payload, createAnalyticsEvent);
|
|
39
39
|
};
|
|
@@ -108,7 +108,7 @@ export const MediaInlineCardInternal = ({
|
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
if ((fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'error') {
|
|
111
|
-
const error = new MediaCardError('error-file-state',
|
|
111
|
+
const error = new MediaCardError('error-file-state', toCommonMediaClientError(fileState));
|
|
112
112
|
!isFailedEventSent && fireFailedOperationalEvent(error);
|
|
113
113
|
return /*#__PURE__*/React.createElement(MediaInlineCardErroredView, {
|
|
114
114
|
innerRef: copyNodeRef,
|
|
@@ -119,7 +119,9 @@ export const MediaInlineCardInternal = ({
|
|
|
119
119
|
|
|
120
120
|
// Empty file handling
|
|
121
121
|
if (fileState && !fileState.name) {
|
|
122
|
-
const error = new MediaCardError('metadata-fetch', new FileFetcherError('emptyFileName',
|
|
122
|
+
const error = new MediaCardError('metadata-fetch', new FileFetcherError('emptyFileName', {
|
|
123
|
+
id: fileState.id
|
|
124
|
+
}));
|
|
123
125
|
!isFailedEventSent && fireFailedOperationalEvent(error);
|
|
124
126
|
return /*#__PURE__*/React.createElement(MediaInlineCardErroredView, {
|
|
125
127
|
innerRef: copyNodeRef,
|
|
@@ -17,7 +17,7 @@ export const getSucceededStatusPayload = fileState => {
|
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
|
-
export const getErrorStatusPayload = (error, fileState) => {
|
|
20
|
+
export const getErrorStatusPayload = (fileId, error, fileState) => {
|
|
21
21
|
return {
|
|
22
22
|
eventType: 'operational',
|
|
23
23
|
action: 'failed',
|
|
@@ -25,14 +25,14 @@ export const getErrorStatusPayload = (error, fileState) => {
|
|
|
25
25
|
attributes: {
|
|
26
26
|
status: 'fail',
|
|
27
27
|
fileAttributes: {
|
|
28
|
-
fileId
|
|
28
|
+
fileId,
|
|
29
29
|
fileStatus: fileState === null || fileState === void 0 ? void 0 : fileState.status
|
|
30
30
|
},
|
|
31
31
|
...extractErrorInfo(error)
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
};
|
|
35
|
-
export const getFailedProcessingStatusPayload = fileState => {
|
|
35
|
+
export const getFailedProcessingStatusPayload = (fileId, fileState) => {
|
|
36
36
|
return {
|
|
37
37
|
eventType: 'operational',
|
|
38
38
|
action: 'failed',
|
|
@@ -40,7 +40,7 @@ export const getFailedProcessingStatusPayload = fileState => {
|
|
|
40
40
|
attributes: {
|
|
41
41
|
status: 'fail',
|
|
42
42
|
fileAttributes: {
|
|
43
|
-
fileId
|
|
43
|
+
fileId,
|
|
44
44
|
fileStatus: fileState === null || fileState === void 0 ? void 0 : fileState.status
|
|
45
45
|
},
|
|
46
46
|
failReason: 'failed-processing'
|
|
@@ -48,7 +48,7 @@ export const getFailedProcessingStatusPayload = fileState => {
|
|
|
48
48
|
};
|
|
49
49
|
};
|
|
50
50
|
export const fireFailedOperationalEvent = (fileState, error = new MediaCardError('missing-error-data'), failReason, createAnalyticsEvent) => {
|
|
51
|
-
const payload = failReason ? getFailedProcessingStatusPayload(fileState) : getErrorStatusPayload(error, fileState);
|
|
51
|
+
const payload = failReason ? getFailedProcessingStatusPayload((fileState === null || fileState === void 0 ? void 0 : fileState.id) || 'unknown-id', fileState) : getErrorStatusPayload((fileState === null || fileState === void 0 ? void 0 : fileState.id) || 'unknown-id', error, fileState);
|
|
52
52
|
fireMediaCardEvent(payload, createAnalyticsEvent);
|
|
53
53
|
};
|
|
54
54
|
export const fireSucceededOperationalEvent = (fileState, createAnalyticsEvent) => {
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { isMediaFileStateError, getFileStateErrorReason } from '@atlaskit/media-client-react';
|
|
1
|
+
import { isCommonMediaClientError } from '@atlaskit/media-client';
|
|
3
2
|
import { ANALYTICS_MEDIA_CHANNEL, sanitiseAnalyticsPayload } from '@atlaskit/media-common/analytics';
|
|
4
3
|
import { createAndFireEvent } from '@atlaskit/analytics-next';
|
|
5
|
-
import { isKnownErrorType } from '../../errors';
|
|
6
4
|
export const getFileAttributes = (metadata, fileStatus) => ({
|
|
7
5
|
fileMediatype: metadata.mediaType,
|
|
8
6
|
fileMimetype: metadata.mimeType,
|
|
@@ -74,47 +72,41 @@ export const getRenderFailedExternalUriPayload = (fileAttributes, performanceAtt
|
|
|
74
72
|
}
|
|
75
73
|
});
|
|
76
74
|
export const getRenderErrorFailReason = error => {
|
|
77
|
-
|
|
78
|
-
return error.primaryReason;
|
|
79
|
-
} else {
|
|
80
|
-
return 'nativeError';
|
|
81
|
-
}
|
|
75
|
+
return error.primaryReason || 'nativeError';
|
|
82
76
|
};
|
|
83
77
|
export const getRenderErrorErrorReason = error => {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
78
|
+
const {
|
|
79
|
+
secondaryError
|
|
80
|
+
} = error;
|
|
81
|
+
if (isCommonMediaClientError(secondaryError)) {
|
|
82
|
+
return secondaryError.reason;
|
|
89
83
|
}
|
|
90
84
|
return 'nativeError';
|
|
91
85
|
};
|
|
92
86
|
export const getRenderErrorErrorDetail = error => {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}
|
|
96
|
-
|
|
87
|
+
const {
|
|
88
|
+
secondaryError
|
|
89
|
+
} = error;
|
|
90
|
+
if (secondaryError instanceof Error) {
|
|
91
|
+
return secondaryError.message;
|
|
97
92
|
}
|
|
93
|
+
return error.message;
|
|
98
94
|
};
|
|
99
95
|
export const getErrorTraceContext = error => {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
return (_error$secondaryError2 = error.secondaryError.details) === null || _error$secondaryError2 === void 0 ? void 0 : (_error$secondaryError3 = _error$secondaryError2.metadata) === null || _error$secondaryError3 === void 0 ? void 0 : _error$secondaryError3.traceContext;
|
|
107
|
-
}
|
|
96
|
+
const {
|
|
97
|
+
secondaryError
|
|
98
|
+
} = error;
|
|
99
|
+
if (isCommonMediaClientError(secondaryError)) {
|
|
100
|
+
var _secondaryError$metad;
|
|
101
|
+
return (_secondaryError$metad = secondaryError.metadata) === null || _secondaryError$metad === void 0 ? void 0 : _secondaryError$metad.traceContext;
|
|
108
102
|
}
|
|
109
103
|
};
|
|
110
104
|
export const getRenderErrorRequestMetadata = error => {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
return (_error$secondaryError4 = error.secondaryError.details) === null || _error$secondaryError4 === void 0 ? void 0 : _error$secondaryError4.metadata;
|
|
117
|
-
}
|
|
105
|
+
const {
|
|
106
|
+
secondaryError
|
|
107
|
+
} = error;
|
|
108
|
+
if (isCommonMediaClientError(secondaryError)) {
|
|
109
|
+
return secondaryError.metadata;
|
|
118
110
|
}
|
|
119
111
|
};
|
|
120
112
|
export const extractErrorInfo = (error, metadataTraceContext) => {
|
|
@@ -5,7 +5,7 @@ import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
|
|
|
5
5
|
import { MediaCardError } from '../errors';
|
|
6
6
|
import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
|
|
7
7
|
const packageName = "@atlaskit/media-card";
|
|
8
|
-
const packageVersion = "78.18.
|
|
8
|
+
const packageVersion = "78.18.3";
|
|
9
9
|
let concurrentExperience;
|
|
10
10
|
const getExperience = id => {
|
|
11
11
|
if (!concurrentExperience) {
|
package/dist/esm/card/card.js
CHANGED
|
@@ -11,7 +11,7 @@ import { startResourceObserver, setAnalyticsContext } from '../utils/mediaPerfor
|
|
|
11
11
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
12
12
|
import UFOLabel from '@atlaskit/react-ufo/label';
|
|
13
13
|
var packageName = "@atlaskit/media-card";
|
|
14
|
-
var packageVersion = "78.18.
|
|
14
|
+
var packageVersion = "78.18.3";
|
|
15
15
|
export var CardBase = function CardBase(_ref) {
|
|
16
16
|
var identifier = _ref.identifier,
|
|
17
17
|
otherProps = _objectWithoutProperties(_ref, _excluded);
|
|
@@ -6,11 +6,11 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
|
6
6
|
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; }
|
|
7
7
|
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; }
|
|
8
8
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
9
|
-
import { globalMediaEventEmitter, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState, isErrorFileState } from '@atlaskit/media-client';
|
|
10
|
-
import {
|
|
9
|
+
import { globalMediaEventEmitter, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState, isErrorFileState, toCommonMediaClientError } from '@atlaskit/media-client';
|
|
10
|
+
import { useFileState, useMediaClient } from '@atlaskit/media-client-react';
|
|
11
11
|
import { getRandomHex, isMimeTypeSupportedByBrowser, isVideoMimeTypeSupportedByBrowser } from '@atlaskit/media-common';
|
|
12
12
|
import { MediaViewer, MediaViewerWithPortal } from '@atlaskit/media-viewer';
|
|
13
|
-
import React, { Suspense, useEffect, useMemo, useRef, useState,
|
|
13
|
+
import React, { Suspense, useEffect, useMemo, useRef, useState, useCallback } from 'react';
|
|
14
14
|
import ReactDOM from 'react-dom';
|
|
15
15
|
import { useMergeRefs } from 'use-callback-ref';
|
|
16
16
|
import { MediaCardError } from '../errors';
|
|
@@ -78,7 +78,10 @@ export var FileCard = function FileCard(_ref) {
|
|
|
78
78
|
includeHashForDuplicateFiles = _ref.includeHashForDuplicateFiles;
|
|
79
79
|
var _useIntl = useIntl(),
|
|
80
80
|
formatMessage = _useIntl.formatMessage;
|
|
81
|
-
var
|
|
81
|
+
var _useState = useState(false),
|
|
82
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
83
|
+
isAbuseModalOpen = _useState2[0],
|
|
84
|
+
setIsAbuseModalOpen = _useState2[1];
|
|
82
85
|
var _useAnalyticsEvents = useAnalyticsEvents(),
|
|
83
86
|
createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
|
|
84
87
|
//----------------------------------------------------------------//
|
|
@@ -86,10 +89,10 @@ export var FileCard = function FileCard(_ref) {
|
|
|
86
89
|
//----------------------------------------------------------------//
|
|
87
90
|
|
|
88
91
|
var mediaClient = useMediaClient();
|
|
89
|
-
var
|
|
90
|
-
|
|
91
|
-
cardElement =
|
|
92
|
-
setCardElement =
|
|
92
|
+
var _useState3 = useState(null),
|
|
93
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
94
|
+
cardElement = _useState4[0],
|
|
95
|
+
setCardElement = _useState4[1];
|
|
93
96
|
var cardDimensions = dimensions || getDefaultCardDimensions(appearance);
|
|
94
97
|
|
|
95
98
|
// Calculate the preview dimensions if card dimensions are "percentage" based
|
|
@@ -103,10 +106,10 @@ export var FileCard = function FileCard(_ref) {
|
|
|
103
106
|
})
|
|
104
107
|
);
|
|
105
108
|
}, [cardDimensions, cardElement]);
|
|
106
|
-
var
|
|
107
|
-
|
|
108
|
-
isCardVisible =
|
|
109
|
-
setIsCardVisible =
|
|
109
|
+
var _useState5 = useState(!isLazy),
|
|
110
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
111
|
+
isCardVisible = _useState6[0],
|
|
112
|
+
setIsCardVisible = _useState6[1];
|
|
110
113
|
var _useFileState = useFileState(identifier.id, {
|
|
111
114
|
skipRemote: !isCardVisible,
|
|
112
115
|
collectionName: identifier.collectionName,
|
|
@@ -147,22 +150,22 @@ export var FileCard = function FileCard(_ref) {
|
|
|
147
150
|
traceId: getRandomHex(8)
|
|
148
151
|
};
|
|
149
152
|
}, []);
|
|
150
|
-
var
|
|
151
|
-
_useState6 = _slicedToArray(_useState5, 2),
|
|
152
|
-
status = _useState6[0],
|
|
153
|
-
setStatus = _useState6[1];
|
|
154
|
-
var _useState7 = useState(false),
|
|
153
|
+
var _useState7 = useState('loading'),
|
|
155
154
|
_useState8 = _slicedToArray(_useState7, 2),
|
|
156
|
-
|
|
157
|
-
|
|
155
|
+
status = _useState8[0],
|
|
156
|
+
setStatus = _useState8[1];
|
|
158
157
|
var _useState9 = useState(false),
|
|
159
158
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
160
|
-
|
|
161
|
-
|
|
159
|
+
isPlayingFile = _useState10[0],
|
|
160
|
+
setIsPlayingFile = _useState10[1];
|
|
162
161
|
var _useState11 = useState(false),
|
|
163
162
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
164
|
-
|
|
165
|
-
|
|
163
|
+
shouldAutoplay = _useState12[0],
|
|
164
|
+
setShouldAutoplay = _useState12[1];
|
|
165
|
+
var _useState13 = useState(false),
|
|
166
|
+
_useState14 = _slicedToArray(_useState13, 2),
|
|
167
|
+
previewDidRender = _useState14[0],
|
|
168
|
+
setPreviewDidRender = _useState14[1];
|
|
166
169
|
var mediaBlobUrlAttrs = useMemo(function () {
|
|
167
170
|
var id = identifier.id,
|
|
168
171
|
collection = identifier.collectionName;
|
|
@@ -200,18 +203,18 @@ export var FileCard = function FileCard(_ref) {
|
|
|
200
203
|
onImageLoadBase = _useFilePreview.onImageLoad,
|
|
201
204
|
getSsrScriptProps = _useFilePreview.getSsrScriptProps,
|
|
202
205
|
copyNodeRef = _useFilePreview.copyNodeRef;
|
|
203
|
-
var
|
|
204
|
-
|
|
205
|
-
error =
|
|
206
|
-
setError =
|
|
206
|
+
var _useState15 = useState(),
|
|
207
|
+
_useState16 = _slicedToArray(_useState15, 2),
|
|
208
|
+
error = _useState16[0],
|
|
209
|
+
setError = _useState16[1];
|
|
207
210
|
|
|
208
211
|
// CXP-2723 TODO: TEMPORARY VARIABLES
|
|
209
212
|
var finalError = error || (previewError && previewError.primaryReason !== 'failed-processing' && (fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.mimeType) !== 'image/svg+xml' ? previewError : undefined);
|
|
210
213
|
var finalStatus = finalError ? 'error' : status === 'failed-processing' && (fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.mimeType) === 'image/svg+xml' ? 'loading-preview' : status;
|
|
211
|
-
var
|
|
212
|
-
|
|
213
|
-
mediaViewerSelectedItem =
|
|
214
|
-
setMediaViewerSelectedItem =
|
|
214
|
+
var _useState17 = useState(null),
|
|
215
|
+
_useState18 = _slicedToArray(_useState17, 2),
|
|
216
|
+
mediaViewerSelectedItem = _useState18[0],
|
|
217
|
+
setMediaViewerSelectedItem = _useState18[1];
|
|
215
218
|
var uploadProgressRef = useRef();
|
|
216
219
|
var metadata = useMemo(function () {
|
|
217
220
|
var getProcessingStatusFromFileState = function getProcessingStatusFromFileState(status) {
|
|
@@ -276,7 +279,6 @@ export var FileCard = function FileCard(_ref) {
|
|
|
276
279
|
if (finalStatus === 'failed-processing' || shouldEnableDownloadButton) {
|
|
277
280
|
var handler = /*#__PURE__*/function () {
|
|
278
281
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
279
|
-
var _openModalRef$current;
|
|
280
282
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
281
283
|
while (1) switch (_context2.prev = _context2.next) {
|
|
282
284
|
case 0:
|
|
@@ -284,7 +286,7 @@ export var FileCard = function FileCard(_ref) {
|
|
|
284
286
|
_context2.next = 4;
|
|
285
287
|
break;
|
|
286
288
|
}
|
|
287
|
-
(
|
|
289
|
+
setIsAbuseModalOpen(true);
|
|
288
290
|
_context2.next = 6;
|
|
289
291
|
break;
|
|
290
292
|
case 4:
|
|
@@ -308,7 +310,7 @@ export var FileCard = function FileCard(_ref) {
|
|
|
308
310
|
} else {
|
|
309
311
|
return actions;
|
|
310
312
|
}
|
|
311
|
-
}, [actions, mediaClient.config.enforceDataSecurityPolicy, shouldEnableDownloadButton, finalStatus, formatMessage, fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.abuseClassification,
|
|
313
|
+
}, [actions, mediaClient.config.enforceDataSecurityPolicy, shouldEnableDownloadButton, finalStatus, formatMessage, fileStateValue === null || fileStateValue === void 0 ? void 0 : fileStateValue.abuseClassification, downloadFn]);
|
|
312
314
|
|
|
313
315
|
//----------------------------------------------------------------//
|
|
314
316
|
//---------------------- Analytics ------------------------------//
|
|
@@ -530,7 +532,7 @@ export var FileCard = function FileCard(_ref) {
|
|
|
530
532
|
setStatus(newStatus);
|
|
531
533
|
uploadProgressRef.current = newProgress;
|
|
532
534
|
} else {
|
|
533
|
-
var e =
|
|
535
|
+
var e = toCommonMediaClientError(fileState);
|
|
534
536
|
var errorReason = finalStatus === 'uploading' ? 'upload' : 'metadata-fetch';
|
|
535
537
|
setError(new MediaCardError(errorReason, e));
|
|
536
538
|
setStatus('error');
|
|
@@ -629,10 +631,12 @@ export var FileCard = function FileCard(_ref) {
|
|
|
629
631
|
|
|
630
632
|
var inlinePlayerFallback = isPlayingFile ? renderCard(false, 'loading', false) : /*#__PURE__*/React.createElement(React.Fragment, null);
|
|
631
633
|
var collectionName = identifier.collectionName || '';
|
|
632
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AbuseModal, {
|
|
633
|
-
|
|
634
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, !!(fileStateValue !== null && fileStateValue !== void 0 && fileStateValue.abuseClassification) && /*#__PURE__*/React.createElement(AbuseModal, {
|
|
635
|
+
isOpen: isAbuseModalOpen,
|
|
634
636
|
onConfirm: downloadFn,
|
|
635
|
-
|
|
637
|
+
onClose: function onClose() {
|
|
638
|
+
return setIsAbuseModalOpen(false);
|
|
639
|
+
}
|
|
636
640
|
}), isPlayingFile ? /*#__PURE__*/React.createElement(Suspense, {
|
|
637
641
|
fallback: inlinePlayerFallback
|
|
638
642
|
}, /*#__PURE__*/React.createElement(InlinePlayerLazy, {
|
|
@@ -80,7 +80,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
|
|
|
80
80
|
}(React.Component);
|
|
81
81
|
_defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
|
|
82
82
|
var packageName = "@atlaskit/media-card";
|
|
83
|
-
var packageVersion = "78.18.
|
|
83
|
+
var packageVersion = "78.18.3";
|
|
84
84
|
|
|
85
85
|
// @ts-ignore: [PIT-1685] Fails in post-office due to backwards incompatibility issue with React 18
|
|
86
86
|
var MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
|
package/dist/esm/errors.js
CHANGED
|
@@ -8,7 +8,6 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
|
|
|
8
8
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
9
9
|
import { isPollingError as isMediaClientPollingError, isRateLimitedError as isMediaClientRateLimitedError } from '@atlaskit/media-client';
|
|
10
10
|
import { isMediaFileStateError } from '@atlaskit/media-client-react';
|
|
11
|
-
import { isMediaFilePreviewError } from '@atlaskit/media-file-preview';
|
|
12
11
|
/**
|
|
13
12
|
* Primary reason is logged through Data Portal.
|
|
14
13
|
* Make sure all the values are whitelisted in Measure -> Event Regitry -> "mediaCardRender failed" event
|
|
@@ -117,9 +116,6 @@ export var ImageLoadError = /*#__PURE__*/function (_MediaCardError4) {
|
|
|
117
116
|
export function isMediaCardError(err) {
|
|
118
117
|
return err instanceof MediaCardError;
|
|
119
118
|
}
|
|
120
|
-
export function isKnownErrorType(err) {
|
|
121
|
-
return isMediaCardError(err) || isMediaFilePreviewError(err);
|
|
122
|
-
}
|
|
123
119
|
export var isLocalPreviewError = function isLocalPreviewError(err) {
|
|
124
120
|
return err instanceof LocalPreviewError;
|
|
125
121
|
};
|
|
@@ -101,7 +101,7 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
101
101
|
ErrorBoundary = _this$state.ErrorBoundary;
|
|
102
102
|
var analyticsContext = {
|
|
103
103
|
packageVersion: "@atlaskit/media-card",
|
|
104
|
-
packageName: "78.18.
|
|
104
|
+
packageName: "78.18.3",
|
|
105
105
|
componentName: 'mediaInlineCard',
|
|
106
106
|
component: 'mediaInlineCard'
|
|
107
107
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
2
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
3
|
-
import { FileFetcherError } from '@atlaskit/media-client';
|
|
3
|
+
import { FileFetcherError, toCommonMediaClientError } from '@atlaskit/media-client';
|
|
4
4
|
import { MediaInlineCardErroredView, MediaInlineCardLoadedView, MediaInlineCardLoadingView, messages } from '@atlaskit/media-ui';
|
|
5
5
|
import { formatDate } from '@atlaskit/media-ui/formatDate';
|
|
6
6
|
import { MimeTypeIcon } from '@atlaskit/media-ui/mime-type-icon';
|
|
@@ -49,7 +49,7 @@ export var MediaInlineCardInternal = function MediaInlineCardInternal(_ref) {
|
|
|
49
49
|
var fireFailedOperationalEvent = function fireFailedOperationalEvent() {
|
|
50
50
|
var error = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new MediaCardError('missing-error-data');
|
|
51
51
|
var failReason = arguments.length > 1 ? arguments[1] : undefined;
|
|
52
|
-
var payload = failReason ? getFailedProcessingStatusPayload(fileState) : getErrorStatusPayload(error, fileState);
|
|
52
|
+
var payload = failReason ? getFailedProcessingStatusPayload(identifier.id, fileState) : getErrorStatusPayload(identifier.id, error, fileState);
|
|
53
53
|
setIsFailedEventSent(true);
|
|
54
54
|
fireMediaCardEvent(payload, createAnalyticsEvent);
|
|
55
55
|
};
|
|
@@ -125,7 +125,7 @@ export var MediaInlineCardInternal = function MediaInlineCardInternal(_ref) {
|
|
|
125
125
|
});
|
|
126
126
|
}
|
|
127
127
|
if ((fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'error') {
|
|
128
|
-
var error = new MediaCardError('error-file-state',
|
|
128
|
+
var error = new MediaCardError('error-file-state', toCommonMediaClientError(fileState));
|
|
129
129
|
!isFailedEventSent && fireFailedOperationalEvent(error);
|
|
130
130
|
return /*#__PURE__*/React.createElement(MediaInlineCardErroredView, {
|
|
131
131
|
innerRef: copyNodeRef,
|
|
@@ -136,7 +136,9 @@ export var MediaInlineCardInternal = function MediaInlineCardInternal(_ref) {
|
|
|
136
136
|
|
|
137
137
|
// Empty file handling
|
|
138
138
|
if (fileState && !fileState.name) {
|
|
139
|
-
var _error = new MediaCardError('metadata-fetch', new FileFetcherError('emptyFileName',
|
|
139
|
+
var _error = new MediaCardError('metadata-fetch', new FileFetcherError('emptyFileName', {
|
|
140
|
+
id: fileState.id
|
|
141
|
+
}));
|
|
140
142
|
!isFailedEventSent && fireFailedOperationalEvent(_error);
|
|
141
143
|
return /*#__PURE__*/React.createElement(MediaInlineCardErroredView, {
|
|
142
144
|
innerRef: copyNodeRef,
|
|
@@ -20,7 +20,7 @@ export var getSucceededStatusPayload = function getSucceededStatusPayload(fileSt
|
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
22
|
};
|
|
23
|
-
export var getErrorStatusPayload = function getErrorStatusPayload(error, fileState) {
|
|
23
|
+
export var getErrorStatusPayload = function getErrorStatusPayload(fileId, error, fileState) {
|
|
24
24
|
return {
|
|
25
25
|
eventType: 'operational',
|
|
26
26
|
action: 'failed',
|
|
@@ -28,13 +28,13 @@ export var getErrorStatusPayload = function getErrorStatusPayload(error, fileSta
|
|
|
28
28
|
attributes: _objectSpread({
|
|
29
29
|
status: 'fail',
|
|
30
30
|
fileAttributes: {
|
|
31
|
-
fileId:
|
|
31
|
+
fileId: fileId,
|
|
32
32
|
fileStatus: fileState === null || fileState === void 0 ? void 0 : fileState.status
|
|
33
33
|
}
|
|
34
34
|
}, extractErrorInfo(error))
|
|
35
35
|
};
|
|
36
36
|
};
|
|
37
|
-
export var getFailedProcessingStatusPayload = function getFailedProcessingStatusPayload(fileState) {
|
|
37
|
+
export var getFailedProcessingStatusPayload = function getFailedProcessingStatusPayload(fileId, fileState) {
|
|
38
38
|
return {
|
|
39
39
|
eventType: 'operational',
|
|
40
40
|
action: 'failed',
|
|
@@ -42,7 +42,7 @@ export var getFailedProcessingStatusPayload = function getFailedProcessingStatus
|
|
|
42
42
|
attributes: {
|
|
43
43
|
status: 'fail',
|
|
44
44
|
fileAttributes: {
|
|
45
|
-
fileId:
|
|
45
|
+
fileId: fileId,
|
|
46
46
|
fileStatus: fileState === null || fileState === void 0 ? void 0 : fileState.status
|
|
47
47
|
},
|
|
48
48
|
failReason: 'failed-processing'
|
|
@@ -53,7 +53,7 @@ export var fireFailedOperationalEvent = function fireFailedOperationalEvent(file
|
|
|
53
53
|
var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new MediaCardError('missing-error-data');
|
|
54
54
|
var failReason = arguments.length > 2 ? arguments[2] : undefined;
|
|
55
55
|
var createAnalyticsEvent = arguments.length > 3 ? arguments[3] : undefined;
|
|
56
|
-
var payload = failReason ? getFailedProcessingStatusPayload(fileState) : getErrorStatusPayload(error, fileState);
|
|
56
|
+
var payload = failReason ? getFailedProcessingStatusPayload((fileState === null || fileState === void 0 ? void 0 : fileState.id) || 'unknown-id', fileState) : getErrorStatusPayload((fileState === null || fileState === void 0 ? void 0 : fileState.id) || 'unknown-id', error, fileState);
|
|
57
57
|
fireMediaCardEvent(payload, createAnalyticsEvent);
|
|
58
58
|
};
|
|
59
59
|
export var fireSucceededOperationalEvent = function fireSucceededOperationalEvent(fileState, createAnalyticsEvent) {
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
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; }
|
|
3
3
|
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; }
|
|
4
|
-
import {
|
|
5
|
-
import { isMediaFileStateError, getFileStateErrorReason } from '@atlaskit/media-client-react';
|
|
4
|
+
import { isCommonMediaClientError } from '@atlaskit/media-client';
|
|
6
5
|
import { ANALYTICS_MEDIA_CHANNEL, sanitiseAnalyticsPayload } from '@atlaskit/media-common/analytics';
|
|
7
6
|
import { createAndFireEvent } from '@atlaskit/analytics-next';
|
|
8
|
-
import { isKnownErrorType } from '../../errors';
|
|
9
7
|
export var getFileAttributes = function getFileAttributes(metadata, fileStatus) {
|
|
10
8
|
return {
|
|
11
9
|
fileMediatype: metadata.mediaType,
|
|
@@ -91,47 +89,33 @@ export var getRenderFailedExternalUriPayload = function getRenderFailedExternalU
|
|
|
91
89
|
};
|
|
92
90
|
};
|
|
93
91
|
export var getRenderErrorFailReason = function getRenderErrorFailReason(error) {
|
|
94
|
-
|
|
95
|
-
return error.primaryReason;
|
|
96
|
-
} else {
|
|
97
|
-
return 'nativeError';
|
|
98
|
-
}
|
|
92
|
+
return error.primaryReason || 'nativeError';
|
|
99
93
|
};
|
|
100
94
|
export var getRenderErrorErrorReason = function getRenderErrorErrorReason(error) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
return mediaClientReason;
|
|
105
|
-
}
|
|
95
|
+
var secondaryError = error.secondaryError;
|
|
96
|
+
if (isCommonMediaClientError(secondaryError)) {
|
|
97
|
+
return secondaryError.reason;
|
|
106
98
|
}
|
|
107
99
|
return 'nativeError';
|
|
108
100
|
};
|
|
109
101
|
export var getRenderErrorErrorDetail = function getRenderErrorErrorDetail(error) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
return error.message;
|
|
102
|
+
var secondaryError = error.secondaryError;
|
|
103
|
+
if (secondaryError instanceof Error) {
|
|
104
|
+
return secondaryError.message;
|
|
114
105
|
}
|
|
106
|
+
return error.message;
|
|
115
107
|
};
|
|
116
108
|
export var getErrorTraceContext = function getErrorTraceContext(error) {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
} else if (isMediaFileStateError(error.secondaryError)) {
|
|
122
|
-
var _error$secondaryError2;
|
|
123
|
-
return (_error$secondaryError2 = error.secondaryError.details) === null || _error$secondaryError2 === void 0 || (_error$secondaryError2 = _error$secondaryError2.metadata) === null || _error$secondaryError2 === void 0 ? void 0 : _error$secondaryError2.traceContext;
|
|
124
|
-
}
|
|
109
|
+
var secondaryError = error.secondaryError;
|
|
110
|
+
if (isCommonMediaClientError(secondaryError)) {
|
|
111
|
+
var _secondaryError$metad;
|
|
112
|
+
return (_secondaryError$metad = secondaryError.metadata) === null || _secondaryError$metad === void 0 ? void 0 : _secondaryError$metad.traceContext;
|
|
125
113
|
}
|
|
126
114
|
};
|
|
127
115
|
export var getRenderErrorRequestMetadata = function getRenderErrorRequestMetadata(error) {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
} else if (isMediaFileStateError(error.secondaryError)) {
|
|
132
|
-
var _error$secondaryError3;
|
|
133
|
-
return (_error$secondaryError3 = error.secondaryError.details) === null || _error$secondaryError3 === void 0 ? void 0 : _error$secondaryError3.metadata;
|
|
134
|
-
}
|
|
116
|
+
var secondaryError = error.secondaryError;
|
|
117
|
+
if (isCommonMediaClientError(secondaryError)) {
|
|
118
|
+
return secondaryError.metadata;
|
|
135
119
|
}
|
|
136
120
|
};
|
|
137
121
|
export var extractErrorInfo = function extractErrorInfo(error, metadataTraceContext) {
|
|
@@ -8,7 +8,7 @@ import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
|
|
|
8
8
|
import { MediaCardError } from '../errors';
|
|
9
9
|
import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
|
|
10
10
|
var packageName = "@atlaskit/media-card";
|
|
11
|
-
var packageVersion = "78.18.
|
|
11
|
+
var packageVersion = "78.18.3";
|
|
12
12
|
var concurrentExperience;
|
|
13
13
|
var getExperience = function getExperience(id) {
|
|
14
14
|
if (!concurrentExperience) {
|
package/dist/types/errors.d.ts
CHANGED
|
@@ -36,7 +36,6 @@ export declare class ImageLoadError extends MediaCardError {
|
|
|
36
36
|
constructor(source?: CardPreview['source']);
|
|
37
37
|
}
|
|
38
38
|
export declare function isMediaCardError(err: Error): err is MediaCardError;
|
|
39
|
-
export declare function isKnownErrorType(err: Error): boolean;
|
|
40
39
|
export declare const isLocalPreviewError: (err: Error) => err is LocalPreviewError;
|
|
41
40
|
export declare const isRemotePreviewError: (err: Error) => err is LocalPreviewError;
|
|
42
41
|
export declare const isUnsupportedLocalPreviewError: (err: Error) => boolean;
|
|
@@ -3,7 +3,7 @@ import { type RenderInlineCardFailedEventPayload, type RenderInlineCardSucceeded
|
|
|
3
3
|
import { MediaCardError } from '../errors';
|
|
4
4
|
import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
|
|
5
5
|
export declare const getSucceededStatusPayload: (fileState?: FileState) => RenderInlineCardSucceededEventPayload;
|
|
6
|
-
export declare const getErrorStatusPayload: (error: MediaCardError, fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
7
|
-
export declare const getFailedProcessingStatusPayload: (fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
6
|
+
export declare const getErrorStatusPayload: (fileId: string, error: MediaCardError, fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
7
|
+
export declare const getFailedProcessingStatusPayload: (fileId: string, fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
8
8
|
export declare const fireFailedOperationalEvent: (fileState: FileState, error?: MediaCardError, failReason?: 'failed-processing', createAnalyticsEvent?: CreateUIAnalyticsEvent) => void;
|
|
9
9
|
export declare const fireSucceededOperationalEvent: (fileState: FileState, createAnalyticsEvent?: CreateUIAnalyticsEvent) => void;
|
|
@@ -36,7 +36,6 @@ export declare class ImageLoadError extends MediaCardError {
|
|
|
36
36
|
constructor(source?: CardPreview['source']);
|
|
37
37
|
}
|
|
38
38
|
export declare function isMediaCardError(err: Error): err is MediaCardError;
|
|
39
|
-
export declare function isKnownErrorType(err: Error): boolean;
|
|
40
39
|
export declare const isLocalPreviewError: (err: Error) => err is LocalPreviewError;
|
|
41
40
|
export declare const isRemotePreviewError: (err: Error) => err is LocalPreviewError;
|
|
42
41
|
export declare const isUnsupportedLocalPreviewError: (err: Error) => boolean;
|
|
@@ -3,7 +3,7 @@ import { type RenderInlineCardFailedEventPayload, type RenderInlineCardSucceeded
|
|
|
3
3
|
import { MediaCardError } from '../errors';
|
|
4
4
|
import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
|
|
5
5
|
export declare const getSucceededStatusPayload: (fileState?: FileState) => RenderInlineCardSucceededEventPayload;
|
|
6
|
-
export declare const getErrorStatusPayload: (error: MediaCardError, fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
7
|
-
export declare const getFailedProcessingStatusPayload: (fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
6
|
+
export declare const getErrorStatusPayload: (fileId: string, error: MediaCardError, fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
7
|
+
export declare const getFailedProcessingStatusPayload: (fileId: string, fileState?: FileState) => RenderInlineCardFailedEventPayload;
|
|
8
8
|
export declare const fireFailedOperationalEvent: (fileState: FileState, error?: MediaCardError, failReason?: 'failed-processing', createAnalyticsEvent?: CreateUIAnalyticsEvent) => void;
|
|
9
9
|
export declare const fireSucceededOperationalEvent: (fileState: FileState, createAnalyticsEvent?: CreateUIAnalyticsEvent) => void;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/media-card",
|
|
3
|
-
"version": "78.18.
|
|
3
|
+
"version": "78.18.3",
|
|
4
4
|
"description": "Includes all media card related components, CardView, CardViewSmall, Card...",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@atlaskit/dropdown-menu": "^12.24.0",
|
|
40
40
|
"@atlaskit/editor-shared-styles": "^3.2.0",
|
|
41
41
|
"@atlaskit/icon": "^23.4.0",
|
|
42
|
-
"@atlaskit/media-client": "^
|
|
42
|
+
"@atlaskit/media-client": "^30.0.0",
|
|
43
43
|
"@atlaskit/media-client-react": "^2.6.0",
|
|
44
44
|
"@atlaskit/media-common": "^11.7.0",
|
|
45
45
|
"@atlaskit/media-file-preview": "^0.9.0",
|
|
@@ -76,8 +76,8 @@
|
|
|
76
76
|
"@atlaskit/inline-message": "^13.0.0",
|
|
77
77
|
"@atlaskit/media-core": "^34.4.0",
|
|
78
78
|
"@atlaskit/media-picker": "^67.0.0",
|
|
79
|
-
"@atlaskit/media-state": "^1.
|
|
80
|
-
"@atlaskit/media-test-data": "^2.
|
|
79
|
+
"@atlaskit/media-state": "^1.5.0",
|
|
80
|
+
"@atlaskit/media-test-data": "^2.9.0",
|
|
81
81
|
"@atlaskit/media-test-helpers": "^34.7.0",
|
|
82
82
|
"@atlaskit/radio": "^7.0.0",
|
|
83
83
|
"@atlaskit/range": "^8.0.0",
|