@atlaskit/media-picker 70.0.9 → 70.1.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/media-picker
 
+## 70.1.1
+
+### Patch Changes
+
+- [`dee27fdf979fb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dee27fdf979fb) -
+  Added statusCode at the top level of analytics failure events, for SignalFX compatibility.
+
+## 70.1.0
+
+### Minor Changes
+
+- [`96051ddbcd485`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/96051ddbcd485) -
+  Error detail added in failure event to better track errors.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 70.0.9
 
 ### Patch Changes

package/dist/cjs/components/localUploadReact.js

@@ -18,6 +18,7 @@ var _react = require("react");
 var _perfMarks = require("perf-marks");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaCommon = require("@atlaskit/media-common");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _component = require("./component");
 var _uploadServiceImpl = require("../service/uploadServiceImpl");
 var _analytics = require("../util/analytics");
@@ -105,12 +106,17 @@ var LocalUploadComponentReact = exports.LocalUploadComponentReact = /*#__PURE__*
     });
     (0, _defineProperty2.default)(_this, "fireUploadFailed", /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(payload) {
-        var fileId, _payload$error, errorName, rawError, traceContext, _end2, _end2$duration, uploadDurationMsec;
+        var fileId, _payload$error, errorName, rawError, traceContext, _end2, _end2$duration, uploadDurationMsec, errorDetail, _rawError$innerError, _rawError$innerError2, requestMetadata;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               fileId = payload.fileId, _payload$error = payload.error, errorName = _payload$error.name, rawError = _payload$error.rawError, traceContext = payload.traceContext;
               _end2 = (0, _perfMarks.end)("MediaPicker.fireUpload.".concat(fileId)), _end2$duration = _end2.duration, uploadDurationMsec = _end2$duration === void 0 ? -1 : _end2$duration;
+              errorDetail = 'unknown';
+              if ((0, _platformFeatureFlags.fg)('add_media_picker_error_detail')) {
+                errorDetail = rawError && (0, _mediaClient.isCommonMediaClientError)(rawError) && (_rawError$innerError = rawError.innerError) !== null && _rawError$innerError !== void 0 && _rawError$innerError.message ? (_rawError$innerError2 = rawError.innerError) === null || _rawError$innerError2 === void 0 ? void 0 : _rawError$innerError2.message : rawError instanceof Error ? rawError.message : 'unknown';
+              }
+              requestMetadata = !!rawError ? (0, _analytics.getRequestMetadata)(rawError) : undefined;
               _this.createAndFireAnalyticsEvent({
                 eventType: 'operational',
                 action: 'failed',
@@ -122,24 +128,28 @@ var LocalUploadComponentReact = exports.LocalUploadComponentReact = /*#__PURE__*
                   status: 'fail',
                   failReason: errorName,
                   error: !!rawError ? (0, _mediaClient.getMediaClientErrorReason)(rawError) : 'unknown',
-                  request: !!rawError ? (0, _analytics.getRequestMetadata)(rawError) : undefined,
+                  statusCode: requestMetadata === null || requestMetadata === void 0 ? void 0 : requestMetadata.statusCode,
+                  request: requestMetadata,
                   fileAttributes: {
                     fileId: fileId
                   },
                   uploadDurationMsec: uploadDurationMsec,
-                  traceContext: traceContext
+                  traceContext: traceContext,
+                  errorDetail: errorDetail
                 }
               });
               (0, _ufoExperiences.failMediaUploadUfoExperience)(fileId, {
                 failReason: errorName,
                 error: !!rawError ? (0, _mediaClient.getMediaClientErrorReason)(rawError) : 'unknown',
-                request: !!rawError ? (0, _analytics.getRequestMetadata)(rawError) : undefined,
+                errorDetail: errorDetail,
+                statusCode: requestMetadata === null || requestMetadata === void 0 ? void 0 : requestMetadata.statusCode,
+                request: requestMetadata,
                 fileAttributes: {
                   fileId: fileId
                 },
                 uploadDurationMsec: uploadDurationMsec
               });
-            case 4:
+            case 7:
             case "end":
               return _context.stop();
           }

package/dist/cjs/util/analytics.js

@@ -9,7 +9,7 @@ var _mediaClient = require("@atlaskit/media-client");
 // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
 
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "70.0.8";
+var packageVersion = "70.1.0";
 function getPackageAttributes(componentName) {
   return {
     packageName: packageName,

package/dist/cjs/util/ufoExperiences.js

@@ -12,7 +12,7 @@ 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-picker";
-var packageVersion = "70.0.8";
+var packageVersion = "70.1.0";
 var ufoExperience;
 var initExperience = function initExperience(id, componentName) {
   if (!ufoExperience) {

package/dist/es2019/components/localUploadReact.js

@@ -1,8 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Component } from 'react';
 import { start, end } from 'perf-marks';
-import { getMediaClientErrorReason } from '@atlaskit/media-client';
+import { getMediaClientErrorReason, isCommonMediaClientError } from '@atlaskit/media-client';
 import { ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { UploadComponent } from './component';
 import { UploadServiceImpl } from '../service/uploadServiceImpl';
 import { getRequestMetadata } from '../util/analytics';
@@ -102,6 +103,12 @@ export class LocalUploadComponentReact extends Component {
       const {
         duration: uploadDurationMsec = -1
       } = end(`MediaPicker.fireUpload.${fileId}`);
+      let errorDetail = 'unknown';
+      if (fg('add_media_picker_error_detail')) {
+        var _rawError$innerError, _rawError$innerError2;
+        errorDetail = rawError && isCommonMediaClientError(rawError) && (_rawError$innerError = rawError.innerError) !== null && _rawError$innerError !== void 0 && _rawError$innerError.message ? (_rawError$innerError2 = rawError.innerError) === null || _rawError$innerError2 === void 0 ? void 0 : _rawError$innerError2.message : rawError instanceof Error ? rawError.message : 'unknown';
+      }
+      const requestMetadata = !!rawError ? getRequestMetadata(rawError) : undefined;
       this.createAndFireAnalyticsEvent({
         eventType: 'operational',
         action: 'failed',
@@ -113,18 +120,22 @@ export class LocalUploadComponentReact extends Component {
           status: 'fail',
           failReason: errorName,
           error: !!rawError ? getMediaClientErrorReason(rawError) : 'unknown',
-          request: !!rawError ? getRequestMetadata(rawError) : undefined,
+          statusCode: requestMetadata === null || requestMetadata === void 0 ? void 0 : requestMetadata.statusCode,
+          request: requestMetadata,
           fileAttributes: {
             fileId
           },
           uploadDurationMsec,
-          traceContext
+          traceContext,
+          errorDetail
         }
       });
       failMediaUploadUfoExperience(fileId, {
         failReason: errorName,
         error: !!rawError ? getMediaClientErrorReason(rawError) : 'unknown',
-        request: !!rawError ? getRequestMetadata(rawError) : undefined,
+        errorDetail,
+        statusCode: requestMetadata === null || requestMetadata === void 0 ? void 0 : requestMetadata.statusCode,
+        request: requestMetadata,
         fileAttributes: {
           fileId
         },

package/dist/es2019/util/analytics.js

@@ -3,7 +3,7 @@ import { isRequestError } from '@atlaskit/media-client';
 // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
 
 const packageName = "@atlaskit/media-picker";
-const packageVersion = "70.0.8";
+const packageVersion = "70.1.0";
 export function getPackageAttributes(componentName) {
   return {
     packageName,

package/dist/es2019/util/ufoExperiences.js

@@ -2,7 +2,7 @@ import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } fro
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 const packageName = "@atlaskit/media-picker";
-const packageVersion = "70.0.8";
+const packageVersion = "70.1.0";
 let ufoExperience;
 const initExperience = (id, componentName) => {
   if (!ufoExperience) {

package/dist/esm/components/localUploadReact.js

@@ -11,8 +11,9 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { Component } from 'react';
 import { start, end } from 'perf-marks';
-import { getMediaClientErrorReason } from '@atlaskit/media-client';
+import { getMediaClientErrorReason, isCommonMediaClientError } from '@atlaskit/media-client';
 import { ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { UploadComponent } from './component';
 import { UploadServiceImpl } from '../service/uploadServiceImpl';
 import { getRequestMetadata } from '../util/analytics';
@@ -98,12 +99,17 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_this, "fireUploadFailed", /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(payload) {
-        var fileId, _payload$error, errorName, rawError, traceContext, _end2, _end2$duration, uploadDurationMsec;
+        var fileId, _payload$error, errorName, rawError, traceContext, _end2, _end2$duration, uploadDurationMsec, errorDetail, _rawError$innerError, _rawError$innerError2, requestMetadata;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               fileId = payload.fileId, _payload$error = payload.error, errorName = _payload$error.name, rawError = _payload$error.rawError, traceContext = payload.traceContext;
               _end2 = end("MediaPicker.fireUpload.".concat(fileId)), _end2$duration = _end2.duration, uploadDurationMsec = _end2$duration === void 0 ? -1 : _end2$duration;
+              errorDetail = 'unknown';
+              if (fg('add_media_picker_error_detail')) {
+                errorDetail = rawError && isCommonMediaClientError(rawError) && (_rawError$innerError = rawError.innerError) !== null && _rawError$innerError !== void 0 && _rawError$innerError.message ? (_rawError$innerError2 = rawError.innerError) === null || _rawError$innerError2 === void 0 ? void 0 : _rawError$innerError2.message : rawError instanceof Error ? rawError.message : 'unknown';
+              }
+              requestMetadata = !!rawError ? getRequestMetadata(rawError) : undefined;
               _this.createAndFireAnalyticsEvent({
                 eventType: 'operational',
                 action: 'failed',
@@ -115,24 +121,28 @@ export var LocalUploadComponentReact = /*#__PURE__*/function (_Component) {
                   status: 'fail',
                   failReason: errorName,
                   error: !!rawError ? getMediaClientErrorReason(rawError) : 'unknown',
-                  request: !!rawError ? getRequestMetadata(rawError) : undefined,
+                  statusCode: requestMetadata === null || requestMetadata === void 0 ? void 0 : requestMetadata.statusCode,
+                  request: requestMetadata,
                   fileAttributes: {
                     fileId: fileId
                   },
                   uploadDurationMsec: uploadDurationMsec,
-                  traceContext: traceContext
+                  traceContext: traceContext,
+                  errorDetail: errorDetail
                 }
               });
               failMediaUploadUfoExperience(fileId, {
                 failReason: errorName,
                 error: !!rawError ? getMediaClientErrorReason(rawError) : 'unknown',
-                request: !!rawError ? getRequestMetadata(rawError) : undefined,
+                errorDetail: errorDetail,
+                statusCode: requestMetadata === null || requestMetadata === void 0 ? void 0 : requestMetadata.statusCode,
+                request: requestMetadata,
                 fileAttributes: {
                   fileId: fileId
                 },
                 uploadDurationMsec: uploadDurationMsec
               });
-            case 4:
+            case 7:
             case "end":
               return _context.stop();
           }

package/dist/esm/util/analytics.js

@@ -3,7 +3,7 @@ import { isRequestError } from '@atlaskit/media-client';
 // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
 
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "70.0.8";
+var packageVersion = "70.1.0";
 export function getPackageAttributes(componentName) {
   return {
     packageName: packageName,

package/dist/esm/util/ufoExperiences.js

@@ -5,7 +5,7 @@ import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } fro
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "70.0.8";
+var packageVersion = "70.1.0";
 var ufoExperience;
 var initExperience = function initExperience(id, componentName) {
   if (!ufoExperience) {

package/dist/types/types.d.ts

@@ -125,6 +125,7 @@ export type MediaUploadFailurePayload = OperationalEventPayload<OperationalAttri
     sourceType: MediaUploadSource;
     serviceName: string;
     uploadDurationMsec: number;
+    statusCode?: number;
     request?: RequestMetadata;
 }, 'failed', 'mediaUpload', MediaUploadType>;
 export type UnhandledErrorPayload = OperationalEventPayload<OperationalAttributes & FailureAttributes & {

package/dist/types/util/analytics.d.ts

@@ -1,5 +1,5 @@
-import { type RequestMetadata } from '@atlaskit/media-client';
+import { type RequestErrorMetadata } from '@atlaskit/media-client';
 import { type PackageAttributes } from '@atlaskit/media-common';
 export type ComponentName = 'browser' | 'clipboard' | 'dropzone';
 export declare function getPackageAttributes(componentName: ComponentName): PackageAttributes;
-export declare function getRequestMetadata(error?: Error): RequestMetadata | undefined;
+export declare function getRequestMetadata(error?: Error): RequestErrorMetadata | undefined;

package/dist/types/util/ufoExperiences.d.ts

@@ -6,6 +6,7 @@ export type UFOFailedEventPayload = {
     error?: string;
     errorDetail?: string | undefined;
     uploadDurationMsec: number;
+    statusCode?: number;
     request?: RequestMetadata;
 } & WithFileAttributes;
 export declare const startMediaUploadUfoExperience: (id: string, componentName: ComponentName) => void;

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

@@ -125,6 +125,7 @@ export type MediaUploadFailurePayload = OperationalEventPayload<OperationalAttri
     sourceType: MediaUploadSource;
     serviceName: string;
     uploadDurationMsec: number;
+    statusCode?: number;
     request?: RequestMetadata;
 }, 'failed', 'mediaUpload', MediaUploadType>;
 export type UnhandledErrorPayload = OperationalEventPayload<OperationalAttributes & FailureAttributes & {

package/dist/types-ts4.5/util/analytics.d.ts

@@ -1,5 +1,5 @@
-import { type RequestMetadata } from '@atlaskit/media-client';
+import { type RequestErrorMetadata } from '@atlaskit/media-client';
 import { type PackageAttributes } from '@atlaskit/media-common';
 export type ComponentName = 'browser' | 'clipboard' | 'dropzone';
 export declare function getPackageAttributes(componentName: ComponentName): PackageAttributes;
-export declare function getRequestMetadata(error?: Error): RequestMetadata | undefined;
+export declare function getRequestMetadata(error?: Error): RequestErrorMetadata | undefined;

package/dist/types-ts4.5/util/ufoExperiences.d.ts

@@ -6,6 +6,7 @@ export type UFOFailedEventPayload = {
     error?: string;
     errorDetail?: string | undefined;
     uploadDurationMsec: number;
+    statusCode?: number;
     request?: RequestMetadata;
 } & WithFileAttributes;
 export declare const startMediaUploadUfoExperience: (id: string, componentName: ComponentName) => void;

package/example-helpers/NativeMediaViewer.tsx

@@ -34,7 +34,10 @@ const getArtifactUrl = (
 		.then((blob) => blob.slice(0, blob.size, getMimeTypeFromArtifact(artifact)))
 		.then((blob) => URL.createObjectURL(blob));
 
-export const NativeMediaViewer = ({ id, mediaClient }: NativeMediaViewerProps) => {
+export const NativeMediaViewer = ({
+	id,
+	mediaClient,
+}: NativeMediaViewerProps): React.JSX.Element => {
 	const [url, setUrl] = useState('');
 	const [mediaType, setMediaType] = useState<MediaType | null>(null);
 

package/example-helpers/mainWrapper.tsx

@@ -4,7 +4,7 @@ import { FeatureFlagsWrapper } from '@atlaskit/media-test-helpers';
 import { UfoLoggerWrapper } from './UfoWrapper';
 import { IntlProvider } from 'react-intl-next';
 
-export const MainWrapper = ({ children }: { children: ReactNode }) => (
+export const MainWrapper = ({ children }: { children: ReactNode }): React.JSX.Element => (
 	<UfoLoggerWrapper>
 		<FeatureFlagsWrapper>
 			<IntlProvider locale={'en'}>{children}</IntlProvider>

package/example-helpers/upload-preview.tsx

@@ -19,7 +19,7 @@ export class UploadPreview extends React.Component<PreviewData> {
 		}
 	}
 
-	render() {
+	render(): React.JSX.Element {
 		const { fileId } = this.props;
 
 		const identifier: FileIdentifier = {

package/example-helpers/upload-previews.tsx

@@ -57,7 +57,7 @@ export class UploadPreviews extends React.Component<PreviewsDataProps, PreviewsD
 		console.log('upload error:', data);
 	};
 
-	render() {
+	render(): React.JSX.Element {
 		const { previewsData } = this.state;
 
 		return (

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-picker",
-	"version": "70.0.9",
+	"version": "70.1.1",
 	"description": "Library for handling file uploads",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
 		"@atlaskit/media-ui": "^28.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tokens": "^8.0.0",
+		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@babel/runtime": "^7.0.0",
 		"eventemitter2": "^4.1.0",
@@ -55,7 +55,7 @@
 	},
 	"devDependencies": {
 		"@atlaskit/analytics-listeners": "^9.1.0",
-		"@atlaskit/analytics-namespaced-context": "^7.1.0",
+		"@atlaskit/analytics-namespaced-context": "^7.2.0",
 		"@atlaskit/button": "^23.6.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-test-helpers": "^39.0.0",
@@ -89,6 +89,9 @@
 	"platform-feature-flags": {
 		"should-render-to-parent-should-be-true-media-exif": {
 			"type": "boolean"
+		},
+		"add_media_picker_error_detail": {
+			"type": "boolean"
 		}
 	}
 }