@atlaskit/media-client 18.1.0 → 19.0.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/media-client
 
+## 19.0.0
+
+### Major Changes
+
+- [`5eb06146a4e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5eb06146a4e) - Added support traceContext to be supplied to all request endpoint points.
+
+### Patch Changes
+
+- [`358de54a124`](https://bitbucket.org/atlassian/atlassian-frontend/commits/358de54a124) - Allow collection-fetcher endpoints to pass traceContext
+
 ## 18.1.0
 
 ### Minor Changes

package/dist/cjs/client/collection-fetcher.js

@@ -90,7 +90,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
     }
   }, {
     key: "getItems",
-    value: function getItems(collectionName, params) {
+    value: function getItems(collectionName, params, traceContext) {
       var _this2 = this;
 
       if (!collectionCache[collectionName]) {
@@ -101,7 +101,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
       var subject = collection.subject;
       this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
         details: 'full'
-      })).then(function (items) {
+      }), traceContext).then(function (items) {
         var _items$data = items.data,
             contents = _items$data.contents,
             nextInclusiveStartKey = _items$data.nextInclusiveStartKey;
@@ -121,14 +121,14 @@ var CollectionFetcher = /*#__PURE__*/function () {
   }, {
     key: "removeFile",
     value: function () {
-      var _removeFile = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id, collectionName, occurrenceKey) {
+      var _removeFile = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id, collectionName, occurrenceKey, traceContext) {
         var collection;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey);
+                return this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey, traceContext);
 
               case 2:
                 this.removeFromCache(id, collectionName);
@@ -143,7 +143,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
         }, _callee, this);
       }));
 
-      function removeFile(_x, _x2, _x3) {
+      function removeFile(_x, _x2, _x3, _x4) {
         return _removeFile.apply(this, arguments);
       }
 
@@ -152,7 +152,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
   }, {
     key: "loadNextPage",
     value: function () {
-      var _loadNextPage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(collectionName, params) {
+      var _loadNextPage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(collectionName, params, traceContext) {
         var collection, isLoading, _collectionCache$coll, inclusiveStartKey, currentItems, subject, response, _response$data, contents, nextInclusiveStartKey, newItems, items;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -176,7 +176,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
                 return this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
                   inclusiveStartKey: inclusiveStartKey,
                   details: 'full'
-                }));
+                }), traceContext);
 
               case 8:
                 response = _context2.sent;
@@ -200,7 +200,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
         }, _callee2, this);
       }));
 
-      function loadNextPage(_x4, _x5) {
+      function loadNextPage(_x5, _x6, _x7) {
         return _loadNextPage.apply(this, arguments);
       }
 

package/dist/cjs/client/file-fetcher/index.js

@@ -201,22 +201,23 @@ var FileFetcherImpl = /*#__PURE__*/function () {
     key: "getFileBinaryURL",
     value: function getFileBinaryURL(id, collectionName) {
       return this.mediaStore.getFileBinaryURL(id, collectionName);
-    }
+    } // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
+
   }, {
     key: "touchFiles",
-    value: function touchFiles(descriptors, collection) {
+    value: function touchFiles(descriptors, collection, traceContext) {
       return this.mediaStore.touchFiles({
         descriptors: descriptors
       }, {
         collection: collection
-      }).then(function (_ref2) {
+      }, traceContext).then(function (_ref2) {
         var data = _ref2.data;
         return data;
       });
     }
   }, {
     key: "generateUploadableFileUpfrontIds",
-    value: function generateUploadableFileUpfrontIds(collection) {
+    value: function generateUploadableFileUpfrontIds(collection, traceContext) {
       var id = (0, _v.default)();
       var occurrenceKey = (0, _v.default)();
       var touchFileDescriptor = {
@@ -224,7 +225,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         occurrenceKey: occurrenceKey,
         collection: collection
       };
-      var deferredUploadId = this.touchFiles([touchFileDescriptor], collection).then(function (touchedFiles) {
+      var deferredUploadId = this.touchFiles([touchFileDescriptor], collection, traceContext).then(function (touchedFiles) {
         return touchedFiles.created[0].uploadId;
       });
       return {
@@ -236,7 +237,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "uploadExternal",
     value: function () {
-      var _uploadExternal = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(url, collection) {
+      var _uploadExternal = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(url, collection, traceContext) {
         var _this3 = this;
 
         var uploadableFileUpfrontIds, id, occurrenceKey, subject, deferredBlob, preview, name, fileState;
@@ -244,7 +245,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
+                uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
                 id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
                 subject = (0, _createMediaSubject.createMediaSubject)();
                 deferredBlob = fetch(url).then(function (response) {
@@ -282,7 +283,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                     }, _callee2);
                   }));
 
-                  return function (_x3, _x4) {
+                  return function (_x4, _x5) {
                     return _ref3.apply(this, arguments);
                   };
                 }());
@@ -342,7 +343,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                               preview: preview
                             }); // we don't want to wait for the file to be upload
 
-                            _this3.upload(file, undefined, uploadableFileUpfrontIds);
+                            _this3.upload(file, undefined, uploadableFileUpfrontIds, traceContext);
 
                             _context3.next = 12;
                             return (0, _getDimensionsFromBlob.getDimensionsFromBlob)(mediaType, blob);
@@ -362,7 +363,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                     }, _callee3);
                   }));
 
-                  return function (_x5, _x6) {
+                  return function (_x6, _x7) {
                     return _ref4.apply(this, arguments);
                   };
                 }()));
@@ -375,7 +376,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         }, _callee4, this);
       }));
 
-      function uploadExternal(_x, _x2) {
+      function uploadExternal(_x, _x2, _x3) {
         return _uploadExternal.apply(this, arguments);
       }
 
@@ -383,7 +384,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
     }()
   }, {
     key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds) {
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
       var _this4 = this;
 
       if (typeof file.content === 'string') {
@@ -396,7 +397,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
           collection = file.collection;
 
       if (!uploadableFileUpfrontIds) {
-        uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
+        uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
       }
 
       var id = uploadableFileUpfrontIds.id;
@@ -461,7 +462,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       var _uploadFile = (0, _uploader.uploadFile)(file, this.mediaStore, uploadableFileUpfrontIds, {
         onUploadFinish: onUploadFinish,
         onProgress: onProgress
-      }),
+      }, traceContext),
           cancel = _uploadFile.cancel;
 
       (0, _fileStreamsCache.getFileStreamsCache)().set(id, subject); // We should report progress asynchronously, since this is what consumer expects
@@ -479,7 +480,8 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       }
 
       return (0, _mediaSubscribable.fromObservable)(subject);
-    }
+    } // TODO: ----- ADD TICKET
+
   }, {
     key: "downloadBinary",
     value: function () {
@@ -517,7 +519,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         }, _callee5, this);
       }));
 
-      function downloadBinary(_x7) {
+      function downloadBinary(_x8) {
         return _downloadBinary.apply(this, arguments);
       }
 
@@ -528,6 +530,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
     value: function () {
       var _copyFile = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(source, destination) {
         var options,
+            traceContext,
             authProvider,
             sourceCollection,
             id,
@@ -561,6 +564,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
             switch (_context6.prev = _context6.next) {
               case 0:
                 options = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
+                traceContext = _args6.length > 3 ? _args6[3] : undefined;
                 authProvider = source.authProvider, sourceCollection = source.collection, id = source.id;
                 destinationAuthProvider = destination.authProvider, destinationCollectionName = destination.collection, replaceFileId = destination.replaceFileId, occurrenceKey = destination.occurrenceKey;
                 preview = options.preview, mimeType = options.mimeType;
@@ -568,12 +572,12 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                   authProvider: destinationAuthProvider
                 });
                 _context6.t0 = _mediaCore.authToOwner;
-                _context6.next = 8;
+                _context6.next = 9;
                 return authProvider({
                   collectionName: sourceCollection
                 });
 
-              case 8:
+              case 9:
                 _context6.t1 = _context6.sent;
                 owner = (0, _context6.t0)(_context6.t1);
                 body = {
@@ -589,11 +593,11 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                   occurrenceKey: occurrenceKey
                 };
                 cache = (0, _fileStreamsCache.getFileStreamsCache)();
-                _context6.prev = 13;
-                _context6.next = 16;
-                return mediaStore.copyFileWithToken(body, params);
+                _context6.prev = 14;
+                _context6.next = 17;
+                return mediaStore.copyFileWithToken(body, params, traceContext);
 
-              case 16:
+              case 17:
                 _yield$mediaStore$cop = _context6.sent;
                 copiedFile = _yield$mediaStore$cop.data;
                 // if we were passed a "mimeType", we propagate it into copiedFileWithMimeType
@@ -618,19 +622,19 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                 copiedMimeType;
 
                 if (!_context6.t2) {
-                  _context6.next = 30;
+                  _context6.next = 31;
                   break;
                 }
 
-                _context6.next = 29;
+                _context6.next = 30;
                 return (0, _shouldFetchRemoteFileStates.shouldFetchRemoteFileStates)(mediaType, copiedMimeType, preview);
 
-              case 29:
+              case 30:
                 _context6.t2 = _context6.sent;
 
-              case 30:
+              case 31:
                 if (!_context6.t2) {
-                  _context6.next = 35;
+                  _context6.next = 36;
                   break;
                 }
 
@@ -646,24 +650,24 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                     return subject.complete();
                   }
                 });
-                _context6.next = 36;
+                _context6.next = 37;
                 break;
 
-              case 35:
+              case 36:
                 if (!(0, _fileState.isProcessingFileState)(copiedFileState)) {
                   subject.next(_objectSpread(_objectSpread({}, copiedFileState), !(0, _fileState.isErrorFileState)(copiedFileState) && previewOverride));
                 }
 
-              case 36:
+              case 37:
                 if (!cache.has(copiedId)) {
                   (0, _fileStreamsCache.getFileStreamsCache)().set(copiedId, subject);
                 }
 
                 return _context6.abrupt("return", copiedFile);
 
-              case 40:
-                _context6.prev = 40;
-                _context6.t3 = _context6["catch"](13);
+              case 41:
+                _context6.prev = 41;
+                _context6.t3 = _context6["catch"](14);
 
                 if (processingSubscription) {
                   processingSubscription.unsubscribe();
@@ -682,15 +686,15 @@ var FileFetcherImpl = /*#__PURE__*/function () {
 
                 throw _context6.t3;
 
-              case 45:
+              case 46:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee6, this, [[13, 40]]);
+        }, _callee6, this, [[14, 41]]);
       }));
 
-      function copyFile(_x8, _x9) {
+      function copyFile(_x9, _x10) {
         return _copyFile.apply(this, arguments);
       }
 

package/dist/cjs/client/media-client.js

@@ -51,8 +51,8 @@ var MediaClient = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(MediaClient, [{
     key: "getImage",
-    value: function getImage(id, params, controller, fetchMaxRes, traceId) {
-      return this.mediaStore.getImage(id, params, controller, fetchMaxRes, traceId);
+    value: function getImage(id, params, controller, fetchMaxRes, traceContext) {
+      return this.mediaStore.getImage(id, params, controller, fetchMaxRes, traceContext);
     }
   }, {
     key: "getImageUrl",