@atlaskit/media-client 20.0.3 → 20.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/media-client
 
+## 20.2.0
+
+### Minor Changes
+
+- [`0e2981295ce`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0e2981295ce) - Media Client accepts a feature flags object in the upload method overriding internal flags
+
+## 20.1.0
+
+### Minor Changes
+
+- [`894e1910ed4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/894e1910ed4) - Deprecation notice: Media Client and Media Store classes will no longer expose collection items listing methods. They will be removed in the next release
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 20.0.3
 
 ### Patch Changes

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

@@ -6,54 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collectionCache = exports.CollectionFetcher = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _ReplaySubject = require("rxjs/ReplaySubject");
 var _fileStreamsCache = require("../file-streams-cache");
-var _fileState = require("../models/file-state");
-var _mediaSubscribable = require("../utils/mediaSubscribable");
-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 _deprecatedEndpointError = require("../utils/deprecatedEndpointError");
 var collectionCache = {};
 exports.collectionCache = collectionCache;
-var createCacheEntry = function createCacheEntry() {
-  return {
-    items: [],
-    subject: new _ReplaySubject.ReplaySubject(1),
-    isLoadingNextPage: false
-  };
-};
 var CollectionFetcher = /*#__PURE__*/function () {
   function CollectionFetcher(mediaStore) {
     (0, _classCallCheck2.default)(this, CollectionFetcher);
     this.mediaStore = mediaStore;
   }
   (0, _createClass2.default)(CollectionFetcher, [{
-    key: "createFileStateObserver",
-    value: function createFileStateObserver(id, details) {
-      var subject = new _ReplaySubject.ReplaySubject(1);
-      var mediaFile = _objectSpread({
-        id: id
-      }, details);
-      var fileState = (0, _fileState.mapMediaFileToFileState)({
-        data: mediaFile
-      });
-      subject.next(fileState);
-      return subject;
-    }
-  }, {
-    key: "populateCache",
-    value: function populateCache(items) {
-      var _this = this;
-      items.forEach(function (item) {
-        var fileStream = _this.createFileStateObserver(item.id, item.details);
-        (0, _fileStreamsCache.getFileStreamsCache)().set(item.id, fileStream);
-      });
-    }
-  }, {
     key: "removeFromCache",
     value: function removeFromCache(id, collectionName) {
       var collectionCacheIndex = collectionCache[collectionName].items.findIndex(function (item) {
@@ -65,31 +30,15 @@ var CollectionFetcher = /*#__PURE__*/function () {
       (0, _fileStreamsCache.getFileStreamsCache)().remove(id);
       collectionCache[collectionName].items.splice(collectionCacheIndex, 1);
     }
+
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
   }, {
     key: "getItems",
     value: function getItems(collectionName, params, traceContext) {
-      var _this2 = this;
-      if (!collectionCache[collectionName]) {
-        collectionCache[collectionName] = createCacheEntry();
-      }
-      var collection = collectionCache[collectionName];
-      var subject = collection.subject;
-      this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
-        details: 'full'
-      }), traceContext).then(function (items) {
-        var _items$data = items.data,
-          contents = _items$data.contents,
-          nextInclusiveStartKey = _items$data.nextInclusiveStartKey;
-        _this2.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(function (error) {
-        return subject.error(error);
-      });
-      return (0, _mediaSubscribable.fromObservable)(subject);
+      throw new _deprecatedEndpointError.DeprecatedError('collection/:name/items');
     }
   }, {
     key: "removeFile",
@@ -118,49 +67,25 @@ var CollectionFetcher = /*#__PURE__*/function () {
       }
       return removeFile;
     }()
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
   }, {
     key: "loadNextPage",
     value: function () {
       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) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                collection = collectionCache[collectionName];
-                isLoading = collection ? collection.isLoadingNextPage : false;
-                if (!(!collection || !collection.nextInclusiveStartKey || isLoading)) {
-                  _context2.next = 4;
-                  break;
-                }
-                return _context2.abrupt("return");
-              case 4:
-                collection.isLoadingNextPage = true;
-                _collectionCache$coll = collectionCache[collectionName], inclusiveStartKey = _collectionCache$coll.nextInclusiveStartKey, currentItems = _collectionCache$coll.items, subject = _collectionCache$coll.subject;
-                _context2.next = 8;
-                return this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
-                  inclusiveStartKey: inclusiveStartKey,
-                  details: 'full'
-                }), traceContext);
-              case 8:
-                response = _context2.sent;
-                _response$data = response.data, contents = _response$data.contents, nextInclusiveStartKey = _response$data.nextInclusiveStartKey;
-                this.populateCache(contents);
-                newItems = response.data.contents;
-                items = [].concat((0, _toConsumableArray2.default)(currentItems), (0, _toConsumableArray2.default)(newItems));
-                subject.next(items);
-                collectionCache[collectionName] = {
-                  items: items,
-                  nextInclusiveStartKey: nextInclusiveStartKey,
-                  subject: subject,
-                  isLoadingNextPage: false
-                };
-              case 15:
+                throw new _deprecatedEndpointError.DeprecatedError('collection/:name/items');
+              case 1:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee2);
       }));
       function loadNextPage(_x5, _x6, _x7) {
         return _loadNextPage.apply(this, arguments);

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

@@ -484,8 +484,8 @@ var FileFetcherImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
-      var shouldAlwaysFetchFileState = (0, _mediaCommon.getMediaFeatureFlag)('fetchFileStateAfterUpload', this.featureFlags);
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext, featureFlags) {
+      var shouldAlwaysFetchFileState = (0, _mediaCommon.getMediaFeatureFlag)('fetchFileStateAfterUpload', featureFlags || this.featureFlags);
       if (shouldAlwaysFetchFileState) {
         return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
       }

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

@@ -29,6 +29,7 @@ var _artifacts = require("../../models/artifacts");
 var _request3 = require("../../utils/request");
 var _helpers = require("../../utils/request/helpers");
 var _resolveAuth = require("./resolveAuth");
+var _deprecatedEndpointError = require("../../utils/deprecatedEndpointError");
 var _error = require("./error");
 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; }
@@ -39,10 +40,6 @@ var defaultImageOptions = {
   allowAnimated: true,
   mode: 'crop'
 };
-var defaultGetCollectionItems = {
-  limit: 30,
-  sortDirection: 'desc'
-};
 var extendImageParams = function extendImageParams(params) {
   var fetchMaxRes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return _objectSpread(_objectSpread(_objectSpread({}, defaultImageOptions), params), fetchMaxRes ? {
@@ -67,57 +64,26 @@ var MediaStore = /*#__PURE__*/function () {
     this.config = config;
     this.featureFlags = featureFlags;
   }
+
+  /**
+   * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+   * This method is no longer working. Will be removed in the next release
+   */
   (0, _createClass2.default)(MediaStore, [{
     key: "getCollectionItems",
     value: function () {
       var _getCollectionItems = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(collectionName, params, traceContext) {
-        var metadata, options, response, _yield$createMapRespo, _yield$createMapRespo2, contents, nextInclusiveStartKey, contentsWithoutEmptyFiles;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                metadata = {
-                  method: 'GET',
-                  endpoint: '/collection/{collectionName}/items'
-                };
-                options = _objectSpread(_objectSpread({}, metadata), {}, {
-                  authContext: {
-                    collectionName: collectionName
-                  },
-                  params: _objectSpread(_objectSpread({}, defaultGetCollectionItems), params),
-                  headers: {
-                    Accept: 'application/json'
-                  },
-                  traceContext: traceContext
-                });
-                _context.next = 4;
-                return this.request("/collection/".concat(collectionName, "/items"), options);
-              case 4:
-                response = _context.sent;
-                _context.next = 7;
-                return (0, _helpers.createMapResponseToJson)(metadata)(response);
-              case 7:
-                _yield$createMapRespo = _context.sent;
-                _yield$createMapRespo2 = _yield$createMapRespo.data;
-                contents = _yield$createMapRespo2.contents;
-                nextInclusiveStartKey = _yield$createMapRespo2.nextInclusiveStartKey;
-                // [TODO] MS-705: remove after backend adds filter
-                // This prevents showing "ghost" files in recents
-                contentsWithoutEmptyFiles = contents.filter(function (item) {
-                  return item.details.size && item.details.size > 0;
-                });
-                return _context.abrupt("return", {
-                  data: {
-                    contents: contentsWithoutEmptyFiles,
-                    nextInclusiveStartKey: nextInclusiveStartKey
-                  }
-                });
-              case 13:
+                throw new _deprecatedEndpointError.DeprecatedError('collection/:name/items');
+              case 1:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this);
+        }, _callee);
       }));
       function getCollectionItems(_x, _x2, _x3) {
         return _getCollectionItems.apply(this, arguments);

package/dist/cjs/utils/deprecatedEndpointError.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DeprecatedError = void 0;
+exports.isDeprecatedError = isDeprecatedError;
+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 _errors = require("../models/errors");
+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 reason = 'deprecatedEndpoint';
+var DeprecatedError = /*#__PURE__*/function (_BaseMediaClientError) {
+  (0, _inherits2.default)(DeprecatedError, _BaseMediaClientError);
+  var _super = _createSuper(DeprecatedError);
+  function DeprecatedError(endpointName) {
+    var _this;
+    (0, _classCallCheck2.default)(this, DeprecatedError);
+    _this = _super.call(this, reason);
+    _this.endpointName = endpointName;
+    return _this;
+  }
+  (0, _createClass2.default)(DeprecatedError, [{
+    key: "attributes",
+    get: function get() {
+      var endpointName = this.endpointName;
+      return {
+        reason: reason,
+        endpointName: endpointName
+      };
+    }
+  }]);
+  return DeprecatedError;
+}(_errors.BaseMediaClientError);
+exports.DeprecatedError = DeprecatedError;
+function isDeprecatedError(err) {
+  return err instanceof DeprecatedError;
+}

package/dist/cjs/version.json

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

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

@@ -1,35 +1,10 @@
-import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
-import { mapMediaFileToFileState } from '../models/file-state';
-import { fromObservable } from '../utils/mediaSubscribable';
+import { DeprecatedError } from '../utils/deprecatedEndpointError';
 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 = {
-      id,
-      ...details
-    };
-    const fileState = mapMediaFileToFileState({
-      data: mediaFile
-    });
-    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) {
@@ -38,28 +13,13 @@ export class CollectionFetcher {
     getFileStreamsCache().remove(id);
     collectionCache[collectionName].items.splice(collectionCacheIndex, 1);
   }
+
+  /**
+   * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+   * This method is no longer working. Will be removed in the next release
+   */
   getItems(collectionName, params, traceContext) {
-    if (!collectionCache[collectionName]) {
-      collectionCache[collectionName] = createCacheEntry();
-    }
-    const collection = collectionCache[collectionName];
-    const subject = collection.subject;
-    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.
-      // 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);
+    throw new DeprecatedError('collection/:name/items');
   }
   async removeFile(id, collectionName, occurrenceKey, traceContext) {
     await this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey, traceContext);
@@ -67,36 +27,12 @@ export class CollectionFetcher {
     const collection = collectionCache[collectionName];
     collection.subject.next(collection.items);
   }
+
+  /**
+   * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+   * This method is no longer working. Will be removed in the next release
+   */
   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,
-      inclusiveStartKey,
-      details: 'full'
-    }, traceContext);
-    const {
-      contents,
-      nextInclusiveStartKey
-    } = response.data;
-    this.populateCache(contents);
-    const newItems = response.data.contents;
-    const items = [...currentItems, ...newItems];
-    subject.next(items);
-    collectionCache[collectionName] = {
-      items,
-      nextInclusiveStartKey,
-      subject,
-      isLoadingNextPage: false
-    };
+    throw new DeprecatedError('collection/:name/items');
   }
 }

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

@@ -371,8 +371,8 @@ export class FileFetcherImpl {
     }
     return fromObservable(subject);
   }
-  upload(file, controller, uploadableFileUpfrontIds, traceContext) {
-    const shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', this.featureFlags);
+  upload(file, controller, uploadableFileUpfrontIds, traceContext, featureFlags) {
+    const shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', featureFlags || this.featureFlags);
     if (shouldAlwaysFetchFileState) {
       return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
     }

package/dist/es2019/client/media-store/index.js

@@ -5,6 +5,7 @@ import { getArtifactUrl } from '../../models/artifacts';
 import { request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
+import { DeprecatedError } from '../../utils/deprecatedEndpointError';
 export { MediaStoreError, isMediaStoreError } from './error';
 const MEDIA_API_REGION = 'media-api-region';
 const MEDIA_API_ENVIRONMENT = 'media-api-environment';
@@ -13,10 +14,6 @@ const defaultImageOptions = {
   allowAnimated: true,
   mode: 'crop'
 };
-const defaultGetCollectionItems = {
-  limit: 30,
-  sortDirection: 'desc'
-};
 const extendImageParams = (params, fetchMaxRes = false) => {
   return {
     ...defaultImageOptions,
@@ -38,42 +35,13 @@ export class MediaStore {
     this.config = config;
     this.featureFlags = featureFlags;
   }
-  async getCollectionItems(collectionName, params, traceContext) {
-    const metadata = {
-      method: 'GET',
-      endpoint: '/collection/{collectionName}/items'
-    };
-    const options = {
-      ...metadata,
-      authContext: {
-        collectionName
-      },
-      params: {
-        ...defaultGetCollectionItems,
-        ...params
-      },
-      headers: {
-        Accept: 'application/json'
-      },
-      traceContext
-    };
-    const response = await this.request(`/collection/${collectionName}/items`, options);
-    const {
-      data: {
-        contents,
-        nextInclusiveStartKey
-      }
-    } = await createMapResponseToJson(metadata)(response);
 
-    // [TODO] MS-705: remove after backend adds filter
-    // This prevents showing "ghost" files in recents
-    const contentsWithoutEmptyFiles = contents.filter(item => item.details.size && item.details.size > 0);
-    return {
-      data: {
-        contents: contentsWithoutEmptyFiles,
-        nextInclusiveStartKey
-      }
-    };
+  /**
+   * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+   * This method is no longer working. Will be removed in the next release
+   */
+  async getCollectionItems(collectionName, params, traceContext) {
+    throw new DeprecatedError('collection/:name/items');
   }
   async removeCollectionFile(id, collectionName, occurrenceKey, traceContext) {
     const metadata = {

package/dist/es2019/utils/deprecatedEndpointError.js

@@ -0,0 +1,20 @@
+import { BaseMediaClientError } from '../models/errors';
+const reason = 'deprecatedEndpoint';
+export class DeprecatedError extends BaseMediaClientError {
+  constructor(endpointName) {
+    super(reason);
+    this.endpointName = endpointName;
+  }
+  get attributes() {
+    const {
+      endpointName
+    } = this;
+    return {
+      reason,
+      endpointName
+    };
+  }
+}
+export function isDeprecatedError(err) {
+  return err instanceof DeprecatedError;
+}

package/dist/es2019/version.json

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

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

@@ -1,51 +1,16 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-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) { _defineProperty(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; }
-import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
-import { mapMediaFileToFileState } from '../models/file-state';
-import { fromObservable } from '../utils/mediaSubscribable';
+import { DeprecatedError } from '../utils/deprecatedEndpointError';
 export var collectionCache = {};
-var createCacheEntry = function createCacheEntry() {
-  return {
-    items: [],
-    subject: new ReplaySubject(1),
-    isLoadingNextPage: false
-  };
-};
 export var CollectionFetcher = /*#__PURE__*/function () {
   function CollectionFetcher(mediaStore) {
     _classCallCheck(this, CollectionFetcher);
     this.mediaStore = mediaStore;
   }
   _createClass(CollectionFetcher, [{
-    key: "createFileStateObserver",
-    value: function createFileStateObserver(id, details) {
-      var subject = new ReplaySubject(1);
-      var mediaFile = _objectSpread({
-        id: id
-      }, details);
-      var fileState = mapMediaFileToFileState({
-        data: mediaFile
-      });
-      subject.next(fileState);
-      return subject;
-    }
-  }, {
-    key: "populateCache",
-    value: function populateCache(items) {
-      var _this = this;
-      items.forEach(function (item) {
-        var fileStream = _this.createFileStateObserver(item.id, item.details);
-        getFileStreamsCache().set(item.id, fileStream);
-      });
-    }
-  }, {
     key: "removeFromCache",
     value: function removeFromCache(id, collectionName) {
       var collectionCacheIndex = collectionCache[collectionName].items.findIndex(function (item) {
@@ -57,31 +22,15 @@ export var CollectionFetcher = /*#__PURE__*/function () {
       getFileStreamsCache().remove(id);
       collectionCache[collectionName].items.splice(collectionCacheIndex, 1);
     }
+
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
   }, {
     key: "getItems",
     value: function getItems(collectionName, params, traceContext) {
-      var _this2 = this;
-      if (!collectionCache[collectionName]) {
-        collectionCache[collectionName] = createCacheEntry();
-      }
-      var collection = collectionCache[collectionName];
-      var subject = collection.subject;
-      this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
-        details: 'full'
-      }), traceContext).then(function (items) {
-        var _items$data = items.data,
-          contents = _items$data.contents,
-          nextInclusiveStartKey = _items$data.nextInclusiveStartKey;
-        _this2.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(function (error) {
-        return subject.error(error);
-      });
-      return fromObservable(subject);
+      throw new DeprecatedError('collection/:name/items');
     }
   }, {
     key: "removeFile",
@@ -110,49 +59,25 @@ export var CollectionFetcher = /*#__PURE__*/function () {
       }
       return removeFile;
     }()
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
   }, {
     key: "loadNextPage",
     value: function () {
       var _loadNextPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(collectionName, params, traceContext) {
-        var collection, isLoading, _collectionCache$coll, inclusiveStartKey, currentItems, subject, response, _response$data, contents, nextInclusiveStartKey, newItems, items;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                collection = collectionCache[collectionName];
-                isLoading = collection ? collection.isLoadingNextPage : false;
-                if (!(!collection || !collection.nextInclusiveStartKey || isLoading)) {
-                  _context2.next = 4;
-                  break;
-                }
-                return _context2.abrupt("return");
-              case 4:
-                collection.isLoadingNextPage = true;
-                _collectionCache$coll = collectionCache[collectionName], inclusiveStartKey = _collectionCache$coll.nextInclusiveStartKey, currentItems = _collectionCache$coll.items, subject = _collectionCache$coll.subject;
-                _context2.next = 8;
-                return this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
-                  inclusiveStartKey: inclusiveStartKey,
-                  details: 'full'
-                }), traceContext);
-              case 8:
-                response = _context2.sent;
-                _response$data = response.data, contents = _response$data.contents, nextInclusiveStartKey = _response$data.nextInclusiveStartKey;
-                this.populateCache(contents);
-                newItems = response.data.contents;
-                items = [].concat(_toConsumableArray(currentItems), _toConsumableArray(newItems));
-                subject.next(items);
-                collectionCache[collectionName] = {
-                  items: items,
-                  nextInclusiveStartKey: nextInclusiveStartKey,
-                  subject: subject,
-                  isLoadingNextPage: false
-                };
-              case 15:
+                throw new DeprecatedError('collection/:name/items');
+              case 1:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee2);
       }));
       function loadNextPage(_x5, _x6, _x7) {
         return _loadNextPage.apply(this, arguments);

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

@@ -468,8 +468,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
-      var shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', this.featureFlags);
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext, featureFlags) {
+      var shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', featureFlags || this.featureFlags);
       if (shouldAlwaysFetchFileState) {
         return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
       }

package/dist/esm/client/media-store/index.js

@@ -11,6 +11,7 @@ import { getArtifactUrl } from '../../models/artifacts';
 import { request as _request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
+import { DeprecatedError } from '../../utils/deprecatedEndpointError';
 export { MediaStoreError, isMediaStoreError } from './error';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
@@ -19,10 +20,6 @@ var defaultImageOptions = {
   allowAnimated: true,
   mode: 'crop'
 };
-var defaultGetCollectionItems = {
-  limit: 30,
-  sortDirection: 'desc'
-};
 var extendImageParams = function extendImageParams(params) {
   var fetchMaxRes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return _objectSpread(_objectSpread(_objectSpread({}, defaultImageOptions), params), fetchMaxRes ? {
@@ -47,57 +44,26 @@ export var MediaStore = /*#__PURE__*/function () {
     this.config = config;
     this.featureFlags = featureFlags;
   }
+
+  /**
+   * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+   * This method is no longer working. Will be removed in the next release
+   */
   _createClass(MediaStore, [{
     key: "getCollectionItems",
     value: function () {
       var _getCollectionItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionName, params, traceContext) {
-        var metadata, options, response, _yield$createMapRespo, _yield$createMapRespo2, contents, nextInclusiveStartKey, contentsWithoutEmptyFiles;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                metadata = {
-                  method: 'GET',
-                  endpoint: '/collection/{collectionName}/items'
-                };
-                options = _objectSpread(_objectSpread({}, metadata), {}, {
-                  authContext: {
-                    collectionName: collectionName
-                  },
-                  params: _objectSpread(_objectSpread({}, defaultGetCollectionItems), params),
-                  headers: {
-                    Accept: 'application/json'
-                  },
-                  traceContext: traceContext
-                });
-                _context.next = 4;
-                return this.request("/collection/".concat(collectionName, "/items"), options);
-              case 4:
-                response = _context.sent;
-                _context.next = 7;
-                return createMapResponseToJson(metadata)(response);
-              case 7:
-                _yield$createMapRespo = _context.sent;
-                _yield$createMapRespo2 = _yield$createMapRespo.data;
-                contents = _yield$createMapRespo2.contents;
-                nextInclusiveStartKey = _yield$createMapRespo2.nextInclusiveStartKey;
-                // [TODO] MS-705: remove after backend adds filter
-                // This prevents showing "ghost" files in recents
-                contentsWithoutEmptyFiles = contents.filter(function (item) {
-                  return item.details.size && item.details.size > 0;
-                });
-                return _context.abrupt("return", {
-                  data: {
-                    contents: contentsWithoutEmptyFiles,
-                    nextInclusiveStartKey: nextInclusiveStartKey
-                  }
-                });
-              case 13:
+                throw new DeprecatedError('collection/:name/items');
+              case 1:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this);
+        }, _callee);
       }));
       function getCollectionItems(_x, _x2, _x3) {
         return _getCollectionItems.apply(this, arguments);

package/dist/esm/utils/deprecatedEndpointError.js

@@ -0,0 +1,34 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+import { BaseMediaClientError } from '../models/errors';
+var reason = 'deprecatedEndpoint';
+export var DeprecatedError = /*#__PURE__*/function (_BaseMediaClientError) {
+  _inherits(DeprecatedError, _BaseMediaClientError);
+  var _super = _createSuper(DeprecatedError);
+  function DeprecatedError(endpointName) {
+    var _this;
+    _classCallCheck(this, DeprecatedError);
+    _this = _super.call(this, reason);
+    _this.endpointName = endpointName;
+    return _this;
+  }
+  _createClass(DeprecatedError, [{
+    key: "attributes",
+    get: function get() {
+      var endpointName = this.endpointName;
+      return {
+        reason: reason,
+        endpointName: endpointName
+      };
+    }
+  }]);
+  return DeprecatedError;
+}(BaseMediaClientError);
+export function isDeprecatedError(err) {
+  return err instanceof DeprecatedError;
+}

package/dist/esm/version.json

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

package/dist/types/client/collection-fetcher.d.ts

@@ -27,10 +27,16 @@ export declare const collectionCache: CollectionCache;
 export declare class CollectionFetcher {
     readonly mediaStore: MediaStore;
     constructor(mediaStore: MediaStore);
-    private createFileStateObserver;
-    private populateCache;
     private removeFromCache;
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
     getItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams, traceContext?: MediaTraceContext): MediaSubscribable<MediaCollectionItem[]>;
     removeFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
     loadNextPage(collectionName: string, params?: MediaStoreGetCollectionItemsParams, traceContext?: MediaTraceContext): Promise<void>;
 }

package/dist/types/client/file-fetcher/index.d.ts

@@ -32,7 +32,7 @@ export interface FileFetcher {
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable<FileState>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable<FileState>;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
@@ -55,7 +55,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     private getUploadingFileStateBase;
     private uploadAwlaysPullFileStates;
     private uploadConditionallyPullFileStates;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable<FileState>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable<FileState>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;
 }

package/dist/types/client/media-store/index.d.ts

@@ -9,6 +9,10 @@ export declare class MediaStore {
     private readonly config;
     readonly featureFlags?: MediaFeatureFlags | undefined;
     constructor(config: MediaApiConfig, featureFlags?: MediaFeatureFlags | undefined);
+    /**
+     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-170 Internal documentation for deprecation (no external access)}
+     * This method is no longer working. Will be removed in the next release
+     */
     getCollectionItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaCollectionItems>>;
     removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
     createUpload(createUpTo?: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaUpload[]>>;

package/dist/types/models/errors/types.d.ts

@@ -1,4 +1,4 @@
-export declare type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit';
+export declare type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export interface MediaClientErrorAttributes {
     reason: MediaClientErrorReason;
 }

package/dist/types/utils/deprecatedEndpointError.d.ts

@@ -0,0 +1,16 @@
+import { BaseMediaClientError } from '../models/errors';
+declare const reason: "deprecatedEndpoint";
+export declare type DeprecatedErrorAttributes = {
+    readonly reason: typeof reason;
+    readonly endpointName: string;
+};
+export declare class DeprecatedError extends BaseMediaClientError<DeprecatedErrorAttributes> {
+    readonly endpointName: string;
+    constructor(endpointName: string);
+    get attributes(): {
+        reason: "deprecatedEndpoint";
+        endpointName: string;
+    };
+}
+export declare function isDeprecatedError(err: Error): err is DeprecatedError;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "20.0.3",
+  "version": "20.2.0",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@atlaskit/chunkinator": "^4.1.0",
-    "@atlaskit/media-common": "^2.19.0",
+    "@atlaskit/media-common": "^3.0.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -42,14 +42,14 @@
     "xstate": "4.20.0"
   },
   "peerDependencies": {
-    "@atlaskit/media-core": "^34.0.1",
+    "@atlaskit/media-core": "^34.0.2",
     "@emotion/react": "^11.7.1",
     "react": "^16.8.0"
   },
   "devDependencies": {
     "@atlaskit/button": "^16.5.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^74.6.0",
+    "@atlaskit/media-card": "^74.7.0",
     "@atlaskit/media-core": "^34.0.0",
     "@atlaskit/media-test-helpers": "^30.1.0",
     "@atlaskit/ssr": "*",

package/report.api.md

@@ -82,13 +82,13 @@ export type ClientOptions = {
 // @public (undocumented)
 export class CollectionFetcher {
   constructor(mediaStore: MediaStore);
-  // (undocumented)
+  // @deprecated (undocumented)
   getItems(
     collectionName: string,
     params?: MediaStoreGetCollectionItemsParams,
     traceContext?: MediaTraceContext,
   ): MediaSubscribable<MediaCollectionItem[]>;
-  // (undocumented)
+  // @deprecated (undocumented)
   loadNextPage(
     collectionName: string,
     params?: MediaStoreGetCollectionItemsParams,
@@ -827,6 +827,7 @@ export type MediaClientErrorReason =
   | 'clientAbortedRequest'
   | 'clientOffline'
   | 'clientTimeoutRequest'
+  | 'deprecatedEndpoint'
   | 'emptyAuth'
   | 'emptyItems'
   | 'failedAuthProvider'
@@ -979,7 +980,7 @@ export class MediaStore {
     artifactName: keyof MediaFileArtifacts,
     collectionName?: string,
   ): Promise<string>;
-  // (undocumented)
+  // @deprecated (undocumented)
   getCollectionItems(
     collectionName: string,
     params?: MediaStoreGetCollectionItemsParams,