@atlaskit/media-client 20.0.0 → 20.0.2

package/dist/cjs/utils/url.js

@@ -1,52 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.objectToQueryString = exports.isMediaBlobUrl = exports.getAttrsFromUrl = exports.addFileAttrsToUrl = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 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; }
-
 var mediaBlobUrlIdentifier = 'media-blob-url';
-
 var isMediaBlobUrl = function isMediaBlobUrl(url) {
   return url.indexOf("".concat(mediaBlobUrlIdentifier, "=true")) > -1;
 };
-
 exports.isMediaBlobUrl = isMediaBlobUrl;
-
 var getNumberFromParams = function getNumberFromParams(params, name) {
   var value = params.get(name);
   return typeof value === 'string' && !isNaN(parseInt(value)) ? parseInt(value) : undefined;
 };
-
 var getStringFromParams = function getStringFromParams(params, name) {
   var value = params.get(name);
-
   if (!value) {
     return;
   }
-
   return decodeURIComponent(value);
 };
-
 var getAttrsFromUrl = function getAttrsFromUrl(blobUrl) {
   var url = new URL(blobUrl);
   var hash = url.hash.replace('#', '');
   var params = new URLSearchParams(hash);
   var id = params.get('id');
-  var contextId = params.get('contextId'); // check if we have the required params
-
+  var contextId = params.get('contextId');
+  // check if we have the required params
   if (!id || !contextId) {
     return;
   }
-
   return {
     id: id,
     contextId: contextId,
@@ -59,39 +46,29 @@ var getAttrsFromUrl = function getAttrsFromUrl(blobUrl) {
     mimeType: getStringFromParams(params, 'mimeType')
   };
 };
-
 exports.getAttrsFromUrl = getAttrsFromUrl;
-
 var objectToQueryString = function objectToQueryString(json) {
   return Object.keys(json).filter(function (attrName) {
     return typeof json[attrName] !== 'undefined' && json[attrName] !== null;
   }).map(function (key) {
     var value = json[key];
-
     if (typeof value === 'undefined' || value === null) {
       return;
     }
-
     return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value.toString()));
   }).join('&');
 };
-
 exports.objectToQueryString = objectToQueryString;
-
 var addFileAttrsToUrl = function addFileAttrsToUrl(url, fileAttrs) {
   var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
   if (isSafari) {
     return url;
   }
-
   var mediaIdentifierAttr = (0, _defineProperty2.default)({}, mediaBlobUrlIdentifier, 'true');
-
   var mergedAttrs = _objectSpread(_objectSpread({}, mediaIdentifierAttr), fileAttrs);
+  var queryAttrs = objectToQueryString(mergedAttrs);
 
-  var queryAttrs = objectToQueryString(mergedAttrs); // we can't use '?' separator for blob url params
-
+  // we can't use '?' separator for blob url params
   return "".concat(url, "#").concat(queryAttrs);
 };
-
 exports.addFileAttrsToUrl = addFileAttrsToUrl;

package/dist/cjs/utils/with-media-client-hoc.js

@@ -1,51 +1,40 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withMediaClient = exports.getMediaClient = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _mediaClient = require("../client/media-client");
-
 var _excluded = ["mediaClientConfig"];
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+var NO_FLAGS = 'NO_FLAGS';
 var mediaClientsMap = new Map();
-
 var getMediaClient = function getMediaClient(mediaClientConfig, featureFlags) {
-  var mediaClient = mediaClientsMap.get(mediaClientConfig);
-
+  var _mediaClientsMap$get;
+  var flagsMapKey = featureFlags || NO_FLAGS;
+  var mediaClient = (_mediaClientsMap$get = mediaClientsMap.get(mediaClientConfig)) === null || _mediaClientsMap$get === void 0 ? void 0 : _mediaClientsMap$get.get(flagsMapKey);
   if (!mediaClient) {
+    var subMap = mediaClientsMap.get(mediaClientConfig);
+    if (!subMap) {
+      subMap = new Map();
+      mediaClientsMap.set(mediaClientConfig, subMap);
+    }
     mediaClient = new _mediaClient.MediaClient(mediaClientConfig, featureFlags);
-    mediaClientsMap.set(mediaClientConfig, mediaClient);
+    subMap.set(flagsMapKey, mediaClient);
   }
-
   return mediaClient;
 };
-
 exports.getMediaClient = getMediaClient;
-
 var createEmptyMediaClient = function createEmptyMediaClient(featureFlags) {
   var emptyConfig = {
     authProvider: function authProvider() {
@@ -58,25 +47,21 @@ var createEmptyMediaClient = function createEmptyMediaClient(featureFlags) {
   };
   return new _mediaClient.MediaClient(emptyConfig, featureFlags);
 };
-
 var withMediaClient = function withMediaClient(Component, featureFlags) {
   return /*#__PURE__*/function (_React$Component) {
     (0, _inherits2.default)(_class, _React$Component);
-
     var _super = _createSuper(_class);
-
     function _class() {
       (0, _classCallCheck2.default)(this, _class);
       return _super.apply(this, arguments);
     }
-
     (0, _createClass2.default)(_class, [{
       key: "render",
       value: function render() {
         // TODO MPT-315: clean up after we move mediaClientConfig into FileIdentifier
         var _this$props = this.props,
-            mediaClientConfig = _this$props.mediaClientConfig,
-            otherProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
+          mediaClientConfig = _this$props.mediaClientConfig,
+          otherProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
         var mediaClient = !mediaClientConfig ? createEmptyMediaClient(featureFlags) : getMediaClient(mediaClientConfig, featureFlags);
         return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, otherProps, {
           mediaClient: mediaClient
@@ -86,5 +71,4 @@ var withMediaClient = function withMediaClient(Component, featureFlags) {
     return _class;
   }(_react.default.Component);
 };
-
 exports.withMediaClient = withMediaClient;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "20.0.0",
+	"version": "20.0.2",
 	"sideEffects": false
 }

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

@@ -3,18 +3,15 @@ import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
 import { fromObservable } from '../utils/mediaSubscribable';
 export const collectionCache = {};
-
 const createCacheEntry = () => ({
   items: [],
   subject: new ReplaySubject(1),
   isLoadingNextPage: false
 });
-
 export class CollectionFetcher {
   constructor(mediaStore) {
     this.mediaStore = mediaStore;
   }
-
   createFileStateObserver(id, details) {
     const subject = new ReplaySubject(1);
     const mediaFile = {
@@ -27,71 +24,63 @@ export class CollectionFetcher {
     subject.next(fileState);
     return subject;
   }
-
   populateCache(items) {
     items.forEach(item => {
       const fileStream = this.createFileStateObserver(item.id, item.details);
       getFileStreamsCache().set(item.id, fileStream);
     });
   }
-
   removeFromCache(id, collectionName) {
     const collectionCacheIndex = collectionCache[collectionName].items.findIndex(item => item.id === id);
-
     if (collectionCacheIndex === -1) {
       return;
     }
-
     getFileStreamsCache().remove(id);
     collectionCache[collectionName].items.splice(collectionCacheIndex, 1);
   }
-
   getItems(collectionName, params, traceContext) {
     if (!collectionCache[collectionName]) {
       collectionCache[collectionName] = createCacheEntry();
     }
-
     const collection = collectionCache[collectionName];
     const subject = collection.subject;
-    this.mediaStore.getCollectionItems(collectionName, { ...params,
+    this.mediaStore.getCollectionItems(collectionName, {
+      ...params,
       details: 'full'
     }, traceContext).then(items => {
       const {
         contents,
         nextInclusiveStartKey
       } = items.data;
-      this.populateCache(contents); // It's hard to merge two together, so we just take what's came from the server.
+      this.populateCache(contents);
+      // It's hard to merge two together, so we just take what's came from the server.
       // Since we load only one page > 2 pages will be ditched from the cache.
-
       collection.items = items.data.contents;
       collection.nextInclusiveStartKey = nextInclusiveStartKey;
       subject.next(collection.items);
     }).catch(error => subject.error(error));
     return fromObservable(subject);
   }
-
   async removeFile(id, collectionName, occurrenceKey, traceContext) {
     await this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey, traceContext);
     this.removeFromCache(id, collectionName);
     const collection = collectionCache[collectionName];
     collection.subject.next(collection.items);
   }
-
   async loadNextPage(collectionName, params, traceContext) {
     const collection = collectionCache[collectionName];
     const isLoading = collection ? collection.isLoadingNextPage : false;
-
     if (!collection || !collection.nextInclusiveStartKey || isLoading) {
       return;
     }
-
     collection.isLoadingNextPage = true;
     const {
       nextInclusiveStartKey: inclusiveStartKey,
       items: currentItems,
       subject
     } = collectionCache[collectionName];
-    const response = await this.mediaStore.getCollectionItems(collectionName, { ...params,
+    const response = await this.mediaStore.getCollectionItems(collectionName, {
+      ...params,
       inclusiveStartKey,
       details: 'full'
     }, traceContext);
@@ -110,5 +99,4 @@ export class CollectionFetcher {
       isLoadingNextPage: false
     };
   }
-
 }

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

@@ -6,7 +6,6 @@ export class FileFetcherError extends BaseMediaClientError {
     this.id = id;
     this.metadata = metadata;
   }
-
   get attributes() {
     const {
       reason,
@@ -23,7 +22,6 @@ export class FileFetcherError extends BaseMediaClientError {
       occurrenceKey
     };
   }
-
 }
 export function isFileFetcherError(err) {
   return err instanceof FileFetcherError;