@atlaskit/media-card 78.0.0 → 78.0.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/media-card
 
+## 78.0.2
+
+### Patch Changes
+
+- [`fc2ed679e4540`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fc2ed679e4540) -
+  Sanitise UGC from fileId in `media-card-render` UFO experience
+
+## 78.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 78.0.0
 
 ### Major Changes

package/dist/cjs/card/card.js

@@ -16,7 +16,7 @@ var _externalImageCard = require("./externalImageCard");
 var _fileCard = require("./fileCard");
 var _excluded = ["identifier"];
 var packageName = "@atlaskit/media-card";
-var packageVersion = "78.0.0";
+var packageVersion = "78.0.2";
 var CardBase = exports.CardBase = function CardBase(_ref) {
   var identifier = _ref.identifier,
     otherProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);

package/dist/cjs/card/media-card-analytics-error-boundary.js

@@ -90,7 +90,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
 }(_react.default.Component);
 (0, _defineProperty2.default)(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
 var packageName = "@atlaskit/media-card";
-var packageVersion = "78.0.0";
+var packageVersion = "78.0.2";
 var MediaCardAnalyticsErrorBoundary = (0, _mediaCommon.withMediaAnalyticsContext)({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/cjs/inline/loader.js

@@ -119,7 +119,7 @@ var MediaInlineCardLoader = exports.default = /*#__PURE__*/function (_React$Pure
         ErrorBoundary = _this$state.ErrorBoundary;
       var analyticsContext = {
         packageVersion: "@atlaskit/media-card",
-        packageName: "78.0.0",
+        packageName: "78.0.2",
         componentName: 'mediaInlineCard',
         component: 'mediaInlineCard'
       };

package/dist/cjs/utils/ufoExperiences.js

@@ -8,13 +8,14 @@ exports.startUfoExperience = exports.completeUfoExperience = exports.abortUfoExp
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ufo = require("@atlaskit/ufo");
 var _mediaCommon = require("@atlaskit/media-common");
+var _uuidValidate = _interopRequireDefault(require("uuid-validate"));
 var _analytics = require("./analytics");
 var _errors = require("../errors");
 var _mediaClient = require("@atlaskit/media-client");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var packageName = "@atlaskit/media-card";
-var packageVersion = "78.0.0";
+var packageVersion = "78.0.2";
 var concurrentExperience;
 var getExperience = function getExperience(id) {
   if (!concurrentExperience) {
@@ -33,6 +34,19 @@ var getExperience = function getExperience(id) {
 var startUfoExperience = exports.startUfoExperience = function startUfoExperience(id) {
   getExperience(id).start();
 };
+var sanitiseFileAttributes = function sanitiseFileAttributes(fileAttributes) {
+  /*
+  	Allow external image mediaItemType as fileId
+  	See ExternalImageIdentifier interface on platform/packages/media/media-client/src/identifier.ts
+   */
+  var sanitisedFileId = 'INVALID_FILE_ID';
+  if (fileAttributes.fileId === 'external-image' || (0, _uuidValidate.default)(fileAttributes.fileId)) {
+    sanitisedFileId = fileAttributes.fileId;
+  }
+  return _objectSpread(_objectSpread({}, fileAttributes), {}, {
+    fileId: sanitisedFileId
+  });
+};
 var completeUfoExperience = exports.completeUfoExperience = function completeUfoExperience(id, status, fileAttributes, fileStateFlags, ssrReliability) {
   var error = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new _errors.MediaCardError('missing-error-data');
   switch (status) {
@@ -71,17 +85,26 @@ var getBasePayloadAttributes = function getBasePayloadAttributes() {
   };
 };
 var succeedUfoExperience = function succeedUfoExperience(id, properties) {
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).success({
     metadata: _objectSpread(_objectSpread({}, properties), getBasePayloadAttributes())
   });
 };
 var failUfoExperience = function failUfoExperience(id, properties) {
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).failure({
     metadata: _objectSpread(_objectSpread({}, properties), getBasePayloadAttributes())
   });
 };
 var abortUfoExperience = exports.abortUfoExperience = function abortUfoExperience(id, properties) {
   // UFO won't abort if it's already in a final state (succeeded, failed, aborted, etc)
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).abort({
     metadata: _objectSpread(_objectSpread({}, properties), getBasePayloadAttributes())
   });

package/dist/es2019/card/card.js

@@ -7,7 +7,7 @@ import { IntlProvider, injectIntl } from 'react-intl-next';
 import { ExternalImageCard } from './externalImageCard';
 import { FileCard } from './fileCard';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "78.0.0";
+const packageVersion = "78.0.2";
 export const CardBase = ({
   identifier,
   ...otherProps

package/dist/es2019/card/media-card-analytics-error-boundary.js

@@ -66,7 +66,7 @@ class WrappedMediaCardAnalyticsErrorBoundary extends React.Component {
 }
 _defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
 const packageName = "@atlaskit/media-card";
-const packageVersion = "78.0.0";
+const packageVersion = "78.0.2";
 const MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion,
   packageName,

package/dist/es2019/inline/loader.js

@@ -37,7 +37,7 @@ export default class MediaInlineCardLoader extends React.PureComponent {
     } = this.state;
     const analyticsContext = {
       packageVersion: "@atlaskit/media-card",
-      packageName: "78.0.0",
+      packageName: "78.0.2",
       componentName: 'mediaInlineCard',
       component: 'mediaInlineCard'
     };

package/dist/es2019/utils/ufoExperiences.js

@@ -1,10 +1,11 @@
 import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
+import isValidId from 'uuid-validate';
 import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
 import { MediaCardError } from '../errors';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "78.0.0";
+const packageVersion = "78.0.2";
 let concurrentExperience;
 const getExperience = id => {
   if (!concurrentExperience) {
@@ -23,6 +24,20 @@ const getExperience = id => {
 export const startUfoExperience = id => {
   getExperience(id).start();
 };
+const sanitiseFileAttributes = fileAttributes => {
+  /*
+  	Allow external image mediaItemType as fileId
+  	See ExternalImageIdentifier interface on platform/packages/media/media-client/src/identifier.ts
+   */
+  let sanitisedFileId = 'INVALID_FILE_ID';
+  if (fileAttributes.fileId === 'external-image' || isValidId(fileAttributes.fileId)) {
+    sanitisedFileId = fileAttributes.fileId;
+  }
+  return {
+    ...fileAttributes,
+    fileId: sanitisedFileId
+  };
+};
 export const completeUfoExperience = (id, status, fileAttributes, fileStateFlags, ssrReliability, error = new MediaCardError('missing-error-data')) => {
   switch (status) {
     case 'complete':
@@ -58,6 +73,9 @@ const getBasePayloadAttributes = () => ({
   mediaRegion: getMediaRegion()
 });
 const succeedUfoExperience = (id, properties) => {
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).success({
     metadata: {
       ...properties,
@@ -66,6 +84,9 @@ const succeedUfoExperience = (id, properties) => {
   });
 };
 const failUfoExperience = (id, properties) => {
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).failure({
     metadata: {
       ...properties,
@@ -75,6 +96,9 @@ const failUfoExperience = (id, properties) => {
 };
 export const abortUfoExperience = (id, properties) => {
   // UFO won't abort if it's already in a final state (succeeded, failed, aborted, etc)
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).abort({
     metadata: {
       ...properties,

package/dist/esm/card/card.js

@@ -9,7 +9,7 @@ import { IntlProvider, injectIntl } from 'react-intl-next';
 import { ExternalImageCard } from './externalImageCard';
 import { FileCard } from './fileCard';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "78.0.0";
+var packageVersion = "78.0.2";
 export var CardBase = function CardBase(_ref) {
   var identifier = _ref.identifier,
     otherProps = _objectWithoutProperties(_ref, _excluded);

package/dist/esm/card/media-card-analytics-error-boundary.js

@@ -83,7 +83,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
 }(React.Component);
 _defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
 var packageName = "@atlaskit/media-card";
-var packageVersion = "78.0.0";
+var packageVersion = "78.0.2";
 var MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/esm/inline/loader.js

@@ -103,7 +103,7 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
         ErrorBoundary = _this$state.ErrorBoundary;
       var analyticsContext = {
         packageVersion: "@atlaskit/media-card",
-        packageName: "78.0.0",
+        packageName: "78.0.2",
         componentName: 'mediaInlineCard',
         component: 'mediaInlineCard'
       };

package/dist/esm/utils/ufoExperiences.js

@@ -3,11 +3,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
+import isValidId from 'uuid-validate';
 import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
 import { MediaCardError } from '../errors';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "78.0.0";
+var packageVersion = "78.0.2";
 var concurrentExperience;
 var getExperience = function getExperience(id) {
   if (!concurrentExperience) {
@@ -26,6 +27,19 @@ var getExperience = function getExperience(id) {
 export var startUfoExperience = function startUfoExperience(id) {
   getExperience(id).start();
 };
+var sanitiseFileAttributes = function sanitiseFileAttributes(fileAttributes) {
+  /*
+  	Allow external image mediaItemType as fileId
+  	See ExternalImageIdentifier interface on platform/packages/media/media-client/src/identifier.ts
+   */
+  var sanitisedFileId = 'INVALID_FILE_ID';
+  if (fileAttributes.fileId === 'external-image' || isValidId(fileAttributes.fileId)) {
+    sanitisedFileId = fileAttributes.fileId;
+  }
+  return _objectSpread(_objectSpread({}, fileAttributes), {}, {
+    fileId: sanitisedFileId
+  });
+};
 export var completeUfoExperience = function completeUfoExperience(id, status, fileAttributes, fileStateFlags, ssrReliability) {
   var error = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new MediaCardError('missing-error-data');
   switch (status) {
@@ -64,17 +78,26 @@ var getBasePayloadAttributes = function getBasePayloadAttributes() {
   };
 };
 var succeedUfoExperience = function succeedUfoExperience(id, properties) {
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).success({
     metadata: _objectSpread(_objectSpread({}, properties), getBasePayloadAttributes())
   });
 };
 var failUfoExperience = function failUfoExperience(id, properties) {
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).failure({
     metadata: _objectSpread(_objectSpread({}, properties), getBasePayloadAttributes())
   });
 };
 export var abortUfoExperience = function abortUfoExperience(id, properties) {
   // UFO won't abort if it's already in a final state (succeeded, failed, aborted, etc)
+  if (properties !== null && properties !== void 0 && properties.fileAttributes) {
+    properties.fileAttributes = sanitiseFileAttributes(properties.fileAttributes);
+  }
   getExperience(id).abort({
     metadata: _objectSpread(_objectSpread({}, properties), getBasePayloadAttributes())
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-card",
-	"version": "78.0.0",
+	"version": "78.0.2",
 	"description": "Includes all media card related components, CardView, CardViewSmall, Card...",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -47,8 +47,8 @@
 		"@atlaskit/media-svg": "^0.1.3",
 		"@atlaskit/media-ui": "^25.10.0",
 		"@atlaskit/media-viewer": "^48.6.0",
-		"@atlaskit/platform-feature-flags": "^0.2.2",
-		"@atlaskit/primitives": "^9.0.0",
+		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/primitives": "^10.0.0",
 		"@atlaskit/spinner": "^16.2.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/tokens": "^1.53.0",
@@ -60,7 +60,8 @@
 		"classnames": "^2.2.5",
 		"eventemitter2": "^4.1.0",
 		"lru_map": "^0.4.1",
-		"react-loadable": "^5.1.0"
+		"react-loadable": "^5.1.0",
+		"uuid-validate": "^0.0.3"
 	},
 	"peerDependencies": {
 		"@emotion/react": "^11.7.1",