@atlaskit/media-card 71.0.0 → 72.0.0

package/dist/cjs/root/card/getCardPreview/index.js

@@ -23,14 +23,20 @@ Object.defineProperty(exports, "isSupportedLocalPreview", {
     return _helpers.isSupportedLocalPreview;
   }
 });
-exports.getCardPreview = exports.getFilePreviewFromFileState = exports.getCardPreviewFromCache = exports.shouldGetCardPreview = exports.extractFilePreviewStatus = void 0;
+Object.defineProperty(exports, "extractFilePreviewStatus", {
+  enumerable: true,
+  get: function get() {
+    return _filePreviewStatus.extractFilePreviewStatus;
+  }
+});
+exports.shouldResolvePreview = exports.getCardPreview = exports.getFilePreviewFromFileState = exports.removeCardPreviewFromCache = exports.getCardPreviewFromCache = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _mediaClient = require("@atlaskit/media-client");
 
 var _mediaCommon = require("@atlaskit/media-common");
@@ -41,57 +47,23 @@ var _helpers = require("./helpers");
 
 var _errors = require("../../../errors");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _dimensionComparer = require("../../../utils/dimensionComparer");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _filePreviewStatus = require("./filePreviewStatus");
 
-// TODO: align these checks with helpers from Media Client
-// https://product-fabric.atlassian.net/browse/BMPT-1300
-var extractFilePreviewStatus = function extractFilePreviewStatus(fileState, featureFlags) {
-  var hasFilesize = 'size' in fileState && !!fileState.size;
-
-  var _ref = 'mediaType' in fileState && fileState || {},
-      mediaType = _ref.mediaType;
-
-  var _ref2 = 'mimeType' in fileState && fileState || {},
-      mimeType = _ref2.mimeType;
-
-  var isPreviewable = !!mediaType && (0, _mediaClient.isPreviewableType)(mediaType, featureFlags);
-  /**
-   * Local preview is available only if it's supported by browser and supported by Media Card (isSupportedLocalPreview)
-   * For example, SVGs are mime type NOT supported by browser but media type supported by Media Card (image)
-   * Then, local Preview NOT available
-   */
-
-  var hasLocalPreview = (0, _mediaClient.isPreviewableFileState)(fileState) && (0, _helpers.isSupportedLocalPreview)(mediaType) && !!mimeType && (0, _mediaCommon.isMimeTypeSupportedByBrowser)(mimeType);
-  var hasRemotePreview = (0, _mediaClient.isImageRepresentationReady)(fileState);
-  var hasPreview = hasLocalPreview || hasRemotePreview;
-  var isSupportedByBrowser = !!mimeType && (0, _mediaCommon.isMimeTypeSupportedByBrowser)(mimeType);
-  return {
-    hasFilesize: hasFilesize,
-    isPreviewable: isPreviewable,
-    hasPreview: hasPreview,
-    isSupportedByBrowser: isSupportedByBrowser
-  };
-};
-
-exports.extractFilePreviewStatus = extractFilePreviewStatus;
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-var shouldGetCardPreview = function shouldGetCardPreview(cardStatus, _ref3) {
-  var isPreviewable = _ref3.isPreviewable,
-      hasPreview = _ref3.hasPreview,
-      isSupportedByBrowser = _ref3.isSupportedByBrowser;
-  return cardStatus === 'loading-preview' || cardStatus === 'uploading' && hasPreview && isPreviewable || cardStatus === 'processing' && hasPreview && isPreviewable && isSupportedByBrowser;
-};
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-exports.shouldGetCardPreview = shouldGetCardPreview;
 var getCardPreviewFromCache = _cache.default.get;
+exports.getCardPreviewFromCache = getCardPreviewFromCache;
+var removeCardPreviewFromCache = _cache.default.remove;
 /**
  * Will return the preview if available and supported by the browser
  * See extractFilePreviewStatus "hasLocalPreview" logic
  */
 
-exports.getCardPreviewFromCache = getCardPreviewFromCache;
+exports.removeCardPreviewFromCache = removeCardPreviewFromCache;
 
 var getFilePreviewFromFileState = function getFilePreviewFromFileState(fileState) {
   return 'mimeType' in fileState && (0, _mediaCommon.isMimeTypeSupportedByBrowser)(fileState.mimeType) && (0, _mediaClient.isPreviewableFileState)(fileState) ? fileState.preview : undefined;
@@ -99,6 +71,34 @@ var getFilePreviewFromFileState = function getFilePreviewFromFileState(fileState
 
 exports.getFilePreviewFromFileState = getFilePreviewFromFileState;
 
+var extendAndCachePreview = function extendAndCachePreview(id, dimensions, preview, mediaBlobUrlAttrs) {
+  var source;
+
+  switch (preview.source) {
+    case 'local':
+      source = 'cache-local';
+      break;
+
+    case 'remote':
+      source = 'cache-remote';
+      break;
+
+    default:
+      source = preview.source;
+  } // We want to embed some meta context into dataURI for Copy/Paste to work.
+
+
+  var dataURI = mediaBlobUrlAttrs ? (0, _mediaClient.addFileAttrsToUrl)(preview.dataURI, mediaBlobUrlAttrs) : preview.dataURI; // We store new cardPreview into cache
+
+  _cache.default.set(id, dimensions, _objectSpread(_objectSpread({}, preview), {}, {
+    source: source,
+    dataURI: dataURI
+  }));
+
+  return _objectSpread(_objectSpread({}, preview), {}, {
+    dataURI: dataURI
+  });
+};
 /**
  * This function will try to return a Card preview, either from cache, local preview or remote preview.
  * It should only be called if there is a chance to get either a remote or a local preview, or both.
@@ -109,49 +109,48 @@ exports.getFilePreviewFromFileState = getFilePreviewFromFileState;
  * In that case, we still want to report the local preview error to the caller, for feature realiability track.
  * hence the use of the optional callback onLocalPreviewError
  */
+
+
 var getCardPreview = /*#__PURE__*/function () {
-  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref4) {
-    var mediaClient, id, collectionName, requestedDimensions, isRemotePreviewReady, addContextToDataURI, filePreview, _ref4$dimensions, dimensions, resizeMode, onLocalPreviewError, cardPreview;
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
+    var mediaClient, id, _ref$dimensions, dimensions, filePreview, onLocalPreviewError, isRemotePreviewReady, imageUrlParams, mediaBlobUrlAttrs, cachedPreview, localPreview, remotePreview;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            mediaClient = _ref4.mediaClient, id = _ref4.id, collectionName = _ref4.collectionName, requestedDimensions = _ref4.requestedDimensions, isRemotePreviewReady = _ref4.isRemotePreviewReady, addContextToDataURI = _ref4.addContextToDataURI, filePreview = _ref4.filePreview, _ref4$dimensions = _ref4.dimensions, dimensions = _ref4$dimensions === void 0 ? {} : _ref4$dimensions, resizeMode = _ref4.resizeMode, onLocalPreviewError = _ref4.onLocalPreviewError;
-            cardPreview = _cache.default.get(id, dimensions);
+            mediaClient = _ref.mediaClient, id = _ref.id, _ref$dimensions = _ref.dimensions, dimensions = _ref$dimensions === void 0 ? {} : _ref$dimensions, filePreview = _ref.filePreview, onLocalPreviewError = _ref.onLocalPreviewError, isRemotePreviewReady = _ref.isRemotePreviewReady, imageUrlParams = _ref.imageUrlParams, mediaBlobUrlAttrs = _ref.mediaBlobUrlAttrs;
+            cachedPreview = _cache.default.get(id, dimensions);
 
-            if (!cardPreview) {
+            if (!cachedPreview) {
               _context.next = 4;
               break;
             }
 
-            return _context.abrupt("return", _objectSpread(_objectSpread({}, cardPreview), {}, {
-              source: 'cache'
-            }));
+            return _context.abrupt("return", cachedPreview);
 
           case 4:
             _context.prev = 4;
-            _context.t0 = filePreview;
 
-            if (!_context.t0) {
+            if (!filePreview) {
               _context.next = 10;
               break;
             }
 
-            _context.next = 9;
+            _context.next = 8;
             return (0, _helpers.getCardPreviewFromFilePreview)(filePreview);
 
-          case 9:
-            _context.t0 = _context.sent;
+          case 8:
+            localPreview = _context.sent;
+            return _context.abrupt("return", extendAndCachePreview(id, dimensions, localPreview, mediaBlobUrlAttrs));
 
           case 10:
-            cardPreview = _context.t0;
-            _context.next = 18;
+            _context.next = 17;
             break;
 
-          case 13:
-            _context.prev = 13;
-            _context.t1 = _context["catch"](4);
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](4);
 
             /**
              * We report the error if:
@@ -163,8 +162,8 @@ var getCardPreview = /*#__PURE__*/function () {
              *   i.e. local preview is available and not supported,
              *   but we are after the remote preview instead.
              */
-            if (!(0, _errors.isUnsupportedLocalPreviewError)(_context.t1) || (0, _errors.isUnsupportedLocalPreviewError)(_context.t1) && !isRemotePreviewReady) {
-              onLocalPreviewError && onLocalPreviewError(_context.t1);
+            if (!(0, _errors.isUnsupportedLocalPreviewError)(_context.t0) || (0, _errors.isUnsupportedLocalPreviewError)(_context.t0) && !isRemotePreviewReady) {
+              onLocalPreviewError && onLocalPreviewError(_context.t0);
             }
             /**
              * No matter the reason why the local preview failed, we break the process
@@ -173,56 +172,54 @@ var getCardPreview = /*#__PURE__*/function () {
 
 
             if (isRemotePreviewReady) {
-              _context.next = 18;
+              _context.next = 17;
               break;
             }
 
-            throw _context.t1;
-
-          case 18:
-            if (cardPreview) {
-              _context.next = 24;
-              break;
-            }
+            throw _context.t0;
 
+          case 17:
             if (isRemotePreviewReady) {
-              _context.next = 21;
+              _context.next = 19;
               break;
             }
 
             throw new _errors.MediaCardError('remote-preview-not-ready');
 
+          case 19:
+            _context.next = 21;
+            return (0, _helpers.getCardPreviewFromBackend)(mediaClient, id, imageUrlParams);
+
           case 21:
-            _context.next = 23;
-            return (0, _helpers.getCardPreviewFromBackend)(mediaClient, id, requestedDimensions, collectionName, resizeMode);
+            remotePreview = _context.sent;
+            return _context.abrupt("return", extendAndCachePreview(id, dimensions, remotePreview, mediaBlobUrlAttrs));
 
           case 23:
-            cardPreview = _context.sent;
-
-          case 24:
-            /**
-             * In case we've retrieved cardPreview using one of the two methods above,
-             * we want to embed some meta context into dataURI for Copy/Paste to work.
-             */
-            cardPreview = _objectSpread(_objectSpread({}, cardPreview), {}, {
-              dataURI: addContextToDataURI(cardPreview.dataURI)
-            }); // We store new cardPreview into cache
-
-            _cache.default.set(id, dimensions, cardPreview);
-
-            return _context.abrupt("return", cardPreview);
-
-          case 27:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[4, 13]]);
+    }, _callee, null, [[4, 12]]);
   }));
 
   return function getCardPreview(_x) {
-    return _ref5.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();
 
-exports.getCardPreview = getCardPreview;
+exports.getCardPreview = getCardPreview;
+
+var shouldResolvePreview = function shouldResolvePreview(_ref3) {
+  var status = _ref3.status,
+      fileState = _ref3.fileState,
+      dimensions = _ref3.dimensions,
+      prevDimensions = _ref3.prevDimensions,
+      hasCardPreview = _ref3.hasCardPreview,
+      isBannedLocalPreview = _ref3.isBannedLocalPreview,
+      featureFlags = _ref3.featureFlags;
+  var statusIsPreviewable = (0, _filePreviewStatus.isPreviewableStatus)(status, (0, _filePreviewStatus.extractFilePreviewStatus)(fileState, isBannedLocalPreview, featureFlags));
+  var dimensionsAreBigger = (0, _dimensionComparer.isBigger)(prevDimensions, dimensions);
+  return statusIsPreviewable && (!hasCardPreview || dimensionsAreBigger);
+};
+
+exports.shouldResolvePreview = shouldResolvePreview;

package/dist/cjs/root/card/getCardStatus.js

@@ -3,7 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCardStatus = void 0;
+exports.getCardStatus = exports.isFinalCardStatus = void 0;
+
+var isFinalCardStatus = function isFinalCardStatus(status) {
+  return ['complete', 'error', 'failed-processing'].includes(status);
+};
+
+exports.isFinalCardStatus = isFinalCardStatus;
 
 var getCardStatus = function getCardStatus(fileStatus, _ref) {
   var hasFilesize = _ref.hasFilesize,