@atlaskit/smart-card 21.2.0 → 22.1.0

package/dist/es2019/utils/analytics/analytics.js

@@ -32,25 +32,25 @@ export const fireSmartLinkEvent = (payload, createAnalyticsEvent) => {
     createAnalyticsEvent(payload).fire(ANALYTICS_CHANNEL);
   }
 };
-export const resolvedEvent = (id, definitionId, extensionKey, resourceType) => ({
+export const resolvedEvent = props => ({
   action: 'resolved',
   actionSubject: 'smartLink',
   eventType: 'operational',
-  attributes: {
-    id,
-    ...context,
-    ...(definitionId ? {
-      definitionId
-    } : {}),
-    ...(extensionKey ? {
-      extensionKey
-    } : {}),
-    ...(resourceType ? {
-      resourceType
-    } : {})
+  attributes: { ...props,
+    ...context
   }
 });
-export const unresolvedEvent = (id, status, definitionId, extensionKey, resourceType, error) => ({
+export const unresolvedEvent = ({
+  id,
+  definitionId,
+  extensionKey,
+  resourceType,
+  destinationSubproduct,
+  destinationProduct,
+  error,
+  status,
+  location
+}) => ({
   action: 'unresolved',
   actionSubject: 'smartLink',
   eventType: 'operational',
@@ -66,15 +66,33 @@ export const unresolvedEvent = (id, status, definitionId, extensionKey, resource
     ...(resourceType ? {
       resourceType
     } : {}),
+    ...(destinationSubproduct ? {
+      destinationSubproduct
+    } : {}),
+    ...(destinationProduct ? {
+      destinationProduct
+    } : {}),
+    ...(location ? {
+      location
+    } : {}),
     reason: status,
     error: error ? {
-      message: error.message,
-      kind: error.kind,
-      type: error.type
+      message: error === null || error === void 0 ? void 0 : error.message,
+      kind: error === null || error === void 0 ? void 0 : error.kind,
+      type: error === null || error === void 0 ? void 0 : error.type
     } : undefined
   }
 });
-export const invokeSucceededEvent = (id, actionType, display, extensionKey) => {
+export const invokeSucceededEvent = ({
+  id,
+  actionType,
+  display,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => {
   const measure = getMeasure(id, 'resolved') || {
     duration: undefined
   };
@@ -86,12 +104,26 @@ export const invokeSucceededEvent = (id, actionType, display, extensionKey) => {
       id,
       actionType,
       display,
-      extensionKey: extensionKey || '',
+      definitionId,
+      destinationProduct,
+      destinationSubproduct,
+      location,
+      extensionKey,
       duration: measure.duration
     }
   };
 };
-export const invokeFailedEvent = (id, actionType, display, reason, extensionKey) => {
+export const invokeFailedEvent = ({
+  id,
+  actionType,
+  display,
+  reason,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => {
   const measure = getMeasure(id, 'errored') || {
     duration: undefined
   };
@@ -103,78 +135,127 @@ export const invokeFailedEvent = (id, actionType, display, reason, extensionKey)
       id,
       actionType,
       display,
-      extensionKey: extensionKey || '',
+      extensionKey,
+      definitionId,
+      destinationProduct,
+      destinationSubproduct,
+      location,
       duration: measure.duration,
       reason
     }
   };
 };
-export const connectSucceededEvent = (definitionId, extensionKey) => ({
+export const connectSucceededEvent = ({
+  definitionId,
+  extensionKey,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   action: 'connectSucceeded',
   actionSubject: 'smartLink',
   eventType: 'operational',
   attributes: { ...context,
-    ...(definitionId ? {
-      definitionId
-    } : {}),
-    ...(extensionKey ? {
-      extensionKey
-    } : {})
+    definitionId,
+    extensionKey,
+    destinationProduct,
+    destinationSubproduct,
+    location
   }
 });
-export const connectFailedEvent = (definitionId, extensionKey, reason) => ({
+export const connectFailedEvent = ({
+  definitionId,
+  extensionKey,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  reason
+}) => ({
   action: 'connectFailed',
   actionSubject: 'smartLink',
   actionSubjectId: reason,
   eventType: 'operational',
   attributes: { ...context,
-    ...(reason ? {
-      reason: reason
-    } : {}),
-    ...(definitionId ? {
-      definitionId
-    } : {}),
-    ...(extensionKey ? {
-      extensionKey
-    } : {})
+    reason,
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location
   }
 });
-export const trackAppAccountConnected = (definitionId, extensionKey) => ({
+export const trackAppAccountConnected = ({
+  definitionId,
+  extensionKey,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   action: 'connected',
   actionSubject: 'applicationAccount',
   eventType: 'track',
   attributes: { ...context,
-    ...(definitionId ? {
-      definitionId
-    } : {}),
-    ...(extensionKey ? {
-      extensionKey
-    } : {})
+    definitionId,
+    extensionKey,
+    destinationProduct,
+    destinationSubproduct,
+    location
   }
 });
-export const uiAuthEvent = (display, definitionId, extensionKey) => ({
+export const uiAuthEvent = ({
+  definitionId,
+  extensionKey,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  display
+}) => ({
   action: 'clicked',
   actionSubject: 'button',
   actionSubjectId: 'connectAccount',
   eventType: 'ui',
   attributes: { ...context,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
+    definitionId,
+    extensionKey,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     display
   }
 });
-export const uiAuthAlternateAccountEvent = (display, definitionId, extensionKey) => ({
+export const uiAuthAlternateAccountEvent = ({
+  definitionId,
+  extensionKey,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  display
+}) => ({
   action: 'clicked',
   actionSubject: 'smartLink',
   actionSubjectId: 'tryAnotherAccount',
   eventType: 'ui',
   attributes: { ...context,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
+    definitionId,
+    extensionKey,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     display
   }
 });
-export const uiCardClickedEvent = (id, display, status, definitionId, extensionKey, isModifierKeyPressed, location, destinationProduct, destinationSubproduct, actionSubjectId) => ({
+export const uiCardClickedEvent = ({
+  id,
+  display,
+  status,
+  definitionId,
+  extensionKey,
+  isModifierKeyPressed,
+  location,
+  destinationProduct,
+  destinationSubproduct,
+  actionSubjectId
+}) => ({
   action: 'clicked',
   actionSubject: 'smartLink',
   actionSubjectId,
@@ -182,8 +263,8 @@ export const uiCardClickedEvent = (id, display, status, definitionId, extensionK
   attributes: { ...context,
     id,
     status,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
+    definitionId,
+    extensionKey,
     display,
     isModifierKeyPressed,
     location,
@@ -191,7 +272,16 @@ export const uiCardClickedEvent = (id, display, status, definitionId, extensionK
     destinationSubproduct
   }
 });
-export const uiActionClickedEvent = (id, actionType, extensionKey, display) => ({
+export const uiActionClickedEvent = ({
+  id,
+  actionType,
+  extensionKey,
+  display,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   action: 'clicked',
   actionSubject: 'button',
   actionSubjectId: uiActionSubjectIds[actionType],
@@ -199,84 +289,169 @@ export const uiActionClickedEvent = (id, actionType, extensionKey, display) => (
   attributes: { ...context,
     id,
     display,
-    extensionKey: extensionKey || '',
-    actionType: actionType
+    actionType: actionType,
+    extensionKey: extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location
   }
 });
-export const uiClosedAuthEvent = (display, definitionId, extensionKey) => ({
+export const uiClosedAuthEvent = ({
+  display,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   action: 'closed',
   actionSubject: 'consentModal',
   eventType: 'ui',
   attributes: { ...context,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     display
   }
 });
-export const screenAuthPopupEvent = (definitionId, extensionKey) => ({
+export const screenAuthPopupEvent = ({
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   actionSubject: 'consentModal',
   eventType: 'screen',
   attributes: { ...context,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || ''
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location
   }
 });
-export const uiRenderSuccessEvent = (display, status, definitionId, extensionKey) => ({
+export const uiRenderSuccessEvent = ({
+  display,
+  status,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   action: 'renderSuccess',
   actionSubject: 'smartLink',
   eventType: 'ui',
   attributes: { ...context,
     status,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     display
   }
 });
-export const uiRenderFailedEvent = (display, error, errorInfo) => ({
+export const uiRenderFailedEvent = ({
+  display,
+  error,
+  errorInfo,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location
+}) => ({
   actionSubject: 'smartLink',
   action: 'renderFailed',
   eventType: 'ui',
-  attributes: {
+  attributes: { ...context,
     error,
     errorInfo,
-    display
+    display,
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location
   }
 });
-export const uiHoverCardViewedEvent = (id, previewDisplay, definitionId, extensionKey, previewInvokeMethod) => ({
+export const uiHoverCardViewedEvent = ({
+  id,
+  previewDisplay,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  previewInvokeMethod
+}) => ({
   action: 'viewed',
   actionSubject: 'hoverCard',
   eventType: 'ui',
   attributes: { ...context,
     id,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
     previewDisplay,
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     previewInvokeMethod
   }
 });
-export const uiHoverCardDismissedEvent = (id, previewDisplay, hoverTime, definitionId, extensionKey, previewInvokeMethod) => ({
+export const uiHoverCardDismissedEvent = ({
+  id,
+  previewDisplay,
+  hoverTime,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  previewInvokeMethod
+}) => ({
   action: 'dismissed',
   actionSubject: 'hoverCard',
   eventType: 'ui',
   attributes: { ...context,
     id,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
-    hoverTime,
     previewDisplay,
+    hoverTime,
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     previewInvokeMethod
   }
 });
-export const uiHoverCardOpenLinkClickedEvent = (id, previewDisplay, definitionId, extensionKey, previewInvokeMethod) => ({
+export const uiHoverCardOpenLinkClickedEvent = ({
+  id,
+  previewDisplay,
+  extensionKey,
+  definitionId,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  previewInvokeMethod
+}) => ({
   action: 'clicked',
   actionSubject: 'button',
   actionSubjectId: 'shortcutGoToLink',
   eventType: 'ui',
   attributes: { ...context,
     id,
-    definitionId: definitionId || '',
-    extensionKey: extensionKey || '',
     previewDisplay,
+    extensionKey,
+    definitionId,
+    destinationProduct,
+    destinationSubproduct,
+    location,
     previewInvokeMethod
   }
 });

package/dist/es2019/utils/analytics/index.js

@@ -1,13 +1,31 @@
-import { resolvedEvent, unresolvedEvent } from './analytics';
 import { getMeasure } from '../performance';
+import { resolvedEvent, unresolvedEvent } from './analytics';
 export { ANALYTICS_CHANNEL, context, fireSmartLinkEvent, resolvedEvent, unresolvedEvent, invokeSucceededEvent, invokeFailedEvent, connectSucceededEvent, connectFailedEvent, trackAppAccountConnected, uiAuthEvent, uiAuthAlternateAccountEvent, uiCardClickedEvent, uiActionClickedEvent, uiClosedAuthEvent, screenAuthPopupEvent, uiRenderSuccessEvent, uiRenderFailedEvent, uiHoverCardViewedEvent, uiHoverCardDismissedEvent, uiHoverCardOpenLinkClickedEvent } from './analytics';
-export const instrumentEvent = (id, status, definitionId, extensionKey, resourceType, error) => {
+export const instrumentEvent = ({
+  id,
+  status,
+  extensionKey,
+  definitionId,
+  resourceType,
+  destinationProduct,
+  destinationSubproduct,
+  location,
+  error
+}) => {
   const measure = getMeasure(id, status) || {
     duration: undefined
   };
 
   if (status === 'resolved') {
-    const event = resolvedEvent(id, definitionId, extensionKey, resourceType);
+    const event = resolvedEvent({
+      id,
+      extensionKey,
+      definitionId,
+      resourceType,
+      destinationProduct,
+      destinationSubproduct,
+      location
+    });
     return { ...event,
       attributes: { ...event.attributes,
         duration: measure.duration
@@ -15,7 +33,17 @@ export const instrumentEvent = (id, status, definitionId, extensionKey, resource
     };
   } else {
     if ((error === null || error === void 0 ? void 0 : error.type) !== 'ResolveUnsupportedError') {
-      const event = unresolvedEvent(id, status, definitionId, extensionKey, resourceType, error);
+      const event = unresolvedEvent({
+        id,
+        status,
+        extensionKey,
+        definitionId,
+        resourceType,
+        destinationProduct,
+        destinationSubproduct,
+        location,
+        error
+      });
       return { ...event,
         attributes: { ...event.attributes,
           duration: measure.duration

package/dist/es2019/utils/mocks.js

@@ -109,6 +109,18 @@ export const mocks = {
     data: {
       status: 'CompletedStatus'
     }
+  },
+  analytics: {
+    status: 'resolved',
+    details: {
+      meta: {
+        definitionId: 'spaghetti-id',
+        key: 'spaghetti-key',
+        resourceType: 'spaghetti-resource',
+        subproduct: 'spaghetti-subproduct',
+        product: 'spaghetti-product'
+      }
+    }
   }
 };
 export const fakeResponse = () => Promise.resolve(mocks.success);
@@ -126,4 +138,17 @@ export const fakeFactory = (implementation, implementationPost, implementationPr
   }
 
 };
-export const waitFor = (time = 1) => new Promise(res => setTimeout(res, time));
+export const waitFor = (time = 1) => new Promise(res => setTimeout(res, time));
+export const mockAnalytics = {
+  ui: {
+    buttonClickedEvent: () => {},
+    modalClosedEvent: () => {},
+    renderSuccessEvent: () => {},
+    renderFailedEvent: () => {}
+  },
+  operational: {},
+  track: {},
+  screen: {
+    modalViewedEvent: () => {}
+  }
+};

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "21.2.0",
+	"version": "22.1.0",
 	"sideEffects": false
 }

package/dist/es2019/view/BlockCard/actions/PreviewAction.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { IntlProvider, FormattedMessage } from 'react-intl-next';
+import { FormattedMessage, IntlProvider } from 'react-intl-next';
 import { messages } from '../../../messages';
 
 /*
@@ -36,9 +36,9 @@ export async function previewFunction({
   ReactDOM.render( /*#__PURE__*/React.createElement(IntlProvider, {
     locale: "en"
   }, /*#__PURE__*/React.createElement(Modal.default, _extends({}, rest, {
-    onClose: () => {
+    onClose: context => {
       if (popupMountPoint) {
-        onClose();
+        onClose(context);
         ReactDOM.unmountComponentAtNode(popupMountPoint);
       }
     }

package/dist/es2019/view/BlockCard/index.js

@@ -5,7 +5,6 @@ import { extractBlockProps } from '../../extractors/block';
 import { getEmptyJsonLd, getUnauthorizedJsonLd } from '../../utils/jsonld';
 import { extractRequestAccessContext } from '../../extractors/common/context';
 import { CardLinkView } from '../LinkView';
-export { default as PreviewAction } from './actions/PreviewAction';
 import { AuthorizeAction } from './actions/AuthorizeAction';
 import { ForbiddenAction } from './actions/ForbiddenAction';
 import { ResolvedView as BlockCardResolvedView } from './views/ResolvedView';
@@ -15,6 +14,7 @@ import { UnauthorizedView as BlockCardUnauthorisedView } from './views/Unauthori
 import { ForbiddenView as BlockCardForbiddenView } from './views/ForbiddenView';
 import { ErroredView as BlockCardErroredView } from './views/ErroredView';
 import { useFeatureFlag } from '@atlaskit/link-provider';
+export { default as PreviewAction } from './actions/PreviewAction';
 export { ForbiddenAction, AuthorizeAction, BlockCardResolvedView, BlockCardResolvingView, BlockCardUnauthorisedView, BlockCardForbiddenView, BlockCardErroredView, BlockCardNotFoundView };
 export const BlockCard = ({
   url,
@@ -26,7 +26,6 @@ export const BlockCard = ({
   handleAuthorize,
   handleErrorRetry,
   handleFrameClick,
-  handleAnalytics,
   handleInvoke,
   renderers,
   isSelected,
@@ -34,7 +33,8 @@ export const BlockCard = ({
   onError,
   testId,
   showActions,
-  platform
+  platform,
+  analytics
 }) => {
   var _details$meta, _forbiddenViewProps$c;
 
@@ -48,8 +48,9 @@ export const BlockCard = ({
   const data = details && details.data || getEmptyJsonLd();
   const meta = details && details.meta;
   const extractorOpts = {
+    analytics,
+    origin: 'smartLinkCard',
     featureFlags,
-    handleAnalytics,
     handleInvoke,
     extensionKey: getExtensionKey(details)
   };