@atlaskit/media-client 28.3.1 → 28.4.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/media-client
 
+## 28.4.0
+
+### Minor Changes
+
+- [#170821](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/170821)
+  [`52532d238c0b6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/52532d238c0b6) -
+  Enabled the deduplication of files in media-filmstrip by passing includeHashForDuplicateFiles flag
+  to /items
+
 ## 28.3.1
 
 ### Patch Changes

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

@@ -86,7 +86,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
       });
     });
     // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
-    (0, _defineProperty2.default)(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey) {
+    (0, _defineProperty2.default)(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey, includeHashForDuplicateFiles) {
       var subject = (0, _createMediaSubject.createMediaSubject)();
       var poll = new _polling.PollingFunction();
 
@@ -102,7 +102,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               _context.next = 2;
               return _this.dataloader.load({
                 id: id,
-                collectionName: collectionName
+                collectionName: collectionName,
+                includeHashForDuplicateFiles: includeHashForDuplicateFiles
               });
             case 2:
               response = _context.sent;
@@ -189,7 +190,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
       var _this2 = this;
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var collectionName = options.collectionName,
-        occurrenceKey = options.occurrenceKey;
+        occurrenceKey = options.occurrenceKey,
+        includeHashForDuplicateFiles = options.includeHashForDuplicateFiles;
       if (!(0, _uuidValidate.default)(id)) {
         var _err$attributes;
         var subject = (0, _createMediaSubject.createMediaSubject)();
@@ -215,7 +217,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
         return (0, _mediaSubscribable.fromObservable)(subject);
       }
       return (0, _mediaSubscribable.fromObservable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
-        var subject = _this2.createDownloadFileStream(id, collectionName);
+        var subject = _this2.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles);
         subject.subscribe({
           next: function next(fileState) {
             _this2.setFileState(id, fileState);

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

@@ -469,7 +469,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getItems",
     value: function () {
-      var _getItems = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(ids, collectionName, traceContext) {
+      var _getItems = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(ids, collectionName, traceContext, includeHashForDuplicateFiles) {
         var descriptors, metadata, options;
         return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
@@ -491,7 +491,8 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 },
                 headers: jsonHeaders,
                 body: JSON.stringify({
-                  descriptors: descriptors
+                  descriptors: descriptors,
+                  includeHashForDuplicateFiles: includeHashForDuplicateFiles
                 }),
                 traceContext: traceContext
               });
@@ -502,7 +503,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function getItems(_x27, _x28, _x29) {
+      function getItems(_x27, _x28, _x29, _x30) {
         return _getItems.apply(this, arguments);
       }
       return getItems;
@@ -533,7 +534,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function getImageMetadata(_x30, _x31, _x32) {
+      function getImageMetadata(_x31, _x32, _x33) {
         return _getImageMetadata.apply(this, arguments);
       }
       return getImageMetadata;
@@ -566,7 +567,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function appendChunksToUpload(_x33, _x34, _x35, _x36) {
+      function appendChunksToUpload(_x34, _x35, _x36, _x37) {
         return _appendChunksToUpload.apply(this, arguments);
       }
       return appendChunksToUpload;
@@ -661,7 +662,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function request(_x37) {
+      function request(_x38) {
         return _request2.apply(this, arguments);
       }
       return request;
@@ -694,7 +695,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee13);
       }));
-      function testUrl(_x38) {
+      function testUrl(_x39) {
         return _testUrl.apply(this, arguments);
       }
       return testUrl;

package/dist/cjs/models/file-state.js

@@ -47,7 +47,8 @@ var mapMediaFileToFileState = exports.mapMediaFileToFileState = function mapMedi
     mimeType = _mediaFile$data.mimeType,
     representations = _mediaFile$data.representations,
     createdAt = _mediaFile$data.createdAt,
-    metadataTraceContext = _mediaFile$data.metadataTraceContext;
+    metadataTraceContext = _mediaFile$data.metadataTraceContext,
+    hash = _mediaFile$data.hash;
   var baseState = {
     id: id,
     name: name,
@@ -57,6 +58,7 @@ var mapMediaFileToFileState = exports.mapMediaFileToFileState = function mapMedi
     artifacts: artifacts,
     representations: representations,
     createdAt: createdAt,
+    hash: hash,
     metadataTraceContext: metadataTraceContext
   };
   switch (processingStatus) {

package/dist/cjs/utils/createFileDataLoader.js

@@ -69,11 +69,18 @@ var getItemsFromKeys = exports.getItemsFromKeys = function getItemsFromKeys(data
 function createBatchLoadingFunc(mediaStore) {
   return /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(keys) {
-      var nonCollectionName, fileIdsByCollection, items;
+      var nonCollectionName, includeHashByCollection, fileIdsByCollection, items;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             nonCollectionName = '__media-single-file-collection__';
+            includeHashByCollection = keys.reduce(function (acc, key) {
+              var collectionName = key.collectionName || nonCollectionName;
+              if (key.includeHashForDuplicateFiles) {
+                acc[collectionName] = key.includeHashForDuplicateFiles;
+              }
+              return acc;
+            }, {});
             fileIdsByCollection = keys.reduce(function (acc, key) {
               var collectionName = key.collectionName || nonCollectionName;
               var fileIds = acc[collectionName] || [];
@@ -86,10 +93,10 @@ function createBatchLoadingFunc(mediaStore) {
               return acc;
             }, {});
             items = [];
-            _context2.next = 5;
+            _context2.next = 6;
             return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
               var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(collectionNameKey) {
-                var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext, itemsIds, fileIdsNotFound;
+                var metadataTraceContext, fileIds, includeHashForDuplicateFiles, collectionName, response, itemsWithMetadataTraceContext, itemsIds, fileIdsNotFound;
                 return _regenerator.default.wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -98,11 +105,12 @@ function createBatchLoadingFunc(mediaStore) {
                         spanId: (0, _mediaCommon.getRandomHex)(8)
                       };
                       fileIds = fileIdsByCollection[collectionNameKey];
+                      includeHashForDuplicateFiles = includeHashByCollection[collectionNameKey];
                       collectionName = collectionNameKey === nonCollectionName ? undefined : collectionNameKey;
-                      _context.prev = 3;
-                      _context.next = 6;
-                      return mediaStore.getItems(fileIds, collectionName, metadataTraceContext);
-                    case 6:
+                      _context.prev = 4;
+                      _context.next = 7;
+                      return mediaStore.getItems(fileIds, collectionName, metadataTraceContext, includeHashForDuplicateFiles);
+                    case 7:
                       response = _context.sent;
                       itemsWithMetadataTraceContext = response.data.items.map(function (item) {
                         return _objectSpread(_objectSpread({}, item), {}, {
@@ -126,11 +134,11 @@ function createBatchLoadingFunc(mediaStore) {
                           metadataTraceContext: metadataTraceContext
                         });
                       });
-                      _context.next = 17;
+                      _context.next = 18;
                       break;
-                    case 14:
-                      _context.prev = 14;
-                      _context.t0 = _context["catch"](3);
+                    case 15:
+                      _context.prev = 15;
+                      _context.t0 = _context["catch"](4);
                       fileIds.forEach(function (fileId) {
                         items.push({
                           id: fileId,
@@ -138,19 +146,19 @@ function createBatchLoadingFunc(mediaStore) {
                           error: _context.t0
                         });
                       });
-                    case 17:
+                    case 18:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee, null, [[3, 14]]);
+                }, _callee, null, [[4, 15]]);
               }));
               return function (_x2) {
                 return _ref2.apply(this, arguments);
               };
             }()));
-          case 5:
-            return _context2.abrupt("return", getItemsFromKeys(keys, items));
           case 6:
+            return _context2.abrupt("return", getItemsFromKeys(keys, items));
+          case 7:
           case "end":
             return _context2.stop();
         }

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

@@ -60,7 +60,7 @@ export class FileFetcherImpl {
       });
     });
     // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
-    _defineProperty(this, "createDownloadFileStream", (id, collectionName, occurrenceKey) => {
+    _defineProperty(this, "createDownloadFileStream", (id, collectionName, occurrenceKey, includeHashForDuplicateFiles) => {
       const subject = createMediaSubject();
       const poll = new PollingFunction();
 
@@ -69,7 +69,8 @@ export class FileFetcherImpl {
       poll.execute(async () => {
         const response = await this.dataloader.load({
           id,
-          collectionName
+          collectionName,
+          includeHashForDuplicateFiles
         });
         if (isNotFoundMediaItemDetails(response)) {
           throw new FileFetcherError('emptyItems', id, {
@@ -142,7 +143,8 @@ export class FileFetcherImpl {
   getFileState(id, options = {}) {
     const {
       collectionName,
-      occurrenceKey
+      occurrenceKey,
+      includeHashForDuplicateFiles
     } = options;
     if (!isValidId(id)) {
       var _err$attributes;
@@ -173,7 +175,7 @@ export class FileFetcherImpl {
       return fromObservable(subject);
     }
     return fromObservable(getFileStreamsCache().getOrInsert(id, () => {
-      const subject = this.createDownloadFileStream(id, collectionName);
+      const subject = this.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles);
       subject.subscribe({
         next: fileState => {
           this.setFileState(id, fileState);

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

@@ -275,7 +275,7 @@ export class MediaStore {
     };
     return this.request(`/file/${id}/${imageEndpoint}`, options, controller, true).then(createMapResponseToBlob(metadata));
   }
-  async getItems(ids, collectionName, traceContext) {
+  async getItems(ids, collectionName, traceContext, includeHashForDuplicateFiles) {
     const descriptors = ids.map(id => ({
       type: 'file',
       id,
@@ -292,7 +292,8 @@ export class MediaStore {
       },
       headers: jsonHeaders,
       body: JSON.stringify({
-        descriptors
+        descriptors,
+        includeHashForDuplicateFiles
       }),
       traceContext
     };

package/dist/es2019/models/file-state.js

@@ -25,7 +25,8 @@ export const mapMediaFileToFileState = mediaFile => {
     mimeType,
     representations,
     createdAt,
-    metadataTraceContext
+    metadataTraceContext,
+    hash
   } = mediaFile.data;
   const baseState = {
     id,
@@ -36,6 +37,7 @@ export const mapMediaFileToFileState = mediaFile => {
     artifacts,
     representations,
     createdAt,
+    hash,
     metadataTraceContext
   };
   switch (processingStatus) {

package/dist/es2019/utils/createFileDataLoader.js

@@ -56,6 +56,13 @@ export const getItemsFromKeys = (dataloaderKeys, fileItems) => {
 export function createBatchLoadingFunc(mediaStore) {
   return async keys => {
     const nonCollectionName = '__media-single-file-collection__';
+    const includeHashByCollection = keys.reduce((acc, key) => {
+      const collectionName = key.collectionName || nonCollectionName;
+      if (key.includeHashForDuplicateFiles) {
+        acc[collectionName] = key.includeHashForDuplicateFiles;
+      }
+      return acc;
+    }, {});
     const fileIdsByCollection = keys.reduce((acc, key) => {
       const collectionName = key.collectionName || nonCollectionName;
       const fileIds = acc[collectionName] || [];
@@ -74,9 +81,10 @@ export function createBatchLoadingFunc(mediaStore) {
         spanId: getRandomHex(8)
       };
       const fileIds = fileIdsByCollection[collectionNameKey];
+      const includeHashForDuplicateFiles = includeHashByCollection[collectionNameKey];
       const collectionName = collectionNameKey === nonCollectionName ? undefined : collectionNameKey;
       try {
-        const response = await mediaStore.getItems(fileIds, collectionName, metadataTraceContext);
+        const response = await mediaStore.getItems(fileIds, collectionName, metadataTraceContext, includeHashForDuplicateFiles);
         const itemsWithMetadataTraceContext = response.data.items.map(item => ({
           ...item,
           metadataTraceContext

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

@@ -68,7 +68,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       });
     });
     // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
-    _defineProperty(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey) {
+    _defineProperty(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey, includeHashForDuplicateFiles) {
       var subject = createMediaSubject();
       var poll = new PollingFunction();
 
@@ -84,7 +84,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               _context.next = 2;
               return _this.dataloader.load({
                 id: id,
-                collectionName: collectionName
+                collectionName: collectionName,
+                includeHashForDuplicateFiles: includeHashForDuplicateFiles
               });
             case 2:
               response = _context.sent;
@@ -171,7 +172,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       var _this2 = this;
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var collectionName = options.collectionName,
-        occurrenceKey = options.occurrenceKey;
+        occurrenceKey = options.occurrenceKey,
+        includeHashForDuplicateFiles = options.includeHashForDuplicateFiles;
       if (!isValidId(id)) {
         var _err$attributes;
         var subject = createMediaSubject();
@@ -197,7 +199,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         return fromObservable(subject);
       }
       return fromObservable(getFileStreamsCache().getOrInsert(id, function () {
-        var subject = _this2.createDownloadFileStream(id, collectionName);
+        var subject = _this2.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles);
         subject.subscribe({
           next: function next(fileState) {
             _this2.setFileState(id, fileState);

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

@@ -463,7 +463,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getItems",
     value: function () {
-      var _getItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(ids, collectionName, traceContext) {
+      var _getItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(ids, collectionName, traceContext, includeHashForDuplicateFiles) {
         var descriptors, metadata, options;
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
@@ -485,7 +485,8 @@ export var MediaStore = /*#__PURE__*/function () {
                 },
                 headers: jsonHeaders,
                 body: JSON.stringify({
-                  descriptors: descriptors
+                  descriptors: descriptors,
+                  includeHashForDuplicateFiles: includeHashForDuplicateFiles
                 }),
                 traceContext: traceContext
               });
@@ -496,7 +497,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function getItems(_x27, _x28, _x29) {
+      function getItems(_x27, _x28, _x29, _x30) {
         return _getItems.apply(this, arguments);
       }
       return getItems;
@@ -527,7 +528,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function getImageMetadata(_x30, _x31, _x32) {
+      function getImageMetadata(_x31, _x32, _x33) {
         return _getImageMetadata.apply(this, arguments);
       }
       return getImageMetadata;
@@ -560,7 +561,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function appendChunksToUpload(_x33, _x34, _x35, _x36) {
+      function appendChunksToUpload(_x34, _x35, _x36, _x37) {
         return _appendChunksToUpload.apply(this, arguments);
       }
       return appendChunksToUpload;
@@ -655,7 +656,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function request(_x37) {
+      function request(_x38) {
         return _request2.apply(this, arguments);
       }
       return request;
@@ -688,7 +689,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee13);
       }));
-      function testUrl(_x38) {
+      function testUrl(_x39) {
         return _testUrl.apply(this, arguments);
       }
       return testUrl;

package/dist/esm/models/file-state.js

@@ -40,7 +40,8 @@ export var mapMediaFileToFileState = function mapMediaFileToFileState(mediaFile)
     mimeType = _mediaFile$data.mimeType,
     representations = _mediaFile$data.representations,
     createdAt = _mediaFile$data.createdAt,
-    metadataTraceContext = _mediaFile$data.metadataTraceContext;
+    metadataTraceContext = _mediaFile$data.metadataTraceContext,
+    hash = _mediaFile$data.hash;
   var baseState = {
     id: id,
     name: name,
@@ -50,6 +51,7 @@ export var mapMediaFileToFileState = function mapMediaFileToFileState(mediaFile)
     artifacts: artifacts,
     representations: representations,
     createdAt: createdAt,
+    hash: hash,
     metadataTraceContext: metadataTraceContext
   };
   switch (processingStatus) {

package/dist/esm/utils/createFileDataLoader.js

@@ -59,11 +59,18 @@ export var getItemsFromKeys = function getItemsFromKeys(dataloaderKeys, fileItem
 export function createBatchLoadingFunc(mediaStore) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(keys) {
-      var nonCollectionName, fileIdsByCollection, items;
+      var nonCollectionName, includeHashByCollection, fileIdsByCollection, items;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             nonCollectionName = '__media-single-file-collection__';
+            includeHashByCollection = keys.reduce(function (acc, key) {
+              var collectionName = key.collectionName || nonCollectionName;
+              if (key.includeHashForDuplicateFiles) {
+                acc[collectionName] = key.includeHashForDuplicateFiles;
+              }
+              return acc;
+            }, {});
             fileIdsByCollection = keys.reduce(function (acc, key) {
               var collectionName = key.collectionName || nonCollectionName;
               var fileIds = acc[collectionName] || [];
@@ -76,10 +83,10 @@ export function createBatchLoadingFunc(mediaStore) {
               return acc;
             }, {});
             items = [];
-            _context2.next = 5;
+            _context2.next = 6;
             return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionNameKey) {
-                var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext, itemsIds, fileIdsNotFound;
+                var metadataTraceContext, fileIds, includeHashForDuplicateFiles, collectionName, response, itemsWithMetadataTraceContext, itemsIds, fileIdsNotFound;
                 return _regeneratorRuntime.wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -88,11 +95,12 @@ export function createBatchLoadingFunc(mediaStore) {
                         spanId: getRandomHex(8)
                       };
                       fileIds = fileIdsByCollection[collectionNameKey];
+                      includeHashForDuplicateFiles = includeHashByCollection[collectionNameKey];
                       collectionName = collectionNameKey === nonCollectionName ? undefined : collectionNameKey;
-                      _context.prev = 3;
-                      _context.next = 6;
-                      return mediaStore.getItems(fileIds, collectionName, metadataTraceContext);
-                    case 6:
+                      _context.prev = 4;
+                      _context.next = 7;
+                      return mediaStore.getItems(fileIds, collectionName, metadataTraceContext, includeHashForDuplicateFiles);
+                    case 7:
                       response = _context.sent;
                       itemsWithMetadataTraceContext = response.data.items.map(function (item) {
                         return _objectSpread(_objectSpread({}, item), {}, {
@@ -116,11 +124,11 @@ export function createBatchLoadingFunc(mediaStore) {
                           metadataTraceContext: metadataTraceContext
                         });
                       });
-                      _context.next = 17;
+                      _context.next = 18;
                       break;
-                    case 14:
-                      _context.prev = 14;
-                      _context.t0 = _context["catch"](3);
+                    case 15:
+                      _context.prev = 15;
+                      _context.t0 = _context["catch"](4);
                       fileIds.forEach(function (fileId) {
                         items.push({
                           id: fileId,
@@ -128,19 +136,19 @@ export function createBatchLoadingFunc(mediaStore) {
                           error: _context.t0
                         });
                       });
-                    case 17:
+                    case 18:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee, null, [[3, 14]]);
+                }, _callee, null, [[4, 15]]);
               }));
               return function (_x2) {
                 return _ref2.apply(this, arguments);
               };
             }()));
-          case 5:
-            return _context2.abrupt("return", getItemsFromKeys(keys, items));
           case 6:
+            return _context2.abrupt("return", getItemsFromKeys(keys, items));
+          case 7:
           case "end":
             return _context2.stop();
         }

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

@@ -22,7 +22,7 @@ export declare class MediaStore implements MediaApi {
     getFileBinaryURL(id: string, collectionName?: string, maxAge?: number): Promise<string>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext): Promise<Blob>;
-    getItems(ids: string[], collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<ItemsPayload>>;
+    getItems(ids: string[], collectionName?: string, traceContext?: MediaTraceContext, includeHashForDuplicateFiles?: boolean): Promise<MediaStoreResponse<ItemsPayload>>;
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext): Promise<{
         metadata: ImageMetadata;
     }>;

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

@@ -160,7 +160,7 @@ export interface MediaApi {
     getFileBinaryURL: (id: string, collectionName?: string) => Promise<string>;
     getArtifactURL: (artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string) => Promise<string>;
     getImage: (id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext) => Promise<Blob>;
-    getItems: (ids: string[], collectionName?: string, traceContext?: MediaTraceContext) => Promise<MediaStoreResponse<ItemsPayload>>;
+    getItems: (ids: string[], collectionName?: string, traceContext?: MediaTraceContext, includeHashForDuplicateFiles?: boolean) => Promise<MediaStoreResponse<ItemsPayload>>;
     getImageMetadata: (id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext) => Promise<{
         metadata: ImageMetadata;
     }>;

package/dist/types/models/file-state.d.ts

@@ -9,6 +9,7 @@ export interface GetFileOptions {
     preview?: PreviewOptions;
     collectionName?: string;
     occurrenceKey?: string;
+    includeHashForDuplicateFiles?: boolean;
 }
 export interface PreviewableFileState {
     preview: FilePreview | Promise<FilePreview>;

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

@@ -13,6 +13,7 @@ export type MediaFile = {
     readonly artifacts: MediaFileArtifacts;
     readonly representations: MediaRepresentations;
     readonly createdAt?: number;
+    readonly hash?: string;
     readonly metadataTraceContext?: MediaTraceContext;
 };
 export type MediaItemDetails = {
@@ -24,6 +25,7 @@ export type MediaItemDetails = {
     readonly artifacts: MediaFileArtifacts;
     readonly representations: MediaRepresentations;
     readonly createdAt?: number;
+    readonly hash?: string;
     readonly metadataTraceContext?: MediaTraceContext;
 };
 export type NotFoundMediaItemDetails = {

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

@@ -5,6 +5,7 @@ export declare const MAX_BATCH_SIZE = 100;
 export type DataloaderKey = {
     readonly id: string;
     readonly collectionName?: string;
+    readonly includeHashForDuplicateFiles?: boolean;
 };
 export type DataloaderResult = MediaItemDetails | NotFoundMediaItemDetails;
 export type BatchLoadingErrorResult = {

package/dist/types-ts4.5/client/media-store/MediaStore.d.ts

@@ -22,7 +22,7 @@ export declare class MediaStore implements MediaApi {
     getFileBinaryURL(id: string, collectionName?: string, maxAge?: number): Promise<string>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext): Promise<Blob>;
-    getItems(ids: string[], collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<ItemsPayload>>;
+    getItems(ids: string[], collectionName?: string, traceContext?: MediaTraceContext, includeHashForDuplicateFiles?: boolean): Promise<MediaStoreResponse<ItemsPayload>>;
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext): Promise<{
         metadata: ImageMetadata;
     }>;

package/dist/types-ts4.5/client/media-store/types.d.ts

@@ -160,7 +160,7 @@ export interface MediaApi {
     getFileBinaryURL: (id: string, collectionName?: string) => Promise<string>;
     getArtifactURL: (artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string) => Promise<string>;
     getImage: (id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext) => Promise<Blob>;
-    getItems: (ids: string[], collectionName?: string, traceContext?: MediaTraceContext) => Promise<MediaStoreResponse<ItemsPayload>>;
+    getItems: (ids: string[], collectionName?: string, traceContext?: MediaTraceContext, includeHashForDuplicateFiles?: boolean) => Promise<MediaStoreResponse<ItemsPayload>>;
     getImageMetadata: (id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext) => Promise<{
         metadata: ImageMetadata;
     }>;

package/dist/types-ts4.5/models/file-state.d.ts

@@ -9,6 +9,7 @@ export interface GetFileOptions {
     preview?: PreviewOptions;
     collectionName?: string;
     occurrenceKey?: string;
+    includeHashForDuplicateFiles?: boolean;
 }
 export interface PreviewableFileState {
     preview: FilePreview | Promise<FilePreview>;

package/dist/types-ts4.5/models/media.d.ts

@@ -13,6 +13,7 @@ export type MediaFile = {
     readonly artifacts: MediaFileArtifacts;
     readonly representations: MediaRepresentations;
     readonly createdAt?: number;
+    readonly hash?: string;
     readonly metadataTraceContext?: MediaTraceContext;
 };
 export type MediaItemDetails = {
@@ -24,6 +25,7 @@ export type MediaItemDetails = {
     readonly artifacts: MediaFileArtifacts;
     readonly representations: MediaRepresentations;
     readonly createdAt?: number;
+    readonly hash?: string;
     readonly metadataTraceContext?: MediaTraceContext;
 };
 export type NotFoundMediaItemDetails = {

package/dist/types-ts4.5/utils/createFileDataLoader.d.ts

@@ -5,6 +5,7 @@ export declare const MAX_BATCH_SIZE = 100;
 export type DataloaderKey = {
     readonly id: string;
     readonly collectionName?: string;
+    readonly includeHashForDuplicateFiles?: boolean;
 };
 export type DataloaderResult = MediaItemDetails | NotFoundMediaItemDetails;
 export type BatchLoadingErrorResult = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "28.3.1",
+	"version": "28.4.0",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
 	},
 	"devDependencies": {
 		"@atlaskit/media-core": "^34.3.0",
-		"@atlaskit/media-state": "^1.1.0",
+		"@atlaskit/media-state": "^1.2.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/tokens": "^2.4.0",
 		"@atlassian/feature-flags-test-utils": "0.2.3",