@atlaskit/media-client 37.2.17 → 37.2.19

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/media-client
 
+## 37.2.19
+
+### Patch Changes
+
+- Updated dependencies
+
+## 37.2.18
+
+### Patch Changes
+
+- [`e3550afc43327`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3550afc43327) -
+  [ux] EDITOR-7679 bug fix for media name fallback falling back to "download" when the media name
+  was not being passed
+- Updated dependencies
+
 ## 37.2.17
 
 ### Patch Changes

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

@@ -28,6 +28,7 @@ var _v = _interopRequireDefault(require("uuid/v4"));
 var _mediaCore = require("@atlaskit/media-core");
 var _isValidUuid = require("@atlaskit/media-common/isValidUuid");
 var _downloadUrl = require("@atlaskit/media-common/downloadUrl");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _mediaStore = require("../media-store");
 var _fileState2 = require("../../models/file-state");
 var _media = require("../../models/media");
@@ -751,24 +752,31 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "downloadBinary",
     value: function () {
-      var _downloadBinary = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee1(id) {
-        var name,
-          collectionName,
-          traceContext,
-          url,
-          _args1 = arguments;
+      var _downloadBinary = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee1(id, name, collectionName, traceContext) {
+        var downloadName, url, _t5;
         return _regenerator.default.wrap(function (_context1) {
           while (1) switch (_context1.prev = _context1.next) {
             case 0:
-              name = _args1.length > 1 && _args1[1] !== undefined ? _args1[1] : 'download';
-              collectionName = _args1.length > 2 ? _args1[2] : undefined;
-              traceContext = _args1.length > 3 ? _args1[3] : undefined;
+              downloadName = name !== null && name !== void 0 ? name : 'download';
+              if (!(0, _expValEquals.expValEquals)('platform_editor_media_download_fallback_name', 'isEnabled', true)) {
+                _context1.next = 2;
+                break;
+              }
               _context1.next = 1;
               return this.mediaApi.getFileBinaryURL(id, collectionName, undefined, name);
             case 1:
-              url = _context1.sent;
+              _t5 = _context1.sent;
+              _context1.next = 4;
+              break;
+            case 2:
+              _context1.next = 3;
+              return this.mediaApi.getFileBinaryURL(id, collectionName);
+            case 3:
+              _t5 = _context1.sent;
+            case 4:
+              url = _t5;
               (0, _downloadUrl.downloadUrl)(url, {
-                name: name
+                name: downloadName
               });
               _globalMediaEventEmitter.globalMediaEventEmitter.emit('media-viewed', {
                 fileId: id,
@@ -776,17 +784,17 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 viewingLevel: 'download'
               });
               // Test the download after initiated the Browser process to catch any potential errors.
-              _context1.next = 2;
+              _context1.next = 5;
               return this.mediaApi.testUrl(url, {
                 traceContext: traceContext
               });
-            case 2:
+            case 5:
             case "end":
               return _context1.stop();
           }
         }, _callee1, this);
       }));
-      function downloadBinary(_x22) {
+      function downloadBinary(_x22, _x23, _x24, _x25) {
         return _downloadBinary.apply(this, arguments);
       }
       return downloadBinary;
@@ -829,7 +837,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function registerCopyIntent(_x23, _x24) {
+      function registerCopyIntent(_x26, _x27) {
         return _registerCopyIntent.apply(this, arguments);
       }
       return registerCopyIntent;
@@ -838,7 +846,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
     key: "copyFileWithToken",
     value: function () {
       var _copyFileWithToken = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(source, destination, traceContext) {
-        var authProvider, sourceCollection, id, destinationAuthProvider, destinationCollectionName, replaceFileId, occurrenceKey, mediaStore, owner, body, params, _yield$mediaStore$cop, data, _t5;
+        var authProvider, sourceCollection, id, destinationAuthProvider, destinationCollectionName, replaceFileId, occurrenceKey, mediaStore, owner, body, params, _yield$mediaStore$cop, data, _t6;
         return _regenerator.default.wrap(function (_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -847,13 +855,13 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               mediaStore = destination.mediaStore || new _mediaStore.MediaStore({
                 authProvider: destinationAuthProvider
               });
-              _t5 = _mediaCore.authToOwner;
+              _t6 = _mediaCore.authToOwner;
               _context11.next = 1;
               return authProvider({
                 collectionName: sourceCollection
               });
             case 1:
-              owner = _t5(_context11.sent);
+              owner = _t6(_context11.sent);
               body = {
                 sourceFile: {
                   id: id,
@@ -878,7 +886,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
           }
         }, _callee11);
       }));
-      function copyFileWithToken(_x25, _x26, _x27) {
+      function copyFileWithToken(_x28, _x29, _x30) {
         return _copyFileWithToken.apply(this, arguments);
       }
       return copyFileWithToken;
@@ -907,7 +915,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function copyFileWithIntent(_x28, _x29, _x30) {
+      function copyFileWithIntent(_x31, _x32, _x33) {
         return _copyFileWithIntent.apply(this, arguments);
       }
       return copyFileWithIntent;
@@ -943,8 +951,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
           key,
           errorFileState,
           _args13 = arguments,
-          _t6,
-          _t7;
+          _t7,
+          _t8;
         return _regenerator.default.wrap(function (_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -986,20 +994,20 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               previewOverride = !(0, _fileState2.isErrorFileState)(copiedFileState) && !!preview ? {
                 preview: preview
               } : {};
-              _t6 = !(0, _fileState2.isFinalFileState)(copiedFileState) &&
+              _t7 = !(0, _fileState2.isFinalFileState)(copiedFileState) &&
               // mimeType should always be returned by "copyFileWithToken"
               // but in case it's not, we don't want to penalize "copyFile"
               copiedMimeType;
-              if (!_t6) {
+              if (!_t7) {
                 _context13.next = 7;
                 break;
               }
               _context13.next = 6;
               return (0, _shouldFetchRemoteFileStates.shouldFetchRemoteFileStates)(mediaType, copiedMimeType, preview);
             case 6:
-              _t6 = _context13.sent;
+              _t7 = _context13.sent;
             case 7:
-              if (!_t6) {
+              if (!_t7) {
                 _context13.next = 8;
                 break;
               }
@@ -1036,7 +1044,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               return _context13.abrupt("return", copiedFile);
             case 10:
               _context13.prev = 10;
-              _t7 = _context13["catch"](1);
+              _t8 = _context13["catch"](1);
               if (processingSubscription) {
                 processingSubscription.unsubscribe();
               }
@@ -1044,23 +1052,23 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 _fileCache = cache.get(replaceFileId);
                 replaceFileState = this.store.getState().files[replaceFileId];
                 if (_fileCache) {
-                  _fileCache.error(_t7);
+                  _fileCache.error(_t8);
                 } else {
                   // Create a new subject with the error state for new subscriptions
-                  cache.set(id, (0, _createMediaSubject.createMediaSubject)(_t7));
+                  cache.set(id, (0, _createMediaSubject.createMediaSubject)(_t8));
                 }
                 key = replaceFileState ? replaceFileId : id;
-                errorFileState = this.getErrorFileState(_t7, id, occurrenceKey);
+                errorFileState = this.getErrorFileState(_t8, id, occurrenceKey);
                 this.setFileState(key, errorFileState);
               }
-              throw _t7;
+              throw _t8;
             case 11:
             case "end":
               return _context13.stop();
           }
         }, _callee13, this, [[1, 10]]);
       }));
-      function copyFile(_x31, _x32) {
+      function copyFile(_x34, _x35) {
         return _copyFile.apply(this, arguments);
       }
       return copyFile;

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

@@ -6,6 +6,7 @@ import uuid from 'uuid/v4';
 import { authToOwner } from '@atlaskit/media-core';
 import { isValidUuid } from '@atlaskit/media-common/isValidUuid';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MediaStore as MediaApi } from '../media-store';
 import { isErrorFileState, isFinalFileState, isProcessingFileState, mapMediaFileToFileState, mapMediaItemToFileState } from '../../models/file-state';
 import { isNotFoundMediaItemDetails } from '../../models/media';
@@ -493,10 +494,11 @@ export class FileFetcherImpl {
     setTimeout(onProgress, 0, 0);
     return fromObservable(subject);
   }
-  async downloadBinary(id, name = 'download', collectionName, traceContext) {
-    const url = await this.mediaApi.getFileBinaryURL(id, collectionName, undefined, name);
+  async downloadBinary(id, name, collectionName, traceContext) {
+    const downloadName = name !== null && name !== void 0 ? name : 'download';
+    const url = expValEquals('platform_editor_media_download_fallback_name', 'isEnabled', true) ? await this.mediaApi.getFileBinaryURL(id, collectionName, undefined, name) : await this.mediaApi.getFileBinaryURL(id, collectionName);
     downloadUrl(url, {
-      name
+      name: downloadName
     });
     globalMediaEventEmitter.emit('media-viewed', {
       fileId: id,

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

@@ -12,6 +12,7 @@ import uuid from 'uuid/v4';
 import { authToOwner } from '@atlaskit/media-core';
 import { isValidUuid } from '@atlaskit/media-common/isValidUuid';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MediaStore as MediaApi } from '../media-store';
 import { isErrorFileState, isFinalFileState, isProcessingFileState, mapMediaFileToFileState, mapMediaItemToFileState } from '../../models/file-state';
 import { isNotFoundMediaItemDetails } from '../../models/media';
@@ -734,24 +735,31 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "downloadBinary",
     value: function () {
-      var _downloadBinary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee1(id) {
-        var name,
-          collectionName,
-          traceContext,
-          url,
-          _args1 = arguments;
+      var _downloadBinary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee1(id, name, collectionName, traceContext) {
+        var downloadName, url, _t5;
         return _regeneratorRuntime.wrap(function (_context1) {
           while (1) switch (_context1.prev = _context1.next) {
             case 0:
-              name = _args1.length > 1 && _args1[1] !== undefined ? _args1[1] : 'download';
-              collectionName = _args1.length > 2 ? _args1[2] : undefined;
-              traceContext = _args1.length > 3 ? _args1[3] : undefined;
+              downloadName = name !== null && name !== void 0 ? name : 'download';
+              if (!expValEquals('platform_editor_media_download_fallback_name', 'isEnabled', true)) {
+                _context1.next = 2;
+                break;
+              }
               _context1.next = 1;
               return this.mediaApi.getFileBinaryURL(id, collectionName, undefined, name);
             case 1:
-              url = _context1.sent;
+              _t5 = _context1.sent;
+              _context1.next = 4;
+              break;
+            case 2:
+              _context1.next = 3;
+              return this.mediaApi.getFileBinaryURL(id, collectionName);
+            case 3:
+              _t5 = _context1.sent;
+            case 4:
+              url = _t5;
               downloadUrl(url, {
-                name: name
+                name: downloadName
               });
               globalMediaEventEmitter.emit('media-viewed', {
                 fileId: id,
@@ -759,17 +767,17 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                 viewingLevel: 'download'
               });
               // Test the download after initiated the Browser process to catch any potential errors.
-              _context1.next = 2;
+              _context1.next = 5;
               return this.mediaApi.testUrl(url, {
                 traceContext: traceContext
               });
-            case 2:
+            case 5:
             case "end":
               return _context1.stop();
           }
         }, _callee1, this);
       }));
-      function downloadBinary(_x22) {
+      function downloadBinary(_x22, _x23, _x24, _x25) {
         return _downloadBinary.apply(this, arguments);
       }
       return downloadBinary;
@@ -812,7 +820,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function registerCopyIntent(_x23, _x24) {
+      function registerCopyIntent(_x26, _x27) {
         return _registerCopyIntent.apply(this, arguments);
       }
       return registerCopyIntent;
@@ -821,7 +829,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     key: "copyFileWithToken",
     value: function () {
       var _copyFileWithToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(source, destination, traceContext) {
-        var authProvider, sourceCollection, id, destinationAuthProvider, destinationCollectionName, replaceFileId, occurrenceKey, mediaStore, owner, body, params, _yield$mediaStore$cop, data, _t5;
+        var authProvider, sourceCollection, id, destinationAuthProvider, destinationCollectionName, replaceFileId, occurrenceKey, mediaStore, owner, body, params, _yield$mediaStore$cop, data, _t6;
         return _regeneratorRuntime.wrap(function (_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -830,13 +838,13 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               mediaStore = destination.mediaStore || new MediaApi({
                 authProvider: destinationAuthProvider
               });
-              _t5 = authToOwner;
+              _t6 = authToOwner;
               _context11.next = 1;
               return authProvider({
                 collectionName: sourceCollection
               });
             case 1:
-              owner = _t5(_context11.sent);
+              owner = _t6(_context11.sent);
               body = {
                 sourceFile: {
                   id: id,
@@ -861,7 +869,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           }
         }, _callee11);
       }));
-      function copyFileWithToken(_x25, _x26, _x27) {
+      function copyFileWithToken(_x28, _x29, _x30) {
         return _copyFileWithToken.apply(this, arguments);
       }
       return copyFileWithToken;
@@ -890,7 +898,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function copyFileWithIntent(_x28, _x29, _x30) {
+      function copyFileWithIntent(_x31, _x32, _x33) {
         return _copyFileWithIntent.apply(this, arguments);
       }
       return copyFileWithIntent;
@@ -926,8 +934,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           key,
           errorFileState,
           _args13 = arguments,
-          _t6,
-          _t7;
+          _t7,
+          _t8;
         return _regeneratorRuntime.wrap(function (_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -969,20 +977,20 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               previewOverride = !isErrorFileState(copiedFileState) && !!preview ? {
                 preview: preview
               } : {};
-              _t6 = !isFinalFileState(copiedFileState) &&
+              _t7 = !isFinalFileState(copiedFileState) &&
               // mimeType should always be returned by "copyFileWithToken"
               // but in case it's not, we don't want to penalize "copyFile"
               copiedMimeType;
-              if (!_t6) {
+              if (!_t7) {
                 _context13.next = 7;
                 break;
               }
               _context13.next = 6;
               return shouldFetchRemoteFileStates(mediaType, copiedMimeType, preview);
             case 6:
-              _t6 = _context13.sent;
+              _t7 = _context13.sent;
             case 7:
-              if (!_t6) {
+              if (!_t7) {
                 _context13.next = 8;
                 break;
               }
@@ -1019,7 +1027,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               return _context13.abrupt("return", copiedFile);
             case 10:
               _context13.prev = 10;
-              _t7 = _context13["catch"](1);
+              _t8 = _context13["catch"](1);
               if (processingSubscription) {
                 processingSubscription.unsubscribe();
               }
@@ -1027,23 +1035,23 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                 _fileCache = cache.get(replaceFileId);
                 replaceFileState = this.store.getState().files[replaceFileId];
                 if (_fileCache) {
-                  _fileCache.error(_t7);
+                  _fileCache.error(_t8);
                 } else {
                   // Create a new subject with the error state for new subscriptions
-                  cache.set(id, createMediaSubject(_t7));
+                  cache.set(id, createMediaSubject(_t8));
                 }
                 key = replaceFileState ? replaceFileId : id;
-                errorFileState = this.getErrorFileState(_t7, id, occurrenceKey);
+                errorFileState = this.getErrorFileState(_t8, id, occurrenceKey);
                 this.setFileState(key, errorFileState);
               }
-              throw _t7;
+              throw _t8;
             case 11:
             case "end":
               return _context13.stop();
           }
         }, _callee13, this, [[1, 10]]);
       }));
-      function copyFile(_x31, _x32) {
+      function copyFile(_x34, _x35) {
         return _copyFile.apply(this, arguments);
       }
       return copyFile;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "37.2.17",
+	"version": "37.2.19",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -25,7 +25,7 @@
 		"@atlaskit/chunkinator": "^8.0.0",
 		"@atlaskit/media-common": "^14.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^135.0.0",
+		"@atlaskit/tmp-editor-statsig": "^136.0.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",
 		"deep-equal": "^1.0.1",