@atlaskit/media-client 16.0.0 → 16.0.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/media-client
 
+## 16.0.1
+
+### Patch Changes
+
+- [`12d0af77572`](https://bitbucket.org/atlassian/atlassian-frontend/commits/12d0af77572) - Store media environment in session storage
+- [`325e210e59f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/325e210e59f) - Revert changes made in MEX-1638-revert-update-media-store-class-with-new-endpoint-parameters
+- [`b73f20ed703`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b73f20ed703) - EDM-3073: Fix collab for media inline and copy-paste regression
+- [`c2ede50a80a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c2ede50a80a) - Add media region and environment returned from media API response into failed analytic events.
+- Updated dependencies
+
 ## 16.0.0
 
 ### Major Changes

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

@@ -333,7 +333,6 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                             };
                             mediaType = (0, _mediaTypeUtils.getMediaTypeFromMimeType)(type); // we emit a richer state after the blob is fetched
 
-                            // we emit a richer state after the blob is fetched
                             subject.next({
                               status: 'processing',
                               name: name,
@@ -345,7 +344,6 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                               preview: preview
                             }); // we don't want to wait for the file to be upload
 
-                            // we don't want to wait for the file to be upload
                             _this3.upload(file, undefined, uploadableFileUpfrontIds);
 
                             _context3.next = 12;

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

@@ -47,6 +47,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 MEDIA_API_REGION = 'media-api-region';
+var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var defaultImageOptions = {
   'max-age': _constants.FILE_CACHE_MAX_AGE,
   allowAnimated: true,
@@ -69,7 +70,6 @@ var jsonHeaders = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
 };
-var mediaEnvironment;
 
 var MediaStore = /*#__PURE__*/function () {
   function MediaStore(config, featureFlags) {
@@ -702,8 +702,8 @@ var MediaStore = /*#__PURE__*/function () {
 
               case 8:
                 response = _context11.sent;
-                updateMediaRegion(response.headers.get('x-media-region'));
-                updateMediaEnvironment(response.headers.get('x-media-env'));
+                setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
+                setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
                 return _context11.abrupt("return", response);
 
               case 12:
@@ -726,32 +726,30 @@ var MediaStore = /*#__PURE__*/function () {
 
 exports.MediaStore = MediaStore;
 
-function updateMediaRegion(region) {
-  if (!region || !(window && window.sessionStorage)) {
+var getValueFromSessionStorage = function getValueFromSessionStorage(key) {
+  return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;
+};
+
+var setKeyValueInSessionStorage = function setKeyValueInSessionStorage(key, value) {
+  if (!value || !(window && window.sessionStorage)) {
     return;
   }
 
-  var currentRegion = window.sessionStorage.getItem(MEDIA_API_REGION);
-
-  if (currentRegion !== region) {
-    window.sessionStorage.setItem(MEDIA_API_REGION, region);
-  }
-}
+  var currentValue = window.sessionStorage.getItem(key);
 
-var updateMediaEnvironment = function updateMediaEnvironment(mediaEnv) {
-  if (mediaEnv) {
-    mediaEnvironment = mediaEnv;
+  if (currentValue !== value) {
+    window.sessionStorage.setItem(key, value);
   }
 };
 
 var getMediaEnvironment = function getMediaEnvironment() {
-  return mediaEnvironment;
+  return getValueFromSessionStorage(MEDIA_API_ENVIRONMENT);
 };
 
 exports.getMediaEnvironment = getMediaEnvironment;
 
 var getMediaRegion = function getMediaRegion() {
-  return window && window.sessionStorage && window.sessionStorage.getItem(MEDIA_API_REGION) || undefined;
+  return getValueFromSessionStorage(MEDIA_API_REGION);
 };
 
 exports.getMediaRegion = getMediaRegion;

package/dist/cjs/utils/request/errors.js

@@ -48,6 +48,8 @@ var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
       _this$metadata = _this$metadata === void 0 ? {} : _this$metadata;
       var method = _this$metadata.method,
           endpoint = _this$metadata.endpoint,
+          mediaRegion = _this$metadata.mediaRegion,
+          mediaEnv = _this$metadata.mediaEnv,
           attempts = _this$metadata.attempts,
           clientExhaustedRetries = _this$metadata.clientExhaustedRetries,
           statusCode = _this$metadata.statusCode,
@@ -56,6 +58,8 @@ var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
         reason: reason,
         method: method,
         endpoint: endpoint,
+        mediaRegion: mediaRegion,
+        mediaEnv: mediaEnv,
         attempts: attempts,
         clientExhaustedRetries: clientExhaustedRetries,
         statusCode: statusCode,

package/dist/cjs/utils/request/helpers.js

@@ -14,6 +14,7 @@ exports.createProcessFetchResponse = createProcessFetchResponse;
 exports.createRequestErrorFromResponse = createRequestErrorFromResponse;
 exports.createRequestErrorReason = createRequestErrorReason;
 exports.createUrl = createUrl;
+exports.extractMediaHeaders = extractMediaHeaders;
 exports.fetchRetry = fetchRetry;
 exports.isAbortedRequestError = isAbortedRequestError;
 exports.isFetchNetworkError = isFetchNetworkError;
@@ -227,7 +228,7 @@ function createMapResponseToJson(metadata) {
             case 6:
               _context.prev = 6;
               _context.t0 = _context["catch"](0);
-              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context.t0);
 
@@ -262,7 +263,7 @@ function createMapResponseToBlob(metadata) {
             case 6:
               _context2.prev = 6;
               _context2.t0 = _context2["catch"](0);
-              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context2.t0);
 
@@ -448,7 +449,7 @@ function createRequestErrorReason(statusCode) {
 function createRequestErrorFromResponse(metadata, response) {
   var statusCode = response.status;
   var reason = createRequestErrorReason(statusCode);
-  return new _errors.RequestError(reason, _objectSpread(_objectSpread({}, metadata), {}, {
+  return new _errors.RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
     statusCode: statusCode
   }));
 }
@@ -462,4 +463,14 @@ function createProcessFetchResponse(metadata) {
     var requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };
+}
+
+function extractMediaHeaders(response) {
+  var headers = response.headers;
+  var mediaRegion = headers.get('x-media-region') || 'unknown';
+  var mediaEnv = headers.get('x-media-env') || 'unknown';
+  return {
+    mediaRegion: mediaRegion,
+    mediaEnv: mediaEnv
+  };
 }

package/dist/cjs/version.json

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

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

@@ -6,6 +6,7 @@ import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 export { MediaStoreError, isMediaStoreError } from './error';
 const MEDIA_API_REGION = 'media-api-region';
+const MEDIA_API_ENVIRONMENT = 'media-api-environment';
 const defaultImageOptions = {
   'max-age': FILE_CACHE_MAX_AGE,
   allowAnimated: true,
@@ -30,7 +31,6 @@ const jsonHeaders = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
 };
-let mediaEnvironment;
 export class MediaStore {
   constructor(config, featureFlags) {
     _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext));
@@ -375,34 +375,32 @@ export class MediaStore {
       body,
       clientOptions
     }, controller);
-    updateMediaRegion(response.headers.get('x-media-region'));
-    updateMediaEnvironment(response.headers.get('x-media-env'));
+    setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
+    setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
     return response;
   }
 
 }
 
-function updateMediaRegion(region) {
-  if (!region || !(window && window.sessionStorage)) {
+const getValueFromSessionStorage = key => {
+  return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;
+};
+
+const setKeyValueInSessionStorage = (key, value) => {
+  if (!value || !(window && window.sessionStorage)) {
     return;
   }
 
-  const currentRegion = window.sessionStorage.getItem(MEDIA_API_REGION);
-
-  if (currentRegion !== region) {
-    window.sessionStorage.setItem(MEDIA_API_REGION, region);
-  }
-}
+  const currentValue = window.sessionStorage.getItem(key);
 
-const updateMediaEnvironment = mediaEnv => {
-  if (mediaEnv) {
-    mediaEnvironment = mediaEnv;
+  if (currentValue !== value) {
+    window.sessionStorage.setItem(key, value);
   }
 };
 
 export const getMediaEnvironment = () => {
-  return mediaEnvironment;
+  return getValueFromSessionStorage(MEDIA_API_ENVIRONMENT);
 };
 export const getMediaRegion = () => {
-  return window && window.sessionStorage && window.sessionStorage.getItem(MEDIA_API_REGION) || undefined;
+  return getValueFromSessionStorage(MEDIA_API_REGION);
 };

package/dist/es2019/utils/request/errors.js

@@ -13,6 +13,8 @@ export class RequestError extends BaseMediaClientError {
       metadata: {
         method,
         endpoint,
+        mediaRegion,
+        mediaEnv,
         attempts,
         clientExhaustedRetries,
         statusCode
@@ -23,6 +25,8 @@ export class RequestError extends BaseMediaClientError {
       reason,
       method,
       endpoint,
+      mediaRegion,
+      mediaEnv,
       attempts,
       clientExhaustedRetries,
       statusCode,

package/dist/es2019/utils/request/helpers.js

@@ -108,6 +108,7 @@ export function createMapResponseToJson(metadata) {
       return await response.json();
     } catch (err) {
       throw new RequestError('serverInvalidBody', { ...metadata,
+        ...extractMediaHeaders(response),
         statusCode: response.status
       }, err);
     }
@@ -119,6 +120,7 @@ export function createMapResponseToBlob(metadata) {
       return await response.blob();
     } catch (err) {
       throw new RequestError('serverInvalidBody', { ...metadata,
+        ...extractMediaHeaders(response),
         statusCode: response.status
       }, err);
     }
@@ -224,6 +226,7 @@ export function createRequestErrorFromResponse(metadata, response) {
   } = response;
   const reason = createRequestErrorReason(statusCode);
   return new RequestError(reason, { ...metadata,
+    ...extractMediaHeaders(response),
     statusCode
   });
 }
@@ -236,4 +239,15 @@ export function createProcessFetchResponse(metadata) {
     const requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };
+}
+export function extractMediaHeaders(response) {
+  const {
+    headers
+  } = response;
+  const mediaRegion = headers.get('x-media-region') || 'unknown';
+  const mediaEnv = headers.get('x-media-env') || 'unknown';
+  return {
+    mediaRegion,
+    mediaEnv
+  };
 }

package/dist/es2019/version.json

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

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

@@ -285,7 +285,6 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                             };
                             mediaType = getMediaTypeFromMimeType(type); // we emit a richer state after the blob is fetched
 
-                            // we emit a richer state after the blob is fetched
                             subject.next({
                               status: 'processing',
                               name: name,
@@ -297,7 +296,6 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                               preview: preview
                             }); // we don't want to wait for the file to be upload
 
-                            // we don't want to wait for the file to be upload
                             _this3.upload(file, undefined, uploadableFileUpfrontIds);
 
                             _context3.next = 12;

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

@@ -15,6 +15,7 @@ import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 export { MediaStoreError, isMediaStoreError } from './error';
 var MEDIA_API_REGION = 'media-api-region';
+var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var defaultImageOptions = {
   'max-age': FILE_CACHE_MAX_AGE,
   allowAnimated: true,
@@ -37,7 +38,6 @@ var jsonHeaders = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
 };
-var mediaEnvironment;
 export var MediaStore = /*#__PURE__*/function () {
   function MediaStore(config, featureFlags) {
     var _this = this;
@@ -672,8 +672,8 @@ export var MediaStore = /*#__PURE__*/function () {
 
               case 8:
                 response = _context11.sent;
-                updateMediaRegion(response.headers.get('x-media-region'));
-                updateMediaEnvironment(response.headers.get('x-media-env'));
+                setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
+                setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
                 return _context11.abrupt("return", response);
 
               case 12:
@@ -695,27 +695,25 @@ export var MediaStore = /*#__PURE__*/function () {
   return MediaStore;
 }();
 
-function updateMediaRegion(region) {
-  if (!region || !(window && window.sessionStorage)) {
+var getValueFromSessionStorage = function getValueFromSessionStorage(key) {
+  return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;
+};
+
+var setKeyValueInSessionStorage = function setKeyValueInSessionStorage(key, value) {
+  if (!value || !(window && window.sessionStorage)) {
     return;
   }
 
-  var currentRegion = window.sessionStorage.getItem(MEDIA_API_REGION);
-
-  if (currentRegion !== region) {
-    window.sessionStorage.setItem(MEDIA_API_REGION, region);
-  }
-}
+  var currentValue = window.sessionStorage.getItem(key);
 
-var updateMediaEnvironment = function updateMediaEnvironment(mediaEnv) {
-  if (mediaEnv) {
-    mediaEnvironment = mediaEnv;
+  if (currentValue !== value) {
+    window.sessionStorage.setItem(key, value);
   }
 };
 
 export var getMediaEnvironment = function getMediaEnvironment() {
-  return mediaEnvironment;
+  return getValueFromSessionStorage(MEDIA_API_ENVIRONMENT);
 };
 export var getMediaRegion = function getMediaRegion() {
-  return window && window.sessionStorage && window.sessionStorage.getItem(MEDIA_API_REGION) || undefined;
+  return getValueFromSessionStorage(MEDIA_API_REGION);
 };

package/dist/esm/utils/request/errors.js

@@ -34,6 +34,8 @@ export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
       _this$metadata = _this$metadata === void 0 ? {} : _this$metadata;
       var method = _this$metadata.method,
           endpoint = _this$metadata.endpoint,
+          mediaRegion = _this$metadata.mediaRegion,
+          mediaEnv = _this$metadata.mediaEnv,
           attempts = _this$metadata.attempts,
           clientExhaustedRetries = _this$metadata.clientExhaustedRetries,
           statusCode = _this$metadata.statusCode,
@@ -42,6 +44,8 @@ export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
         reason: reason,
         method: method,
         endpoint: endpoint,
+        mediaRegion: mediaRegion,
+        mediaEnv: mediaEnv,
         attempts: attempts,
         clientExhaustedRetries: clientExhaustedRetries,
         statusCode: statusCode,

package/dist/esm/utils/request/helpers.js

@@ -182,7 +182,7 @@ export function createMapResponseToJson(metadata) {
             case 6:
               _context.prev = 6;
               _context.t0 = _context["catch"](0);
-              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context.t0);
 
@@ -216,7 +216,7 @@ export function createMapResponseToBlob(metadata) {
             case 6:
               _context2.prev = 6;
               _context2.t0 = _context2["catch"](0);
-              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context2.t0);
 
@@ -397,7 +397,7 @@ export function createRequestErrorReason(statusCode) {
 export function createRequestErrorFromResponse(metadata, response) {
   var statusCode = response.status;
   var reason = createRequestErrorReason(statusCode);
-  return new RequestError(reason, _objectSpread(_objectSpread({}, metadata), {}, {
+  return new RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
     statusCode: statusCode
   }));
 }
@@ -410,4 +410,13 @@ export function createProcessFetchResponse(metadata) {
     var requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };
+}
+export function extractMediaHeaders(response) {
+  var headers = response.headers;
+  var mediaRegion = headers.get('x-media-region') || 'unknown';
+  var mediaEnv = headers.get('x-media-env') || 'unknown';
+  return {
+    mediaRegion: mediaRegion,
+    mediaEnv: mediaEnv
+  };
 }

package/dist/esm/version.json

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

package/dist/types/utils/request/errors.d.ts

@@ -9,6 +9,8 @@ export declare class RequestError extends BaseMediaClientError<RequestErrorAttri
         reason: RequestErrorReason;
         method: import("./types").RequestMethod | undefined;
         endpoint: string | undefined;
+        mediaRegion: string | undefined;
+        mediaEnv: string | undefined;
         attempts: number | undefined;
         clientExhaustedRetries: boolean | undefined;
         statusCode: number | undefined;

package/dist/types/utils/request/helpers.d.ts

@@ -32,3 +32,7 @@ export declare function fetchRetry(functionToRetry: () => Promise<Response>, met
 export declare function createRequestErrorReason(statusCode: number): RequestErrorReason;
 export declare function createRequestErrorFromResponse(metadata: RequestErrorMetadata, response: Response): RequestError;
 export declare function createProcessFetchResponse(metadata: RequestMetadata): (response: Response) => Response;
+export declare function extractMediaHeaders(response: Response): {
+    mediaRegion: string;
+    mediaEnv: string;
+};

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

@@ -18,6 +18,8 @@ export declare type ClientOptions = {
 export declare type RequestMetadata = {
     readonly method?: RequestMethod;
     readonly endpoint?: string;
+    readonly mediaRegion?: string;
+    readonly mediaEnv?: string;
 };
 export declare type RequestOptions = RequestMetadata & {
     readonly auth?: Auth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "16.0.0",
+  "version": "16.0.1",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@atlaskit/chunkinator": "^4.0.0",
-    "@atlaskit/media-common": "^2.13.0",
+    "@atlaskit/media-common": "^2.14.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@atlaskit/button": "^16.3.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^73.6.0",
+    "@atlaskit/media-card": "^73.7.0",
     "@atlaskit/media-core": "^33.0.0",
     "@atlaskit/media-test-helpers": "^30.0.0",
     "@atlaskit/ssr": "*",