@atlaskit/media-picker 64.0.1 → 64.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/dist/cjs/components/browser/browser.js +3 -1
- package/dist/cjs/components/clipboard/clipboard.js +3 -1
- package/dist/cjs/components/component.js +9 -6
- package/dist/cjs/components/dropzone/dropzone.js +3 -1
- package/dist/cjs/components/localUploadReact.js +22 -13
- package/dist/cjs/service/uploadServiceImpl.js +19 -11
- package/dist/cjs/util/analytics.js +1 -2
- package/dist/cjs/util/ufoExperiences.js +1 -1
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/components/browser/browser.js +1 -0
- package/dist/es2019/components/clipboard/clipboard.js +1 -0
- package/dist/es2019/components/component.js +9 -6
- package/dist/es2019/components/dropzone/dropzone.js +1 -0
- package/dist/es2019/components/localUploadReact.js +24 -12
- package/dist/es2019/service/uploadServiceImpl.js +17 -10
- package/dist/es2019/util/analytics.js +1 -2
- package/dist/es2019/util/ufoExperiences.js +1 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/components/browser/browser.js +1 -0
- package/dist/esm/components/clipboard/clipboard.js +1 -0
- package/dist/esm/components/component.js +9 -6
- package/dist/esm/components/dropzone/dropzone.js +1 -0
- package/dist/esm/components/localUploadReact.js +22 -13
- package/dist/esm/service/uploadServiceImpl.js +18 -11
- package/dist/esm/util/analytics.js +1 -2
- package/dist/esm/util/ufoExperiences.js +1 -1
- package/dist/esm/version.json +1 -1
- package/dist/types/components/browser/browser.d.ts +5 -0
- package/dist/types/components/clipboard/clipboard.d.ts +1 -1
- package/dist/types/components/component.d.ts +7 -6
- package/dist/types/components/dropzone/dropzone.d.ts +1 -0
- package/dist/types/types.d.ts +4 -1
- package/package.json +6 -6
- package/report.api.md +21 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/media-picker
|
|
2
2
|
|
|
3
|
+
## 64.1.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 64.1.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- [`3d40d5e9b37`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3d40d5e9b37) - Add traceId for media picker when uploading file(s)
|
|
14
|
+
- [`9ba2183f9e6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9ba2183f9e6) - Updated Media-Picker documentation with new tab structure and simpler usage example
|
|
15
|
+
- [`0bccac57db6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0bccac57db6) - remove mediaUploadApiV2 Feature flag
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 64.0.1
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.BrowserBase = exports.Browser = void 0;
|
|
8
|
+
exports.default = exports.BrowserBase = exports.Browser = void 0;
|
|
9
9
|
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
|
|
@@ -181,6 +181,8 @@ exports.BrowserBase = BrowserBase;
|
|
|
181
181
|
(0, _defineProperty2.default)(BrowserBase, "defaultProps", {
|
|
182
182
|
config: defaultConfig
|
|
183
183
|
});
|
|
184
|
+
var _default = BrowserBase;
|
|
185
|
+
exports.default = _default;
|
|
184
186
|
var Browser = (0, _mediaCommon.withMediaAnalyticsContext)((0, _analytics.getPackageAttributes)(COMPONENT_NAME), {
|
|
185
187
|
filterFeatureFlags: _analytics.LOGGED_FEATURE_FLAGS
|
|
186
188
|
})((0, _analyticsNext.withAnalyticsEvents)()(BrowserBase));
|
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.getFilesFromClipboard = exports.ClipboardBase = exports.Clipboard = void 0;
|
|
8
|
+
exports.getFilesFromClipboard = exports.default = exports.ClipboardBase = exports.Clipboard = void 0;
|
|
9
9
|
|
|
10
10
|
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
11
11
|
|
|
@@ -199,6 +199,8 @@ exports.ClipboardBase = ClipboardBase;
|
|
|
199
199
|
(0, _defineProperty2.default)(ClipboardBase, "defaultProps", {
|
|
200
200
|
config: defaultConfig
|
|
201
201
|
});
|
|
202
|
+
var _default = ClipboardBase;
|
|
203
|
+
exports.default = _default;
|
|
202
204
|
var Clipboard = (0, _mediaCommon.withMediaAnalyticsContext)((0, _analytics.getPackageAttributes)(COMPONENT_NAME), {
|
|
203
205
|
filterFeatureFlags: _analytics.LOGGED_FEATURE_FLAGS
|
|
204
206
|
})((0, _analyticsNext.withAnalyticsEvents)()(ClipboardBase));
|
|
@@ -49,9 +49,10 @@ var UploadComponent = /*#__PURE__*/function (_GenericEventEmitter) {
|
|
|
49
49
|
}
|
|
50
50
|
}, {
|
|
51
51
|
key: "emitUploadsStart",
|
|
52
|
-
value: function emitUploadsStart(files) {
|
|
52
|
+
value: function emitUploadsStart(files, traceContext) {
|
|
53
53
|
this.emit('uploads-start', {
|
|
54
|
-
files: files
|
|
54
|
+
files: files,
|
|
55
|
+
traceContext: traceContext
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
58
|
}, {
|
|
@@ -64,17 +65,19 @@ var UploadComponent = /*#__PURE__*/function (_GenericEventEmitter) {
|
|
|
64
65
|
}
|
|
65
66
|
}, {
|
|
66
67
|
key: "emitUploadEnd",
|
|
67
|
-
value: function emitUploadEnd(file) {
|
|
68
|
+
value: function emitUploadEnd(file, traceContext) {
|
|
68
69
|
this.emit('upload-end', {
|
|
69
|
-
file: file
|
|
70
|
+
file: file,
|
|
71
|
+
traceContext: traceContext
|
|
70
72
|
});
|
|
71
73
|
}
|
|
72
74
|
}, {
|
|
73
75
|
key: "emitUploadError",
|
|
74
|
-
value: function emitUploadError(fileId, error) {
|
|
76
|
+
value: function emitUploadError(fileId, error, traceContext) {
|
|
75
77
|
this.emit('upload-error', {
|
|
76
78
|
fileId: fileId,
|
|
77
|
-
error: error
|
|
79
|
+
error: error,
|
|
80
|
+
traceContext: traceContext
|
|
78
81
|
});
|
|
79
82
|
}
|
|
80
83
|
}]);
|
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.DropzoneBase = exports.Dropzone = void 0;
|
|
8
|
+
exports.default = exports.DropzoneBase = exports.Dropzone = void 0;
|
|
9
9
|
|
|
10
10
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
11
|
|
|
@@ -381,6 +381,8 @@ var DropzoneBase = /*#__PURE__*/function (_LocalUploadComponent) {
|
|
|
381
381
|
}(_localUploadReact.LocalUploadComponentReact);
|
|
382
382
|
|
|
383
383
|
exports.DropzoneBase = DropzoneBase;
|
|
384
|
+
var _default = DropzoneBase;
|
|
385
|
+
exports.default = _default;
|
|
384
386
|
var Dropzone = (0, _mediaCommon.withMediaAnalyticsContext)((0, _analytics.getPackageAttributes)(COMPONENT_NAME), {
|
|
385
387
|
filterFeatureFlags: _analytics.LOGGED_FEATURE_FLAGS
|
|
386
388
|
})((0, _analyticsNext.withAnalyticsEvents)()(DropzoneBase));
|
|
@@ -57,7 +57,9 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
57
57
|
_this = _super.call(this, props);
|
|
58
58
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "uploadComponent", new _component.UploadComponent());
|
|
59
59
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fireCommencedEvent", function (payload) {
|
|
60
|
-
payload.files
|
|
60
|
+
var files = payload.files,
|
|
61
|
+
traceContext = payload.traceContext;
|
|
62
|
+
files.forEach(function (_ref) {
|
|
61
63
|
var fileId = _ref.id,
|
|
62
64
|
fileSize = _ref.size,
|
|
63
65
|
fileMimetype = _ref.type;
|
|
@@ -75,7 +77,8 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
75
77
|
fileId: fileId,
|
|
76
78
|
fileSize: fileSize,
|
|
77
79
|
fileMimetype: fileMimetype
|
|
78
|
-
}
|
|
80
|
+
},
|
|
81
|
+
traceContext: traceContext
|
|
79
82
|
}
|
|
80
83
|
});
|
|
81
84
|
|
|
@@ -86,7 +89,8 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
86
89
|
var _payload$file = payload.file,
|
|
87
90
|
fileId = _payload$file.id,
|
|
88
91
|
fileSize = _payload$file.size,
|
|
89
|
-
fileMimetype = _payload$file.type
|
|
92
|
+
fileMimetype = _payload$file.type,
|
|
93
|
+
traceContext = payload.traceContext;
|
|
90
94
|
|
|
91
95
|
var _end = (0, _perfMarks.end)("MediaPicker.fireUpload.".concat(fileId)),
|
|
92
96
|
_end$duration = _end.duration,
|
|
@@ -106,7 +110,8 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
106
110
|
fileSize: fileSize,
|
|
107
111
|
fileMimetype: fileMimetype
|
|
108
112
|
},
|
|
109
|
-
uploadDurationMsec: uploadDurationMsec
|
|
113
|
+
uploadDurationMsec: uploadDurationMsec,
|
|
114
|
+
traceContext: traceContext
|
|
110
115
|
}
|
|
111
116
|
});
|
|
112
117
|
|
|
@@ -118,13 +123,13 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
118
123
|
});
|
|
119
124
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fireUploadFailed", /*#__PURE__*/function () {
|
|
120
125
|
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(payload) {
|
|
121
|
-
var fileId, _payload$error, errorName, rawError, _end2, _end2$duration, uploadDurationMsec;
|
|
126
|
+
var fileId, _payload$error, errorName, rawError, traceContext, _end2, _end2$duration, uploadDurationMsec;
|
|
122
127
|
|
|
123
128
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
124
129
|
while (1) {
|
|
125
130
|
switch (_context.prev = _context.next) {
|
|
126
131
|
case 0:
|
|
127
|
-
fileId = payload.fileId, _payload$error = payload.error, errorName = _payload$error.name, rawError = _payload$error.rawError;
|
|
132
|
+
fileId = payload.fileId, _payload$error = payload.error, errorName = _payload$error.name, rawError = _payload$error.rawError, traceContext = payload.traceContext;
|
|
128
133
|
_end2 = (0, _perfMarks.end)("MediaPicker.fireUpload.".concat(fileId)), _end2$duration = _end2.duration, uploadDurationMsec = _end2$duration === void 0 ? -1 : _end2$duration;
|
|
129
134
|
|
|
130
135
|
_this.createAndFireAnalyticsEvent({
|
|
@@ -142,7 +147,8 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
142
147
|
fileAttributes: {
|
|
143
148
|
fileId: fileId
|
|
144
149
|
},
|
|
145
|
-
uploadDurationMsec: uploadDurationMsec
|
|
150
|
+
uploadDurationMsec: uploadDurationMsec,
|
|
151
|
+
traceContext: traceContext
|
|
146
152
|
}
|
|
147
153
|
});
|
|
148
154
|
|
|
@@ -179,9 +185,10 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
179
185
|
_this.uploadService.cancel(uniqueIdentifier);
|
|
180
186
|
});
|
|
181
187
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onFilesAdded", function (_ref3) {
|
|
182
|
-
var files = _ref3.files
|
|
188
|
+
var files = _ref3.files,
|
|
189
|
+
traceContext = _ref3.traceContext;
|
|
183
190
|
|
|
184
|
-
_this.uploadComponent.emitUploadsStart(files);
|
|
191
|
+
_this.uploadComponent.emitUploadsStart(files, traceContext);
|
|
185
192
|
});
|
|
186
193
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onFilePreviewUpdate", function (_ref4) {
|
|
187
194
|
var file = _ref4.file,
|
|
@@ -190,15 +197,17 @@ var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
190
197
|
_this.uploadComponent.emitUploadPreviewUpdate(file, preview);
|
|
191
198
|
});
|
|
192
199
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onFileConverting", function (_ref5) {
|
|
193
|
-
var file = _ref5.file
|
|
200
|
+
var file = _ref5.file,
|
|
201
|
+
traceContext = _ref5.traceContext;
|
|
194
202
|
|
|
195
|
-
_this.uploadComponent.emitUploadEnd(file);
|
|
203
|
+
_this.uploadComponent.emitUploadEnd(file, traceContext);
|
|
196
204
|
});
|
|
197
205
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onUploadError", function (_ref6) {
|
|
198
206
|
var fileId = _ref6.fileId,
|
|
199
|
-
error = _ref6.error
|
|
207
|
+
error = _ref6.error,
|
|
208
|
+
traceContext = _ref6.traceContext;
|
|
200
209
|
|
|
201
|
-
_this.uploadComponent.emitUploadError(fileId, error);
|
|
210
|
+
_this.uploadComponent.emitUploadError(fileId, error, traceContext);
|
|
202
211
|
});
|
|
203
212
|
_this.componentName = componentName;
|
|
204
213
|
var _this$props = _this.props,
|
|
@@ -31,6 +31,8 @@ var _types = require("../service/types");
|
|
|
31
31
|
|
|
32
32
|
var _getPreviewFromBlob = require("../util/getPreviewFromBlob");
|
|
33
33
|
|
|
34
|
+
var _mediaCommon = require("@atlaskit/media-common");
|
|
35
|
+
|
|
34
36
|
var UploadServiceImpl = /*#__PURE__*/function () {
|
|
35
37
|
function UploadServiceImpl(tenantMediaClient, tenantUploadParams, shouldCopyFileToRecents) {
|
|
36
38
|
var _this = this;
|
|
@@ -40,7 +42,7 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
40
42
|
_this.emitter.emit(event, payload);
|
|
41
43
|
});
|
|
42
44
|
(0, _defineProperty2.default)(this, "onFileSuccess", /*#__PURE__*/function () {
|
|
43
|
-
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(cancellableFileUpload, fileId) {
|
|
45
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(cancellableFileUpload, fileId, traceContext) {
|
|
44
46
|
var mediaFile;
|
|
45
47
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
46
48
|
while (1) {
|
|
@@ -49,7 +51,8 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
49
51
|
mediaFile = cancellableFileUpload.mediaFile;
|
|
50
52
|
|
|
51
53
|
_this.emit('file-converting', {
|
|
52
|
-
file: mediaFile
|
|
54
|
+
file: mediaFile,
|
|
55
|
+
traceContext: traceContext
|
|
53
56
|
});
|
|
54
57
|
|
|
55
58
|
cancellableFileUpload.cancel = function () {
|
|
@@ -64,11 +67,11 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
64
67
|
}, _callee);
|
|
65
68
|
}));
|
|
66
69
|
|
|
67
|
-
return function (_x, _x2) {
|
|
70
|
+
return function (_x, _x2, _x3) {
|
|
68
71
|
return _ref.apply(this, arguments);
|
|
69
72
|
};
|
|
70
73
|
}());
|
|
71
|
-
(0, _defineProperty2.default)(this, "onFileError", function (mediaFile, name, error) {
|
|
74
|
+
(0, _defineProperty2.default)(this, "onFileError", function (mediaFile, name, error, traceContext) {
|
|
72
75
|
_this.releaseCancellableFile(mediaFile);
|
|
73
76
|
|
|
74
77
|
if (error === 'canceled') {
|
|
@@ -87,7 +90,8 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
87
90
|
name: name,
|
|
88
91
|
description: description,
|
|
89
92
|
rawError: rawError
|
|
90
|
-
}
|
|
93
|
+
},
|
|
94
|
+
traceContext: traceContext
|
|
91
95
|
});
|
|
92
96
|
});
|
|
93
97
|
this.tenantMediaClient = tenantMediaClient;
|
|
@@ -158,7 +162,10 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
158
162
|
});
|
|
159
163
|
}
|
|
160
164
|
|
|
161
|
-
var
|
|
165
|
+
var traceContext = {
|
|
166
|
+
traceId: (0, _mediaCommon.getRandomHex)(8)
|
|
167
|
+
};
|
|
168
|
+
var promisedTouchFiles = mediaClient.file.touchFiles(touchFileDescriptors, collection, traceContext);
|
|
162
169
|
var cancellableFileUploads = files.map(function (fileWithSource, i) {
|
|
163
170
|
var file = fileWithSource.file,
|
|
164
171
|
source = fileWithSource.source;
|
|
@@ -182,7 +189,7 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
182
189
|
var requestError = error;
|
|
183
190
|
|
|
184
191
|
if (requestError.metadata && requestError.metadata.statusCode === 409) {
|
|
185
|
-
return mediaClient.mediaStore.createUpload(1, collection).then(function (res) {
|
|
192
|
+
return mediaClient.mediaStore.createUpload(1, collection, traceContext).then(function (res) {
|
|
186
193
|
return res.data[0].id;
|
|
187
194
|
});
|
|
188
195
|
}
|
|
@@ -204,7 +211,7 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
204
211
|
|
|
205
212
|
var controller = _this2.createUploadController();
|
|
206
213
|
|
|
207
|
-
var sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds);
|
|
214
|
+
var sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds, traceContext);
|
|
208
215
|
var mediaFile = {
|
|
209
216
|
id: id,
|
|
210
217
|
name: file.name,
|
|
@@ -236,11 +243,11 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
236
243
|
_mediaClient.globalMediaEventEmitter.emit('file-added', state);
|
|
237
244
|
}
|
|
238
245
|
|
|
239
|
-
onFileSuccess(cancellableFileUpload, id);
|
|
246
|
+
onFileSuccess(cancellableFileUpload, id, traceContext);
|
|
240
247
|
}
|
|
241
248
|
},
|
|
242
249
|
error: function error(_error) {
|
|
243
|
-
_this2.onFileError(mediaFile, 'upload_fail', _error);
|
|
250
|
+
_this2.onFileError(mediaFile, 'upload_fail', _error, traceContext);
|
|
244
251
|
}
|
|
245
252
|
});
|
|
246
253
|
_this2.cancellableFilesUploads[id] = cancellableFileUpload;
|
|
@@ -250,7 +257,8 @@ var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
250
257
|
return cancellableFileUpload.mediaFile;
|
|
251
258
|
});
|
|
252
259
|
this.emit('files-added', {
|
|
253
|
-
files: mediaFiles
|
|
260
|
+
files: mediaFiles,
|
|
261
|
+
traceContext: traceContext
|
|
254
262
|
});
|
|
255
263
|
this.emitPreviews(cancellableFileUploads);
|
|
256
264
|
}
|
|
@@ -18,11 +18,10 @@ var relevantFlags = {
|
|
|
18
18
|
observedWidth: false,
|
|
19
19
|
mediaInline: false,
|
|
20
20
|
folderUploads: true,
|
|
21
|
-
mediaUploadApiV2: true,
|
|
22
21
|
memoryCacheLogging: false
|
|
23
22
|
};
|
|
24
23
|
var packageName = "@atlaskit/media-picker";
|
|
25
|
-
var packageVersion = "64.
|
|
24
|
+
var packageVersion = "64.1.1";
|
|
26
25
|
var LOGGED_FEATURE_FLAGS = (0, _mediaCommon.filterFeatureFlagNames)(relevantFlags);
|
|
27
26
|
exports.LOGGED_FEATURE_FLAGS = LOGGED_FEATURE_FLAGS;
|
|
28
27
|
var LOGGED_FEATURE_FLAG_KEYS = (0, _mediaCommon.filterFeatureFlagKeysAllProducts)(relevantFlags);
|
|
@@ -20,7 +20,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
20
20
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
21
21
|
|
|
22
22
|
var packageName = "@atlaskit/media-picker";
|
|
23
|
-
var packageVersion = "64.
|
|
23
|
+
var packageVersion = "64.1.1";
|
|
24
24
|
var ufoExperience;
|
|
25
25
|
|
|
26
26
|
var initExperience = function initExperience(id, componentName) {
|
package/dist/cjs/version.json
CHANGED
|
@@ -152,6 +152,7 @@ _defineProperty(BrowserBase, "defaultProps", {
|
|
|
152
152
|
config: defaultConfig
|
|
153
153
|
});
|
|
154
154
|
|
|
155
|
+
export default BrowserBase;
|
|
155
156
|
export const Browser = withMediaAnalyticsContext(getPackageAttributes(COMPONENT_NAME), {
|
|
156
157
|
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
157
158
|
})(withAnalyticsEvents()(BrowserBase));
|
|
@@ -146,6 +146,7 @@ _defineProperty(ClipboardBase, "defaultProps", {
|
|
|
146
146
|
config: defaultConfig
|
|
147
147
|
});
|
|
148
148
|
|
|
149
|
+
export default ClipboardBase;
|
|
149
150
|
export const Clipboard = withMediaAnalyticsContext(getPackageAttributes(COMPONENT_NAME), {
|
|
150
151
|
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
151
152
|
})(withAnalyticsEvents()(ClipboardBase));
|
|
@@ -13,9 +13,10 @@ export class UploadComponent extends GenericEventEmitter {
|
|
|
13
13
|
this.emit('plugin-items-inserted', payload);
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
emitUploadsStart(files) {
|
|
16
|
+
emitUploadsStart(files, traceContext) {
|
|
17
17
|
this.emit('uploads-start', {
|
|
18
|
-
files
|
|
18
|
+
files,
|
|
19
|
+
traceContext
|
|
19
20
|
});
|
|
20
21
|
}
|
|
21
22
|
|
|
@@ -26,16 +27,18 @@ export class UploadComponent extends GenericEventEmitter {
|
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
29
|
|
|
29
|
-
emitUploadEnd(file) {
|
|
30
|
+
emitUploadEnd(file, traceContext) {
|
|
30
31
|
this.emit('upload-end', {
|
|
31
|
-
file
|
|
32
|
+
file,
|
|
33
|
+
traceContext
|
|
32
34
|
});
|
|
33
35
|
}
|
|
34
36
|
|
|
35
|
-
emitUploadError(fileId, error) {
|
|
37
|
+
emitUploadError(fileId, error, traceContext) {
|
|
36
38
|
this.emit('upload-error', {
|
|
37
39
|
fileId,
|
|
38
|
-
error
|
|
40
|
+
error,
|
|
41
|
+
traceContext
|
|
39
42
|
});
|
|
40
43
|
}
|
|
41
44
|
|
|
@@ -280,6 +280,7 @@ export class DropzoneBase extends LocalUploadComponentReact {
|
|
|
280
280
|
}
|
|
281
281
|
|
|
282
282
|
}
|
|
283
|
+
export default DropzoneBase;
|
|
283
284
|
export const Dropzone = withMediaAnalyticsContext(getPackageAttributes(COMPONENT_NAME), {
|
|
284
285
|
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
285
286
|
})(withAnalyticsEvents()(DropzoneBase));
|
|
@@ -14,7 +14,11 @@ export class LocalUploadComponentReact extends Component {
|
|
|
14
14
|
_defineProperty(this, "uploadComponent", new UploadComponent());
|
|
15
15
|
|
|
16
16
|
_defineProperty(this, "fireCommencedEvent", payload => {
|
|
17
|
-
|
|
17
|
+
const {
|
|
18
|
+
files,
|
|
19
|
+
traceContext
|
|
20
|
+
} = payload;
|
|
21
|
+
files.forEach(({
|
|
18
22
|
id: fileId,
|
|
19
23
|
size: fileSize,
|
|
20
24
|
type: fileMimetype
|
|
@@ -32,7 +36,8 @@ export class LocalUploadComponentReact extends Component {
|
|
|
32
36
|
fileId,
|
|
33
37
|
fileSize,
|
|
34
38
|
fileMimetype
|
|
35
|
-
}
|
|
39
|
+
},
|
|
40
|
+
traceContext
|
|
36
41
|
}
|
|
37
42
|
});
|
|
38
43
|
startMediaUploadUfoExperience(fileId, this.componentName);
|
|
@@ -45,7 +50,8 @@ export class LocalUploadComponentReact extends Component {
|
|
|
45
50
|
id: fileId,
|
|
46
51
|
size: fileSize,
|
|
47
52
|
type: fileMimetype
|
|
48
|
-
}
|
|
53
|
+
},
|
|
54
|
+
traceContext
|
|
49
55
|
} = payload;
|
|
50
56
|
const {
|
|
51
57
|
duration: uploadDurationMsec = -1
|
|
@@ -64,7 +70,8 @@ export class LocalUploadComponentReact extends Component {
|
|
|
64
70
|
fileSize,
|
|
65
71
|
fileMimetype
|
|
66
72
|
},
|
|
67
|
-
uploadDurationMsec
|
|
73
|
+
uploadDurationMsec,
|
|
74
|
+
traceContext
|
|
68
75
|
}
|
|
69
76
|
});
|
|
70
77
|
succeedMediaUploadUfoExperience(fileId, {
|
|
@@ -80,7 +87,8 @@ export class LocalUploadComponentReact extends Component {
|
|
|
80
87
|
error: {
|
|
81
88
|
name: errorName,
|
|
82
89
|
rawError
|
|
83
|
-
}
|
|
90
|
+
},
|
|
91
|
+
traceContext
|
|
84
92
|
} = payload;
|
|
85
93
|
const {
|
|
86
94
|
duration: uploadDurationMsec = -1
|
|
@@ -100,7 +108,8 @@ export class LocalUploadComponentReact extends Component {
|
|
|
100
108
|
fileAttributes: {
|
|
101
109
|
fileId
|
|
102
110
|
},
|
|
103
|
-
uploadDurationMsec
|
|
111
|
+
uploadDurationMsec,
|
|
112
|
+
traceContext
|
|
104
113
|
}
|
|
105
114
|
});
|
|
106
115
|
failMediaUploadUfoExperience(fileId, {
|
|
@@ -129,9 +138,10 @@ export class LocalUploadComponentReact extends Component {
|
|
|
129
138
|
});
|
|
130
139
|
|
|
131
140
|
_defineProperty(this, "onFilesAdded", ({
|
|
132
|
-
files
|
|
141
|
+
files,
|
|
142
|
+
traceContext
|
|
133
143
|
}) => {
|
|
134
|
-
this.uploadComponent.emitUploadsStart(files);
|
|
144
|
+
this.uploadComponent.emitUploadsStart(files, traceContext);
|
|
135
145
|
});
|
|
136
146
|
|
|
137
147
|
_defineProperty(this, "onFilePreviewUpdate", ({
|
|
@@ -142,16 +152,18 @@ export class LocalUploadComponentReact extends Component {
|
|
|
142
152
|
});
|
|
143
153
|
|
|
144
154
|
_defineProperty(this, "onFileConverting", ({
|
|
145
|
-
file
|
|
155
|
+
file,
|
|
156
|
+
traceContext
|
|
146
157
|
}) => {
|
|
147
|
-
this.uploadComponent.emitUploadEnd(file);
|
|
158
|
+
this.uploadComponent.emitUploadEnd(file, traceContext);
|
|
148
159
|
});
|
|
149
160
|
|
|
150
161
|
_defineProperty(this, "onUploadError", ({
|
|
151
162
|
fileId,
|
|
152
|
-
error
|
|
163
|
+
error,
|
|
164
|
+
traceContext
|
|
153
165
|
}) => {
|
|
154
|
-
this.uploadComponent.emitUploadError(fileId, error);
|
|
166
|
+
this.uploadComponent.emitUploadError(fileId, error, traceContext);
|
|
155
167
|
});
|
|
156
168
|
|
|
157
169
|
this.componentName = componentName;
|
|
@@ -6,18 +6,20 @@ import { EventEmitter2 } from 'eventemitter2';
|
|
|
6
6
|
import { getPreviewFromImage } from '../util/getPreviewFromImage';
|
|
7
7
|
import { LocalFileSource } from '../service/types';
|
|
8
8
|
import { getPreviewFromBlob } from '../util/getPreviewFromBlob';
|
|
9
|
+
import { getRandomHex } from '@atlaskit/media-common';
|
|
9
10
|
export class UploadServiceImpl {
|
|
10
11
|
constructor(tenantMediaClient, tenantUploadParams, shouldCopyFileToRecents) {
|
|
11
12
|
_defineProperty(this, "emit", (event, payload) => {
|
|
12
13
|
this.emitter.emit(event, payload);
|
|
13
14
|
});
|
|
14
15
|
|
|
15
|
-
_defineProperty(this, "onFileSuccess", async (cancellableFileUpload, fileId) => {
|
|
16
|
+
_defineProperty(this, "onFileSuccess", async (cancellableFileUpload, fileId, traceContext) => {
|
|
16
17
|
const {
|
|
17
18
|
mediaFile
|
|
18
19
|
} = cancellableFileUpload;
|
|
19
20
|
this.emit('file-converting', {
|
|
20
|
-
file: mediaFile
|
|
21
|
+
file: mediaFile,
|
|
22
|
+
traceContext
|
|
21
23
|
});
|
|
22
24
|
|
|
23
25
|
cancellableFileUpload.cancel = () => {
|
|
@@ -25,7 +27,7 @@ export class UploadServiceImpl {
|
|
|
25
27
|
};
|
|
26
28
|
});
|
|
27
29
|
|
|
28
|
-
_defineProperty(this, "onFileError", (mediaFile, name, error) => {
|
|
30
|
+
_defineProperty(this, "onFileError", (mediaFile, name, error, traceContext) => {
|
|
29
31
|
this.releaseCancellableFile(mediaFile);
|
|
30
32
|
|
|
31
33
|
if (error === 'canceled') {
|
|
@@ -43,7 +45,8 @@ export class UploadServiceImpl {
|
|
|
43
45
|
name,
|
|
44
46
|
description,
|
|
45
47
|
rawError
|
|
46
|
-
}
|
|
48
|
+
},
|
|
49
|
+
traceContext
|
|
47
50
|
});
|
|
48
51
|
});
|
|
49
52
|
|
|
@@ -109,7 +112,10 @@ export class UploadServiceImpl {
|
|
|
109
112
|
});
|
|
110
113
|
}
|
|
111
114
|
|
|
112
|
-
const
|
|
115
|
+
const traceContext = {
|
|
116
|
+
traceId: getRandomHex(8)
|
|
117
|
+
};
|
|
118
|
+
const promisedTouchFiles = mediaClient.file.touchFiles(touchFileDescriptors, collection, traceContext);
|
|
113
119
|
const cancellableFileUploads = files.map((fileWithSource, i) => {
|
|
114
120
|
const {
|
|
115
121
|
file,
|
|
@@ -134,7 +140,7 @@ export class UploadServiceImpl {
|
|
|
134
140
|
const requestError = error;
|
|
135
141
|
|
|
136
142
|
if (requestError.metadata && requestError.metadata.statusCode === 409) {
|
|
137
|
-
return mediaClient.mediaStore.createUpload(1, collection).then(res => {
|
|
143
|
+
return mediaClient.mediaStore.createUpload(1, collection, traceContext).then(res => {
|
|
138
144
|
return res.data[0].id;
|
|
139
145
|
});
|
|
140
146
|
}
|
|
@@ -154,7 +160,7 @@ export class UploadServiceImpl {
|
|
|
154
160
|
deferredUploadId
|
|
155
161
|
};
|
|
156
162
|
const controller = this.createUploadController();
|
|
157
|
-
const sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds);
|
|
163
|
+
const sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds, traceContext);
|
|
158
164
|
const mediaFile = {
|
|
159
165
|
id,
|
|
160
166
|
name: file.name,
|
|
@@ -183,12 +189,12 @@ export class UploadServiceImpl {
|
|
|
183
189
|
globalMediaEventEmitter.emit('file-added', state);
|
|
184
190
|
}
|
|
185
191
|
|
|
186
|
-
onFileSuccess(cancellableFileUpload, id);
|
|
192
|
+
onFileSuccess(cancellableFileUpload, id, traceContext);
|
|
187
193
|
}
|
|
188
194
|
},
|
|
189
195
|
|
|
190
196
|
error: error => {
|
|
191
|
-
this.onFileError(mediaFile, 'upload_fail', error);
|
|
197
|
+
this.onFileError(mediaFile, 'upload_fail', error, traceContext);
|
|
192
198
|
}
|
|
193
199
|
});
|
|
194
200
|
this.cancellableFilesUploads[id] = cancellableFileUpload;
|
|
@@ -196,7 +202,8 @@ export class UploadServiceImpl {
|
|
|
196
202
|
});
|
|
197
203
|
const mediaFiles = cancellableFileUploads.map(cancellableFileUpload => cancellableFileUpload.mediaFile);
|
|
198
204
|
this.emit('files-added', {
|
|
199
|
-
files: mediaFiles
|
|
205
|
+
files: mediaFiles,
|
|
206
|
+
traceContext
|
|
200
207
|
});
|
|
201
208
|
this.emitPreviews(cancellableFileUploads);
|
|
202
209
|
}
|
|
@@ -8,11 +8,10 @@ const relevantFlags = {
|
|
|
8
8
|
observedWidth: false,
|
|
9
9
|
mediaInline: false,
|
|
10
10
|
folderUploads: true,
|
|
11
|
-
mediaUploadApiV2: true,
|
|
12
11
|
memoryCacheLogging: false
|
|
13
12
|
};
|
|
14
13
|
const packageName = "@atlaskit/media-picker";
|
|
15
|
-
const packageVersion = "64.
|
|
14
|
+
const packageVersion = "64.1.1";
|
|
16
15
|
export const LOGGED_FEATURE_FLAGS = filterFeatureFlagNames(relevantFlags);
|
|
17
16
|
export const LOGGED_FEATURE_FLAG_KEYS = filterFeatureFlagKeysAllProducts(relevantFlags);
|
|
18
17
|
export function getPackageAttributes(componentName) {
|
|
@@ -2,7 +2,7 @@ import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } fro
|
|
|
2
2
|
import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
|
|
3
3
|
import { LOGGED_FEATURE_FLAG_KEYS } from './analytics';
|
|
4
4
|
const packageName = "@atlaskit/media-picker";
|
|
5
|
-
const packageVersion = "64.
|
|
5
|
+
const packageVersion = "64.1.1";
|
|
6
6
|
let ufoExperience;
|
|
7
7
|
|
|
8
8
|
const initExperience = (id, componentName) => {
|
package/dist/es2019/version.json
CHANGED
|
@@ -165,6 +165,7 @@ _defineProperty(BrowserBase, "defaultProps", {
|
|
|
165
165
|
config: defaultConfig
|
|
166
166
|
});
|
|
167
167
|
|
|
168
|
+
export default BrowserBase;
|
|
168
169
|
export var Browser = withMediaAnalyticsContext(getPackageAttributes(COMPONENT_NAME), {
|
|
169
170
|
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
170
171
|
})(withAnalyticsEvents()(BrowserBase));
|
|
@@ -183,6 +183,7 @@ _defineProperty(ClipboardBase, "defaultProps", {
|
|
|
183
183
|
config: defaultConfig
|
|
184
184
|
});
|
|
185
185
|
|
|
186
|
+
export default ClipboardBase;
|
|
186
187
|
export var Clipboard = withMediaAnalyticsContext(getPackageAttributes(COMPONENT_NAME), {
|
|
187
188
|
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
188
189
|
})(withAnalyticsEvents()(ClipboardBase));
|
|
@@ -36,9 +36,10 @@ export var UploadComponent = /*#__PURE__*/function (_GenericEventEmitter) {
|
|
|
36
36
|
}
|
|
37
37
|
}, {
|
|
38
38
|
key: "emitUploadsStart",
|
|
39
|
-
value: function emitUploadsStart(files) {
|
|
39
|
+
value: function emitUploadsStart(files, traceContext) {
|
|
40
40
|
this.emit('uploads-start', {
|
|
41
|
-
files: files
|
|
41
|
+
files: files,
|
|
42
|
+
traceContext: traceContext
|
|
42
43
|
});
|
|
43
44
|
}
|
|
44
45
|
}, {
|
|
@@ -51,17 +52,19 @@ export var UploadComponent = /*#__PURE__*/function (_GenericEventEmitter) {
|
|
|
51
52
|
}
|
|
52
53
|
}, {
|
|
53
54
|
key: "emitUploadEnd",
|
|
54
|
-
value: function emitUploadEnd(file) {
|
|
55
|
+
value: function emitUploadEnd(file, traceContext) {
|
|
55
56
|
this.emit('upload-end', {
|
|
56
|
-
file: file
|
|
57
|
+
file: file,
|
|
58
|
+
traceContext: traceContext
|
|
57
59
|
});
|
|
58
60
|
}
|
|
59
61
|
}, {
|
|
60
62
|
key: "emitUploadError",
|
|
61
|
-
value: function emitUploadError(fileId, error) {
|
|
63
|
+
value: function emitUploadError(fileId, error, traceContext) {
|
|
62
64
|
this.emit('upload-error', {
|
|
63
65
|
fileId: fileId,
|
|
64
|
-
error: error
|
|
66
|
+
error: error,
|
|
67
|
+
traceContext: traceContext
|
|
65
68
|
});
|
|
66
69
|
}
|
|
67
70
|
}]);
|
|
@@ -371,6 +371,7 @@ export var DropzoneBase = /*#__PURE__*/function (_LocalUploadComponent) {
|
|
|
371
371
|
|
|
372
372
|
return DropzoneBase;
|
|
373
373
|
}(LocalUploadComponentReact);
|
|
374
|
+
export default DropzoneBase;
|
|
374
375
|
export var Dropzone = withMediaAnalyticsContext(getPackageAttributes(COMPONENT_NAME), {
|
|
375
376
|
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
376
377
|
})(withAnalyticsEvents()(DropzoneBase));
|
|
@@ -35,7 +35,9 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
35
35
|
_defineProperty(_assertThisInitialized(_this), "uploadComponent", new UploadComponent());
|
|
36
36
|
|
|
37
37
|
_defineProperty(_assertThisInitialized(_this), "fireCommencedEvent", function (payload) {
|
|
38
|
-
payload.files
|
|
38
|
+
var files = payload.files,
|
|
39
|
+
traceContext = payload.traceContext;
|
|
40
|
+
files.forEach(function (_ref) {
|
|
39
41
|
var fileId = _ref.id,
|
|
40
42
|
fileSize = _ref.size,
|
|
41
43
|
fileMimetype = _ref.type;
|
|
@@ -53,7 +55,8 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
53
55
|
fileId: fileId,
|
|
54
56
|
fileSize: fileSize,
|
|
55
57
|
fileMimetype: fileMimetype
|
|
56
|
-
}
|
|
58
|
+
},
|
|
59
|
+
traceContext: traceContext
|
|
57
60
|
}
|
|
58
61
|
});
|
|
59
62
|
|
|
@@ -65,7 +68,8 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
65
68
|
var _payload$file = payload.file,
|
|
66
69
|
fileId = _payload$file.id,
|
|
67
70
|
fileSize = _payload$file.size,
|
|
68
|
-
fileMimetype = _payload$file.type
|
|
71
|
+
fileMimetype = _payload$file.type,
|
|
72
|
+
traceContext = payload.traceContext;
|
|
69
73
|
|
|
70
74
|
var _end = end("MediaPicker.fireUpload.".concat(fileId)),
|
|
71
75
|
_end$duration = _end.duration,
|
|
@@ -85,7 +89,8 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
85
89
|
fileSize: fileSize,
|
|
86
90
|
fileMimetype: fileMimetype
|
|
87
91
|
},
|
|
88
|
-
uploadDurationMsec: uploadDurationMsec
|
|
92
|
+
uploadDurationMsec: uploadDurationMsec,
|
|
93
|
+
traceContext: traceContext
|
|
89
94
|
}
|
|
90
95
|
});
|
|
91
96
|
|
|
@@ -98,13 +103,13 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
98
103
|
|
|
99
104
|
_defineProperty(_assertThisInitialized(_this), "fireUploadFailed", /*#__PURE__*/function () {
|
|
100
105
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(payload) {
|
|
101
|
-
var fileId, _payload$error, errorName, rawError, _end2, _end2$duration, uploadDurationMsec;
|
|
106
|
+
var fileId, _payload$error, errorName, rawError, traceContext, _end2, _end2$duration, uploadDurationMsec;
|
|
102
107
|
|
|
103
108
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
104
109
|
while (1) {
|
|
105
110
|
switch (_context.prev = _context.next) {
|
|
106
111
|
case 0:
|
|
107
|
-
fileId = payload.fileId, _payload$error = payload.error, errorName = _payload$error.name, rawError = _payload$error.rawError;
|
|
112
|
+
fileId = payload.fileId, _payload$error = payload.error, errorName = _payload$error.name, rawError = _payload$error.rawError, traceContext = payload.traceContext;
|
|
108
113
|
_end2 = end("MediaPicker.fireUpload.".concat(fileId)), _end2$duration = _end2.duration, uploadDurationMsec = _end2$duration === void 0 ? -1 : _end2$duration;
|
|
109
114
|
|
|
110
115
|
_this.createAndFireAnalyticsEvent({
|
|
@@ -122,7 +127,8 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
122
127
|
fileAttributes: {
|
|
123
128
|
fileId: fileId
|
|
124
129
|
},
|
|
125
|
-
uploadDurationMsec: uploadDurationMsec
|
|
130
|
+
uploadDurationMsec: uploadDurationMsec,
|
|
131
|
+
traceContext: traceContext
|
|
126
132
|
}
|
|
127
133
|
});
|
|
128
134
|
|
|
@@ -162,9 +168,10 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
162
168
|
});
|
|
163
169
|
|
|
164
170
|
_defineProperty(_assertThisInitialized(_this), "onFilesAdded", function (_ref3) {
|
|
165
|
-
var files = _ref3.files
|
|
171
|
+
var files = _ref3.files,
|
|
172
|
+
traceContext = _ref3.traceContext;
|
|
166
173
|
|
|
167
|
-
_this.uploadComponent.emitUploadsStart(files);
|
|
174
|
+
_this.uploadComponent.emitUploadsStart(files, traceContext);
|
|
168
175
|
});
|
|
169
176
|
|
|
170
177
|
_defineProperty(_assertThisInitialized(_this), "onFilePreviewUpdate", function (_ref4) {
|
|
@@ -175,16 +182,18 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
|
|
|
175
182
|
});
|
|
176
183
|
|
|
177
184
|
_defineProperty(_assertThisInitialized(_this), "onFileConverting", function (_ref5) {
|
|
178
|
-
var file = _ref5.file
|
|
185
|
+
var file = _ref5.file,
|
|
186
|
+
traceContext = _ref5.traceContext;
|
|
179
187
|
|
|
180
|
-
_this.uploadComponent.emitUploadEnd(file);
|
|
188
|
+
_this.uploadComponent.emitUploadEnd(file, traceContext);
|
|
181
189
|
});
|
|
182
190
|
|
|
183
191
|
_defineProperty(_assertThisInitialized(_this), "onUploadError", function (_ref6) {
|
|
184
192
|
var fileId = _ref6.fileId,
|
|
185
|
-
error = _ref6.error
|
|
193
|
+
error = _ref6.error,
|
|
194
|
+
traceContext = _ref6.traceContext;
|
|
186
195
|
|
|
187
|
-
_this.uploadComponent.emitUploadError(fileId, error);
|
|
196
|
+
_this.uploadComponent.emitUploadError(fileId, error, traceContext);
|
|
188
197
|
});
|
|
189
198
|
|
|
190
199
|
_this.componentName = componentName;
|
|
@@ -10,6 +10,7 @@ import { EventEmitter2 } from 'eventemitter2';
|
|
|
10
10
|
import { getPreviewFromImage } from '../util/getPreviewFromImage';
|
|
11
11
|
import { LocalFileSource } from '../service/types';
|
|
12
12
|
import { getPreviewFromBlob } from '../util/getPreviewFromBlob';
|
|
13
|
+
import { getRandomHex } from '@atlaskit/media-common';
|
|
13
14
|
export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
14
15
|
function UploadServiceImpl(tenantMediaClient, tenantUploadParams, shouldCopyFileToRecents) {
|
|
15
16
|
var _this = this;
|
|
@@ -21,7 +22,7 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
21
22
|
});
|
|
22
23
|
|
|
23
24
|
_defineProperty(this, "onFileSuccess", /*#__PURE__*/function () {
|
|
24
|
-
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(cancellableFileUpload, fileId) {
|
|
25
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(cancellableFileUpload, fileId, traceContext) {
|
|
25
26
|
var mediaFile;
|
|
26
27
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
27
28
|
while (1) {
|
|
@@ -30,7 +31,8 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
30
31
|
mediaFile = cancellableFileUpload.mediaFile;
|
|
31
32
|
|
|
32
33
|
_this.emit('file-converting', {
|
|
33
|
-
file: mediaFile
|
|
34
|
+
file: mediaFile,
|
|
35
|
+
traceContext: traceContext
|
|
34
36
|
});
|
|
35
37
|
|
|
36
38
|
cancellableFileUpload.cancel = function () {
|
|
@@ -45,12 +47,12 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
45
47
|
}, _callee);
|
|
46
48
|
}));
|
|
47
49
|
|
|
48
|
-
return function (_x, _x2) {
|
|
50
|
+
return function (_x, _x2, _x3) {
|
|
49
51
|
return _ref.apply(this, arguments);
|
|
50
52
|
};
|
|
51
53
|
}());
|
|
52
54
|
|
|
53
|
-
_defineProperty(this, "onFileError", function (mediaFile, name, error) {
|
|
55
|
+
_defineProperty(this, "onFileError", function (mediaFile, name, error, traceContext) {
|
|
54
56
|
_this.releaseCancellableFile(mediaFile);
|
|
55
57
|
|
|
56
58
|
if (error === 'canceled') {
|
|
@@ -69,7 +71,8 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
69
71
|
name: name,
|
|
70
72
|
description: description,
|
|
71
73
|
rawError: rawError
|
|
72
|
-
}
|
|
74
|
+
},
|
|
75
|
+
traceContext: traceContext
|
|
73
76
|
});
|
|
74
77
|
});
|
|
75
78
|
|
|
@@ -141,7 +144,10 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
141
144
|
});
|
|
142
145
|
}
|
|
143
146
|
|
|
144
|
-
var
|
|
147
|
+
var traceContext = {
|
|
148
|
+
traceId: getRandomHex(8)
|
|
149
|
+
};
|
|
150
|
+
var promisedTouchFiles = mediaClient.file.touchFiles(touchFileDescriptors, collection, traceContext);
|
|
145
151
|
var cancellableFileUploads = files.map(function (fileWithSource, i) {
|
|
146
152
|
var file = fileWithSource.file,
|
|
147
153
|
source = fileWithSource.source;
|
|
@@ -165,7 +171,7 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
165
171
|
var requestError = error;
|
|
166
172
|
|
|
167
173
|
if (requestError.metadata && requestError.metadata.statusCode === 409) {
|
|
168
|
-
return mediaClient.mediaStore.createUpload(1, collection).then(function (res) {
|
|
174
|
+
return mediaClient.mediaStore.createUpload(1, collection, traceContext).then(function (res) {
|
|
169
175
|
return res.data[0].id;
|
|
170
176
|
});
|
|
171
177
|
}
|
|
@@ -187,7 +193,7 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
187
193
|
|
|
188
194
|
var controller = _this2.createUploadController();
|
|
189
195
|
|
|
190
|
-
var sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds);
|
|
196
|
+
var sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds, traceContext);
|
|
191
197
|
var mediaFile = {
|
|
192
198
|
id: id,
|
|
193
199
|
name: file.name,
|
|
@@ -218,11 +224,11 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
218
224
|
globalMediaEventEmitter.emit('file-added', state);
|
|
219
225
|
}
|
|
220
226
|
|
|
221
|
-
onFileSuccess(cancellableFileUpload, id);
|
|
227
|
+
onFileSuccess(cancellableFileUpload, id, traceContext);
|
|
222
228
|
}
|
|
223
229
|
},
|
|
224
230
|
error: function error(_error) {
|
|
225
|
-
_this2.onFileError(mediaFile, 'upload_fail', _error);
|
|
231
|
+
_this2.onFileError(mediaFile, 'upload_fail', _error, traceContext);
|
|
226
232
|
}
|
|
227
233
|
});
|
|
228
234
|
_this2.cancellableFilesUploads[id] = cancellableFileUpload;
|
|
@@ -232,7 +238,8 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
|
|
|
232
238
|
return cancellableFileUpload.mediaFile;
|
|
233
239
|
});
|
|
234
240
|
this.emit('files-added', {
|
|
235
|
-
files: mediaFiles
|
|
241
|
+
files: mediaFiles,
|
|
242
|
+
traceContext: traceContext
|
|
236
243
|
});
|
|
237
244
|
this.emitPreviews(cancellableFileUploads);
|
|
238
245
|
}
|
|
@@ -8,11 +8,10 @@ var relevantFlags = {
|
|
|
8
8
|
observedWidth: false,
|
|
9
9
|
mediaInline: false,
|
|
10
10
|
folderUploads: true,
|
|
11
|
-
mediaUploadApiV2: true,
|
|
12
11
|
memoryCacheLogging: false
|
|
13
12
|
};
|
|
14
13
|
var packageName = "@atlaskit/media-picker";
|
|
15
|
-
var packageVersion = "64.
|
|
14
|
+
var packageVersion = "64.1.1";
|
|
16
15
|
export var LOGGED_FEATURE_FLAGS = filterFeatureFlagNames(relevantFlags);
|
|
17
16
|
export var LOGGED_FEATURE_FLAG_KEYS = filterFeatureFlagKeysAllProducts(relevantFlags);
|
|
18
17
|
export function getPackageAttributes(componentName) {
|
|
@@ -8,7 +8,7 @@ import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } fro
|
|
|
8
8
|
import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
|
|
9
9
|
import { LOGGED_FEATURE_FLAG_KEYS } from './analytics';
|
|
10
10
|
var packageName = "@atlaskit/media-picker";
|
|
11
|
-
var packageVersion = "64.
|
|
11
|
+
var packageVersion = "64.1.1";
|
|
12
12
|
var ufoExperience;
|
|
13
13
|
|
|
14
14
|
var initExperience = function initExperience(id, componentName) {
|
package/dist/esm/version.json
CHANGED
|
@@ -3,6 +3,10 @@ import { BrowserConfig } from '../../types';
|
|
|
3
3
|
import { LocalUploadComponentReact, LocalUploadComponentBaseProps } from '../localUploadReact';
|
|
4
4
|
export interface BrowserOwnProps {
|
|
5
5
|
config: BrowserConfig;
|
|
6
|
+
/**
|
|
7
|
+
* when true, the dialog will show when the component is rendered
|
|
8
|
+
* (NOTE: without this value, no dialog will appear unless you use the **onBrowserFn** hook)
|
|
9
|
+
*/
|
|
6
10
|
isOpen?: boolean;
|
|
7
11
|
onClose?: () => void;
|
|
8
12
|
/**
|
|
@@ -27,6 +31,7 @@ export declare class BrowserBase extends LocalUploadComponentReact<BrowserProps>
|
|
|
27
31
|
browse: BrowseFn;
|
|
28
32
|
render(): JSX.Element;
|
|
29
33
|
}
|
|
34
|
+
export default BrowserBase;
|
|
30
35
|
export declare const Browser: React.ForwardRefExoticComponent<Pick<Pick<Omit<BrowserProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "mediaClient" | "onUploadsStart" | "onPreviewUpdate" | "onEnd" | "onError" | "featureFlags" | "children" | "onCancelFn" | "isOpen" | "onClose" | "onBrowseFn"> & Partial<Pick<Omit<BrowserProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "config">> & Partial<Pick<{
|
|
31
36
|
config: BrowserConfig;
|
|
32
37
|
}, never>> & React.RefAttributes<any>, "mediaClient" | "config" | "onUploadsStart" | "onPreviewUpdate" | "onEnd" | "onError" | "featureFlags" | "children" | "onCancelFn" | "key" | "isOpen" | "onClose" | "onBrowseFn"> & React.RefAttributes<any>>;
|
|
@@ -32,7 +32,7 @@ export declare class ClipboardBase extends LocalUploadComponentReact<ClipboardPr
|
|
|
32
32
|
componentWillUnmount(): void;
|
|
33
33
|
render(): null;
|
|
34
34
|
}
|
|
35
|
+
export default ClipboardBase;
|
|
35
36
|
export declare const Clipboard: import("react").ForwardRefExoticComponent<Pick<Pick<Omit<ClipboardProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "mediaClient" | "onUploadsStart" | "onPreviewUpdate" | "onEnd" | "onError" | "featureFlags"> & Partial<Pick<Omit<ClipboardProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "config">> & Partial<Pick<{
|
|
36
37
|
config: ClipboardConfig;
|
|
37
38
|
}, never>> & import("react").RefAttributes<any>, "mediaClient" | "config" | "onUploadsStart" | "onPreviewUpdate" | "onEnd" | "onError" | "featureFlags" | "key"> & import("react").RefAttributes<any>>;
|
|
38
|
-
export {};
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import { MediaFile, Preview, MediaError, UploadEventPayloadMap } from '../types';
|
|
2
2
|
import { GenericEventEmitter } from '../util/eventEmitter';
|
|
3
3
|
import { SelectedItem } from '../popup/domain';
|
|
4
|
+
import { MediaTraceContext } from '@atlaskit/media-common';
|
|
4
5
|
export interface UploadEventEmitter {
|
|
5
6
|
emitPluginItemsInserted(selectedPluginItems: SelectedItem[]): void;
|
|
6
|
-
emitUploadsStart(files: MediaFile[]): void;
|
|
7
|
+
emitUploadsStart(files: MediaFile[], traceContext?: MediaTraceContext): void;
|
|
7
8
|
emitUploadPreviewUpdate(file: MediaFile, preview: Preview): void;
|
|
8
|
-
emitUploadEnd(file: MediaFile): void;
|
|
9
|
-
emitUploadError(fileId: string, error: MediaError): void;
|
|
9
|
+
emitUploadEnd(file: MediaFile, traceContext?: MediaTraceContext): void;
|
|
10
|
+
emitUploadError(fileId: string, error: MediaError, traceContext?: MediaTraceContext): void;
|
|
10
11
|
}
|
|
11
12
|
export declare class UploadComponent<M extends UploadEventPayloadMap> extends GenericEventEmitter<M> implements UploadEventEmitter {
|
|
12
13
|
emitPluginItemsInserted(selectedPluginItems: SelectedItem[]): void;
|
|
13
|
-
emitUploadsStart(files: MediaFile[]): void;
|
|
14
|
+
emitUploadsStart(files: MediaFile[], traceContext?: MediaTraceContext): void;
|
|
14
15
|
emitUploadPreviewUpdate(file: MediaFile, preview: Preview): void;
|
|
15
|
-
emitUploadEnd(file: MediaFile): void;
|
|
16
|
-
emitUploadError(fileId: string, error: MediaError): void;
|
|
16
|
+
emitUploadEnd(file: MediaFile, traceContext?: MediaTraceContext): void;
|
|
17
|
+
emitUploadError(fileId: string, error: MediaError, traceContext?: MediaTraceContext): void;
|
|
17
18
|
}
|
|
@@ -33,4 +33,5 @@ export declare class DropzoneBase extends LocalUploadComponentReact<DropzoneProp
|
|
|
33
33
|
private fireAnalyticsEvent;
|
|
34
34
|
render(): null;
|
|
35
35
|
}
|
|
36
|
+
export default DropzoneBase;
|
|
36
37
|
export declare const Dropzone: import("react").ForwardRefExoticComponent<Pick<Omit<DropzoneProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps> & import("react").RefAttributes<any>, "mediaClient" | "config" | "onUploadsStart" | "onPreviewUpdate" | "onEnd" | "onError" | "featureFlags" | "onDrop" | "onDragEnter" | "onDragLeave" | "onCancelFn" | "key"> & import("react").RefAttributes<any>>;
|
package/dist/types/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RequestMetadata } from '@atlaskit/media-client';
|
|
2
|
-
import { UIAttributes, UIEventPayload, OperationalAttributes, SuccessAttributes, FailureAttributes, OperationalEventPayload } from '@atlaskit/media-common';
|
|
2
|
+
import { UIAttributes, UIEventPayload, OperationalAttributes, SuccessAttributes, FailureAttributes, OperationalEventPayload, MediaTraceContext } from '@atlaskit/media-common';
|
|
3
3
|
import { LocalUploadConfig } from './components/types';
|
|
4
4
|
import { PluginItemPayload } from './domain/plugin';
|
|
5
5
|
export interface UploadParams {
|
|
@@ -26,6 +26,7 @@ export declare type ImagePreview = NonImagePreview & {
|
|
|
26
26
|
export declare type Preview = NonImagePreview | ImagePreview;
|
|
27
27
|
export declare type UploadsStartEventPayload = {
|
|
28
28
|
readonly files: MediaFile[];
|
|
29
|
+
readonly traceContext?: MediaTraceContext;
|
|
29
30
|
};
|
|
30
31
|
export declare type UploadPreviewUpdateEventPayload = {
|
|
31
32
|
readonly file: MediaFile & {
|
|
@@ -35,10 +36,12 @@ export declare type UploadPreviewUpdateEventPayload = {
|
|
|
35
36
|
};
|
|
36
37
|
export declare type UploadEndEventPayload = {
|
|
37
38
|
readonly file: MediaFile;
|
|
39
|
+
readonly traceContext?: MediaTraceContext;
|
|
38
40
|
};
|
|
39
41
|
export declare type UploadErrorEventPayload = {
|
|
40
42
|
readonly fileId: string;
|
|
41
43
|
readonly error: MediaError;
|
|
44
|
+
readonly traceContext?: MediaTraceContext;
|
|
42
45
|
};
|
|
43
46
|
export declare type UploadEventPayloadMap = {
|
|
44
47
|
readonly 'plugin-items-inserted': PluginItemPayload[];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/media-picker",
|
|
3
|
-
"version": "64.
|
|
3
|
+
"version": "64.1.1",
|
|
4
4
|
"description": "Library for handling file uploads",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@atlaskit/analytics-next": "^8.2.0",
|
|
30
|
-
"@atlaskit/media-client": "^
|
|
31
|
-
"@atlaskit/media-common": "^2.
|
|
30
|
+
"@atlaskit/media-client": "^20.0.0",
|
|
31
|
+
"@atlaskit/media-common": "^2.18.0",
|
|
32
32
|
"@atlaskit/media-ui": "^22.2.0",
|
|
33
33
|
"@atlaskit/ufo": "^0.1.0",
|
|
34
34
|
"@babel/runtime": "^7.0.0",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"uuid-validate": "^0.0.3"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
|
-
"@atlaskit/media-core": "^34.0.
|
|
44
|
+
"@atlaskit/media-core": "^34.0.1",
|
|
45
45
|
"react": "^16.8.0",
|
|
46
46
|
"react-dom": "^16.8.0",
|
|
47
47
|
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"@atlaskit/button": "^16.5.0",
|
|
53
53
|
"@atlaskit/docs": "*",
|
|
54
54
|
"@atlaskit/dropdown-menu": "^11.5.0",
|
|
55
|
-
"@atlaskit/media-card": "^74.
|
|
55
|
+
"@atlaskit/media-card": "^74.4.0",
|
|
56
56
|
"@atlaskit/media-core": "^34.0.0",
|
|
57
|
-
"@atlaskit/media-test-helpers": "^30.
|
|
57
|
+
"@atlaskit/media-test-helpers": "^30.1.0",
|
|
58
58
|
"@atlaskit/spinner": "^15.3.0",
|
|
59
59
|
"@atlaskit/ssr": "*",
|
|
60
60
|
"@atlaskit/toggle": "^12.5.0",
|
package/report.api.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<!-- API Report Version: 2.
|
|
1
|
+
<!-- API Report Version: 2.3 -->
|
|
2
2
|
|
|
3
3
|
## API Report File for "@atlaskit/media-picker"
|
|
4
4
|
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
### Table of contents
|
|
9
9
|
|
|
10
10
|
- [Main Entry Types](#main-entry-types)
|
|
11
|
+
- [Peer Dependencies](#peer-dependencies)
|
|
11
12
|
|
|
12
13
|
### Main Entry Types
|
|
13
14
|
|
|
@@ -19,6 +20,7 @@
|
|
|
19
20
|
import { MediaClient } from '@atlaskit/media-client';
|
|
20
21
|
import { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
|
|
21
22
|
import { MediaFeatureFlags as MediaFeatureFlags_2 } from '@atlaskit/media-common';
|
|
23
|
+
import { MediaTraceContext } from '@atlaskit/media-common';
|
|
22
24
|
import { default as React_2 } from 'react';
|
|
23
25
|
import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
|
|
24
26
|
import { WithMediaClientConfigProps } from '@atlaskit/media-client';
|
|
@@ -62,7 +64,6 @@ interface BrowserOwnProps {
|
|
|
62
64
|
children?: (browse: () => void) => React_2.ReactChild;
|
|
63
65
|
// (undocumented)
|
|
64
66
|
config: BrowserConfig;
|
|
65
|
-
// (undocumented)
|
|
66
67
|
isOpen?: boolean;
|
|
67
68
|
onBrowseFn?: (browse: () => void) => void;
|
|
68
69
|
// (undocumented)
|
|
@@ -285,12 +286,14 @@ type State_3 = {
|
|
|
285
286
|
// @public (undocumented)
|
|
286
287
|
export type UploadEndEventPayload = {
|
|
287
288
|
readonly file: MediaFile;
|
|
289
|
+
readonly traceContext?: MediaTraceContext;
|
|
288
290
|
};
|
|
289
291
|
|
|
290
292
|
// @public (undocumented)
|
|
291
293
|
export type UploadErrorEventPayload = {
|
|
292
294
|
readonly fileId: string;
|
|
293
295
|
readonly error: MediaError_2;
|
|
296
|
+
readonly traceContext?: MediaTraceContext;
|
|
294
297
|
};
|
|
295
298
|
|
|
296
299
|
// @public (undocumented)
|
|
@@ -310,9 +313,25 @@ export type UploadPreviewUpdateEventPayload = {
|
|
|
310
313
|
// @public (undocumented)
|
|
311
314
|
export type UploadsStartEventPayload = {
|
|
312
315
|
readonly files: MediaFile[];
|
|
316
|
+
readonly traceContext?: MediaTraceContext;
|
|
313
317
|
};
|
|
314
318
|
|
|
315
319
|
// (No @packageDocumentation comment for this package)
|
|
316
320
|
```
|
|
317
321
|
|
|
318
322
|
<!--SECTION END: Main Entry Types-->
|
|
323
|
+
|
|
324
|
+
### Peer Dependencies
|
|
325
|
+
|
|
326
|
+
<!--SECTION START: Peer Dependencies-->
|
|
327
|
+
|
|
328
|
+
```json
|
|
329
|
+
{
|
|
330
|
+
"@atlaskit/media-core": "^34.0.1",
|
|
331
|
+
"react": "^16.8.0",
|
|
332
|
+
"react-dom": "^16.8.0",
|
|
333
|
+
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
334
|
+
}
|
|
335
|
+
```
|
|
336
|
+
|
|
337
|
+
<!--SECTION END: Peer Dependencies-->
|