@atlaskit/smart-card 16.1.1 → 17.0.0

package/dist/es2019/state/analytics/useSmartLinkAnalytics.js

@@ -0,0 +1,76 @@
+import { uiAuthEvent, uiAuthAlternateAccountEvent, uiCardClickedEvent, uiActionClickedEvent, uiClosedAuthEvent, uiRenderSuccessEvent, resolvedEvent, unresolvedEvent, invokeSucceededEvent, invokeFailedEvent, connectSucceededEvent, connectFailedEvent, trackAppAccountConnected, screenAuthPopupEvent, instrumentEvent } from '../../utils/analytics';
+import { useMemo } from 'react';
+import { failUfoExperience, startUfoExperience, succeedUfoExperience } from './ufoExperiences';
+export const useSmartLinkAnalytics = dispatchAnalytics => {
+  const ui = useMemo(() => ({
+    authEvent: (display, definitionId, extensionKey) => dispatchAnalytics(uiAuthEvent(display, definitionId, extensionKey)),
+    authAlternateAccountEvent: (display, definitionId, extensionKey) => dispatchAnalytics(uiAuthAlternateAccountEvent(display, definitionId, extensionKey)),
+    cardClickedEvent: (display, definitionId, extensionKey) => dispatchAnalytics(uiCardClickedEvent(display, definitionId, extensionKey)),
+    actionClickedEvent: (id, extensionKey, actionType, display, invokeType) => {
+      startUfoExperience('smart-link-action-invocation', id, {
+        actionType,
+        display,
+        extensionKey,
+        invokeType
+      });
+      dispatchAnalytics(uiActionClickedEvent(extensionKey, actionType, display));
+    },
+    closedAuthEvent: (display, definitionId, extensionKey) => dispatchAnalytics(uiClosedAuthEvent(display, definitionId, extensionKey)),
+    renderSuccessEvent: (display, id, definitionId, extensionKey) => {
+      succeedUfoExperience('smart-link-rendered', id, {
+        extensionKey,
+        display
+      }); // UFO will disregard this if authentication experience has not yet been started
+
+      succeedUfoExperience('smart-link-authenticated', id, {
+        display
+      });
+      dispatchAnalytics(uiRenderSuccessEvent(display, definitionId, extensionKey));
+    }
+  }), [dispatchAnalytics]);
+  const operational = useMemo(() => ({
+    resolvedEvent: (id, definitionId, extensionKey, resourceType) => dispatchAnalytics(resolvedEvent(id, definitionId, extensionKey, resourceType)),
+    unresolvedEvent: (id, status, definitionId, extensionKey, resourceType) => dispatchAnalytics(unresolvedEvent(id, status, definitionId, extensionKey, resourceType)),
+    invokeSucceededEvent: (id, providerKey, actionType, display) => {
+      succeedUfoExperience('smart-link-action-invocation', id);
+      dispatchAnalytics(invokeSucceededEvent(id, providerKey, actionType, display));
+    },
+    invokeFailedEvent: (id, providerKey, actionType, display, reason) => {
+      failUfoExperience('smart-link-action-invocation', id);
+      dispatchAnalytics(invokeFailedEvent(id, providerKey, actionType, display, reason));
+    },
+    connectSucceededEvent: (id, definitionId, extensionKey) => {
+      startUfoExperience('smart-link-authenticated', id, {
+        extensionKey,
+        status: 'success'
+      });
+      dispatchAnalytics(connectSucceededEvent(definitionId, extensionKey));
+    },
+    connectFailedEvent: (id, definitionId, extensionKey, status) => {
+      startUfoExperience('smart-link-authenticated', id, {
+        extensionKey,
+        status
+      });
+      dispatchAnalytics(connectFailedEvent(definitionId, extensionKey, status));
+    },
+    instrument: (id, status, definitionId, extensionKey, resourceType, error) => {
+      const event = instrumentEvent(id, status, definitionId, extensionKey, resourceType, error);
+
+      if (event) {
+        dispatchAnalytics(event);
+      }
+    }
+  }), [dispatchAnalytics]);
+  const track = useMemo(() => ({
+    appAccountConnected: (definitionId, extensionKey) => dispatchAnalytics(trackAppAccountConnected(definitionId, extensionKey))
+  }), [dispatchAnalytics]);
+  const screen = useMemo(() => ({
+    authPopupEvent: (definitionId, extensionKey) => dispatchAnalytics(screenAuthPopupEvent(definitionId, extensionKey))
+  }), [dispatchAnalytics]);
+  return useMemo(() => ({
+    ui,
+    operational,
+    track,
+    screen
+  }), [ui, operational, track, screen]);
+};

package/dist/es2019/state/hooks/useSmartLink.js

@@ -11,12 +11,10 @@ export function useSmartLink(id, url, dispatchAnalytics) {
   const config = useSmartLinkConfig();
   const renderers = useSmartLinkRenderers(); // NB: used to propagate errors from hooks to error boundaries.
 
-  const [, setState] = useState(); // Register the current card.
+  const [error, setError] = useState(null); // Register the current card.
 
   const register = () => {
-    actions.register().catch(err => setState(() => {
-      throw err;
-    }));
+    actions.register().catch(err => setError(err));
   }; // AFP-2511 TODO: Fix automatic suppressions below
   // eslint-disable-next-line react-hooks/exhaustive-deps
 
@@ -28,6 +26,7 @@ export function useSmartLink(id, url, dispatchAnalytics) {
     actions,
     config,
     analytics,
-    renderers
+    renderers,
+    error
   };
 }

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

@@ -69,7 +69,7 @@ export const unresolvedEvent = (id, status, definitionId, extensionKey, resource
     } : undefined
   }
 });
-export const invokeSucceededEvent = (id, providerKey, actionType, display) => {
+export const invokeSucceededEvent = (id, extensionKey, actionType, display) => {
   const measure = getMeasure(id, 'resolved') || {
     duration: undefined
   };
@@ -81,12 +81,12 @@ export const invokeSucceededEvent = (id, providerKey, actionType, display) => {
       id,
       actionType,
       display,
-      definitionId: providerKey,
+      extensionKey,
       duration: measure.duration
     }
   };
 };
-export const invokeFailedEvent = (id, providerKey, actionType, display, reason) => {
+export const invokeFailedEvent = (id, extensionKey, actionType, display, reason) => {
   const measure = getMeasure(id, 'errored') || {
     duration: undefined
   };
@@ -98,7 +98,7 @@ export const invokeFailedEvent = (id, providerKey, actionType, display, reason)
       id,
       actionType,
       display,
-      definitionId: providerKey,
+      extensionKey,
       duration: measure.duration,
       reason
     }
@@ -179,13 +179,13 @@ export const uiCardClickedEvent = (display, definitionId, extensionKey) => ({
     display
   }
 });
-export const uiActionClickedEvent = (providerKey, actionType, display) => ({
+export const uiActionClickedEvent = (extensionKey, actionType, display) => ({
   action: 'clicked',
   actionSubject: 'smartLinkAction',
   eventType: 'ui',
   attributes: { ...context,
     display,
-    definitionId: providerKey,
+    extensionKey,
     actionType: actionType
   }
 });

package/dist/es2019/version.json

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

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { CardLinkView, BlockCardResolvingView, BlockCardErroredView, BlockCardUnauthorisedView, BlockCardForbiddenView, BlockCardResolvedView, BlockCardNotFoundView, AuthorizeAction, ForbiddenAction } from '@atlaskit/media-ui';
-import { getDefinitionId } from '../../state/helpers';
+import { getExtensionKey } from '../../state/helpers';
 import { extractBlockProps } from '../../extractors/block';
 import { getEmptyJsonLd, getUnauthorizedJsonLd } from '../../utils/jsonld';
 import { extractRequestAccessContext } from '../../extractors/common/context';
@@ -31,7 +31,7 @@ export const BlockCard = ({
   const extractorOpts = {
     handleAnalytics: handlePreviewAnalytics,
     handleInvoke,
-    definitionId: getDefinitionId(details)
+    extensionKey: getExtensionKey(details)
   };
 
   switch (status) {

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

@@ -4,12 +4,18 @@ import { CardWithDataRenderer } from '../CardWithData/loader';
 import { CardWithURLRenderer } from '../CardWithUrl/loader';
 import { isCardWithData } from '../../utils';
 import { context } from '../../utils/analytics';
+import { injectIntl, IntlProvider } from 'react-intl-next';
 
 class PlainCard extends React.PureComponent {
   render() {
-    return isCardWithData(this.props) ? /*#__PURE__*/React.createElement(CardWithDataRenderer, this.props) : /*#__PURE__*/React.createElement(CardWithURLRenderer, this.props);
+    const content = isCardWithData(this.props) ? /*#__PURE__*/React.createElement(CardWithDataRenderer, this.props) : /*#__PURE__*/React.createElement(CardWithURLRenderer, this.props);
+    return this.props.intl ? content : /*#__PURE__*/React.createElement(IntlProvider, {
+      locale: "en"
+    }, content);
   }
 
 }
 
-export const Card = withAnalyticsContext(context)(withAnalyticsEvents()(PlainCard));
+export const Card = withAnalyticsContext(context)(withAnalyticsEvents()(injectIntl(PlainCard, {
+  enforceContext: false
+})));

package/dist/es2019/view/CardWithUrl/component-lazy/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { isIntersectionObserverSupported } from '@atlaskit/media-ui';
 import { LazyLazilyRenderCard } from './LazyLazilyRenderCard';
 import { LazyIntersectionObserverCard } from './LazyIntersectionObserverCard';
-export function LazyCardWithUrlContent(props) {
+export default function LazyCardWithUrlContent(props) {
   if (isIntersectionObserverSupported()) {
     return /*#__PURE__*/React.createElement(LazyIntersectionObserverCard, props);
   } else {

package/dist/es2019/view/CardWithUrl/component.js

@@ -28,7 +28,8 @@ export function CardWithUrlContent({
     actions,
     config,
     analytics,
-    renderers
+    renderers,
+    error
   } = useSmartLink(id, url, dispatchAnalytics);
   const definitionId = getDefinitionId(state.details);
   const extensionKey = getExtensionKey(state.details);
@@ -67,9 +68,13 @@ export function CardWithUrlContent({
 
   useEffect(() => {
     if (isFinalState(state.status)) {
-      analytics.ui.renderSuccessEvent(appearance, definitionId, extensionKey);
+      analytics.ui.renderSuccessEvent(appearance, id, definitionId, extensionKey);
     }
-  }, [appearance, state.details, state.status, url, definitionId, extensionKey, analytics.ui]);
+  }, [appearance, state.details, state.status, url, definitionId, extensionKey, analytics.ui, id]); // We have to keep this last to prevent hook order from being violated
+
+  if (error) {
+    throw error;
+  }
 
   switch (appearance) {
     case 'inline':

package/dist/es2019/view/CardWithUrl/loader.js

@@ -1,60 +1,59 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React from 'react';
+import React, { lazy, useEffect, useState, Suspense, useCallback } from 'react';
 import uuid from 'uuid';
 import { CardLinkView } from '@atlaskit/media-ui';
 import { uiRenderFailedEvent, fireSmartLinkEvent } from '../../utils/analytics';
 import { clearMarks, clearMeasures } from '../../utils/performance';
-export class CardWithURLRenderer extends React.PureComponent {
-  constructor(props) {
-    super(props);
+import { ErrorBoundary } from 'react-error-boundary';
+import { failUfoExperience, startUfoExperience } from '../../state/analytics/ufoExperiences';
+const LazyCardWithUrlContent = /*#__PURE__*/lazy(() => import(
+/* webpackChunkName: "@atlaskit-internal_smartcard-urlcardcontent" */
+'./component-lazy/index'));
+export function CardWithURLRenderer(props) {
+  const [id] = useState(() => uuid()); // Equivalent to ComponentWillMount
 
-    _defineProperty(this, "dispatchAnalytics", analyticsPayload => {
-      const {
-        appearance,
-        createAnalyticsEvent
-      } = this.props;
-
-      if (analyticsPayload && analyticsPayload.attributes) {
-        // Update if we haven't already set the display - possible
-        // in the case of `preview` which is rendered differently.
-        if (!analyticsPayload.attributes.display) {
-          analyticsPayload.attributes.display = appearance;
-        }
-      }
-
-      fireSmartLinkEvent(analyticsPayload, createAnalyticsEvent);
-    });
-
-    this.state = {
-      id: uuid()
+  useState(() => {
+    // We want to start timing of render event only once and right at the start
+    startUfoExperience('smart-link-rendered', id);
+  });
+  useEffect(() => {
+    // ComponentWillUnmount
+    return () => {
+      clearMarks(id);
+      clearMeasures(id);
     };
-  }
+  }, [id]);
+  const {
+    url,
+    appearance,
+    isSelected,
+    isFrameVisible,
+    onClick,
+    container,
+    onResolve,
+    testId,
+    showActions,
+    inheritDimensions,
+    platform,
+    embedIframeRef,
+    inlinePreloaderStyle,
+    createAnalyticsEvent
+  } = props; // Wrapper around analytics.
 
-  static moduleImporter(target) {
-    import(
-    /* webpackChunkName: "@atlaskit-internal_smartcard-urlcardcontent" */
-    './component-lazy/index').then(module => {
-      CardWithURLRenderer.CardContent = module.LazyCardWithUrlContent;
-      target.forceUpdate();
-    });
-  }
-
-  componentDidMount() {
-    if (CardWithURLRenderer.CardContent === null) {
-      (this.props.importer || CardWithURLRenderer.moduleImporter)(this);
+  const dispatchAnalytics = useCallback(analyticsPayload => {
+    if (analyticsPayload && analyticsPayload.attributes) {
+      // Update if we haven't already set the display - possible
+      // in the case of `preview` which is rendered differently.
+      if (!analyticsPayload.attributes.display) {
+        analyticsPayload.attributes.display = appearance;
+      }
     }
-  }
 
-  componentWillUnmount() {
-    const id = this.state.id;
-    clearMarks(id);
-    clearMeasures(id);
-  }
-
-  componentDidCatch(error, errorInfo) {
+    fireSmartLinkEvent(analyticsPayload, createAnalyticsEvent);
+  }, [appearance, createAnalyticsEvent]);
+  const logError = useCallback((error, info) => {
     const {
-      appearance
-    } = this.props; // NB: APIErrors are thrown in response to Object Resolver Service.
+      componentStack
+    } = info; // NB: APIErrors are thrown in response to Object Resolver Service.
     // In these cases, control is handed back to the Editor. We do not
     // fire an event for these, as they do not cover failed UI render events.
 
@@ -64,54 +63,46 @@ export class CardWithURLRenderer extends React.PureComponent {
     // to the reliability of the smart-card front-end components. We instrument
     // these in order to measure our front-end reliability.
     else {
-      this.dispatchAnalytics(uiRenderFailedEvent(appearance, error, errorInfo));
+      const errorInfo = {
+        componentStack
+      };
+      failUfoExperience('smart-link-rendered', id);
+      failUfoExperience('smart-link-authenticated', id);
+      dispatchAnalytics(uiRenderFailedEvent(appearance, error, errorInfo));
     }
-  } // Wrapper around analytics.
-
-
-  render() {
-    const {
-      url,
-      appearance,
-      isSelected,
-      isFrameVisible,
-      onClick,
-      container,
-      onResolve,
-      testId,
-      showActions,
-      inheritDimensions,
-      platform,
-      embedIframeRef,
-      inlinePreloaderStyle
-    } = this.props;
+  }, [appearance, dispatchAnalytics, id]);
 
-    if (!url) {
-      throw new Error('@atlaskit/smart-card: url property is missing.');
-    }
+  if (!url) {
+    throw new Error('@atlaskit/smart-card: url property is missing.');
+  }
 
-    return CardWithURLRenderer.CardContent !== null ? /*#__PURE__*/React.createElement(CardWithURLRenderer.CardContent, {
-      id: this.state.id,
-      url: url,
-      appearance: appearance,
-      onClick: onClick,
-      isSelected: isSelected,
-      isFrameVisible: isFrameVisible,
-      dispatchAnalytics: this.dispatchAnalytics,
-      container: container,
-      onResolve: onResolve,
-      testId: testId,
-      showActions: showActions,
-      inheritDimensions: inheritDimensions,
-      platform: platform,
-      embedIframeRef: embedIframeRef,
-      inlinePreloaderStyle: inlinePreloaderStyle
-    }) : /*#__PURE__*/React.createElement(CardLinkView, {
+  return /*#__PURE__*/React.createElement(ErrorBoundary, {
+    FallbackComponent: ErrorFallback,
+    onError: logError
+  }, /*#__PURE__*/React.createElement(Suspense, {
+    fallback: /*#__PURE__*/React.createElement(CardLinkView, {
       key: 'chunk-placeholder',
       link: url
-    });
-  }
-
+    })
+  }, /*#__PURE__*/React.createElement(LazyCardWithUrlContent, {
+    id: id,
+    url: url,
+    appearance: appearance,
+    onClick: onClick,
+    isSelected: isSelected,
+    isFrameVisible: isFrameVisible,
+    dispatchAnalytics: dispatchAnalytics,
+    container: container,
+    onResolve: onResolve,
+    testId: testId,
+    showActions: showActions,
+    inheritDimensions: inheritDimensions,
+    platform: platform,
+    embedIframeRef: embedIframeRef,
+    inlinePreloaderStyle: inlinePreloaderStyle
+  })));
 }
 
-_defineProperty(CardWithURLRenderer, "CardContent", null);
+const ErrorFallback = () => {
+  return /*#__PURE__*/React.createElement("span", null);
+};

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

@@ -6,7 +6,7 @@ import { extractEmbedProps } from '../../extractors/embed';
 import { getEmptyJsonLd, getUnauthorizedJsonLd } from '../../utils/jsonld';
 import { extractInlineProps } from '../../extractors/inline';
 import { extractBlockProps } from '../../extractors/block';
-import { getDefinitionId } from '../../state/helpers';
+import { getExtensionKey } from '../../state/helpers';
 import { extractRequestAccessContext } from '../../extractors/common/context';
 export const EmbedCard = /*#__PURE__*/React.forwardRef(({
   url,
@@ -75,7 +75,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
         const resolvedBlockViewProps = extractBlockProps(data, meta, {
           handleAnalytics,
           handleInvoke,
-          definitionId: getDefinitionId(details)
+          extensionKey: getExtensionKey(details)
         });
         return /*#__PURE__*/React.createElement(BlockCardResolvedView, _extends({}, resolvedBlockViewProps, {
           isSelected: isSelected,

package/dist/esm/client/utils/environments.js

@@ -1,5 +1,5 @@
 var devBaseUrl = 'https://api-private.dev.atlassian.com';
-var stgBaseUrl = 'https://api-private.stg.atlassian.com';
+var stgBaseUrl = 'https://commerce-components-preview.dev.atlassian.com/gateway/api';
 var prodBaseUrl = 'https://api-private.atlassian.com';
 export var BaseUrls = {
   dev: devBaseUrl,

package/dist/esm/extractors/block/index.js

@@ -44,10 +44,10 @@ export var extractBlockActions = function extractBlockActions(props, jsonLd, opt
   if (opts) {
     var handleInvoke = opts.handleInvoke,
         handleAnalytics = opts.handleAnalytics,
-        definitionId = opts.definitionId,
+        extensionKey = opts.extensionKey,
         testId = opts.testId;
     var actions = extractActions(jsonLd, handleInvoke);
-    var previewAction = extractPreviewAction(definitionId, props, jsonLd, handleInvoke, handleAnalytics, testId, platform); // The previewAction should always be the last action
+    var previewAction = extractPreviewAction(extensionKey, props, jsonLd, handleInvoke, handleAnalytics, testId, platform); // The previewAction should always be the last action
 
     if (previewAction) {
       actions.push(previewAction);

package/dist/esm/extractors/common/actions/extractPreviewAction.js

@@ -53,7 +53,7 @@ var getInvokeOpts = function getInvokeOpts(key, action, source) {
 };
 
 export var extractPreviewAction = function extractPreviewAction() {
-  var definitionId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'empty-object-provider';
+  var extensionKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'empty-object-provider';
   var viewProps = arguments.length > 1 ? arguments[1] : undefined;
   var jsonLd = arguments.length > 2 ? arguments[2] : undefined;
   var handleInvoke = arguments.length > 3 ? arguments[3] : undefined;
@@ -69,7 +69,7 @@ export var extractPreviewAction = function extractPreviewAction() {
 
   if (metadataFromJsonLd.src) {
     // Build action using instrumentation hooks.
-    var key = definitionId;
+    var key = extensionKey;
     var previewAction = PreviewAction(_objectSpread(_objectSpread({}, metadata), {}, {
       testId: testId,
       onOpen: function onOpen() {

package/dist/esm/extractors/common/byline/extractByline.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { FormattedRelative } from 'react-intl';
+import { FormattedRelativeTime } from 'react-intl-next';
+import { selectUnit } from '@formatjs/intl-utils';
 import { extractPersonUpdatedBy } from '../person/extractPersonUpdatedBy';
 import { extractPersonCreatedBy } from '../person/extractPersonCreatedBy';
 import { extractDateCreated } from '../date/extractDateCreated';
@@ -9,15 +10,25 @@ export var extractByline = function extractByline(jsonLd) {
   var createdAt = extractDateCreated(jsonLd);
 
   if (updatedAt) {
+    var _selectUnit = selectUnit(new Date(updatedAt).getTime()),
+        value = _selectUnit.value,
+        unit = _selectUnit.unit;
+
     var updatedBy = extractPersonUpdatedBy(jsonLd);
-    return /*#__PURE__*/React.createElement("span", null, "Updated ", updatedBy && "by ".concat(updatedBy.name), ' ', /*#__PURE__*/React.createElement(FormattedRelative, {
-      value: updatedAt
+    return /*#__PURE__*/React.createElement("span", null, "Updated ", updatedBy && "by ".concat(updatedBy.name), ' ', /*#__PURE__*/React.createElement(FormattedRelativeTime, {
+      value: value,
+      unit: unit
     }));
   } else if (createdAt) {
+    var _selectUnit2 = selectUnit(new Date(createdAt).getTime()),
+        _value = _selectUnit2.value,
+        _unit = _selectUnit2.unit;
+
     var createdBy = extractPersonCreatedBy(jsonLd);
     var createdByPerson = extractFirstPerson(createdBy);
-    return /*#__PURE__*/React.createElement("span", null, "Created ", createdByPerson && "by ".concat(createdByPerson.name), ' ', /*#__PURE__*/React.createElement(FormattedRelative, {
-      value: createdAt
+    return /*#__PURE__*/React.createElement("span", null, "Created ", createdByPerson && "by ".concat(createdByPerson.name), ' ', /*#__PURE__*/React.createElement(FormattedRelativeTime, {
+      value: _value,
+      unit: _unit
     }));
   }
 };

package/dist/esm/index.js

@@ -9,5 +9,5 @@ export { embedHeaderHeight } from '@atlaskit/media-ui/embeds';
 export { SmartLinkEvents } from './utils/analytics/analytics';
 export { useSmartLinkEvents } from './view/SmartLinkEvents/useSmartLinkEvents'; // Classnames for integrators
 
-export { contentFooterClassName, metadataListClassName, blockCardResolvingViewClassName, blockCardResolvedViewClassName, blockCardForbiddenViewClassName, blockCardIconImageClassName } from '@atlaskit/media-ui/classNames';
+export { contentFooterClassName, metadataListClassName, blockCardResolvingViewClassName, blockCardResolvedViewClassName, blockCardForbiddenViewClassName, blockCardIconImageClassName, blockCardResolvedViewByClassName, blockCardForbiddenViewLinkClassName, blockCardContentClassName, blockCardContentHeaderClassName, blockCardContentHeaderNameClassName, blockCardNotFoundViewClassName, blockCardErroredViewClassName } from '@atlaskit/media-ui/classNames';
 export { loadingPlaceholderClassName } from './view/CardWithUrl/component-lazy/LazyFallback';

package/dist/esm/providers/editor/transformer.js

@@ -6,7 +6,11 @@ var isJiraRoadMap = function isJiraRoadMap(url) {
 };
 
 var isPolarisView = function isPolarisView(url) {
-  return url.match(/^https:\/\/.*?\/jira\/polaris\/projects\/[^\/]+?\/ideas\/view\/\d+$/);
+  return url.match(/^https:\/\/.*?\/jira\/polaris\/projects\/[^\/]+?\/ideas\/view\/\d+$|^https:\/\/.*?\/secure\/JiraProductDiscoveryAnonymous\.jspa\?hash=\w+|^https:\/\/.*?\/jira\/polaris\/share\/\w+/);
+};
+
+var isJwmView = function isJwmView(url) {
+  return url.match(/^https:\/\/.*?\/jira\/core\/projects\/[^\/]+?\/(timeline|calendar)\/?/);
 };
 
 var isSlackMessage = function isSlackMessage(url) {
@@ -52,7 +56,7 @@ export var Transformer = /*#__PURE__*/function () {
   }, {
     key: "toAdf",
     value: function toAdf(url, appearance) {
-      if (isJiraRoadMap(url) || isPolarisView(url)) {
+      if (isJiraRoadMap(url) || isPolarisView(url) || isJwmView(url)) {
         return this.buildEmbedAdf(url);
       } else if (isSlackMessage(url)) {
         return this.buildBlockAdf(url);

package/dist/esm/state/actions/index.js

@@ -9,6 +9,7 @@ import { useSmartLinkContext } from '../context';
 import * as measure from '../../utils/performance';
 import { APIError } from '../../client/errors';
 import { getUnauthorizedJsonLd } from '../../utils/jsonld';
+import { addMetadataToExperience } from '../analytics';
 export var useSmartCardActions = function useSmartCardActions(id, url, analytics) {
   var _useSmartLinkContext = useSmartLinkContext(),
       store = _useSmartLinkContext.store,
@@ -98,7 +99,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
             isReloading = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
 
             if (!(isReloading || !hasData)) {
-              _context.next = 4;
+              _context.next = 6;
               break;
             }
 
@@ -108,13 +109,18 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
               return handleResolvedLinkError(resourceUrl, error);
             }));
 
-          case 4:
+          case 6:
+            addMetadataToExperience('smart-link-rendered', id, {
+              cached: true
+            });
+
+          case 7:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
-  })), [url, hasData, connections.client, handleResolvedLinkResponse, handleResolvedLinkError]);
+  })), [url, hasData, connections.client, handleResolvedLinkResponse, handleResolvedLinkError, id]);
   var register = useCallback(function () {
     if (!details) {
       dispatch(cardAction(ACTION_PENDING, {
@@ -152,10 +158,10 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
       analytics.screen.authPopupEvent(definitionId, extensionKey);
       auth(services[0].url).then(function () {
         analytics.track.appAccountConnected(definitionId, extensionKey);
-        analytics.operational.connectSucceededEvent(definitionId, extensionKey);
+        analytics.operational.connectSucceededEvent(id, definitionId, extensionKey);
         reload();
       }, function (err) {
-        analytics.operational.connectFailedEvent(definitionId, extensionKey, err.type);
+        analytics.operational.connectFailedEvent(id, definitionId, extensionKey, err.type);
 
         if (err.type === 'auth_window_closed') {
           analytics.ui.closedAuthEvent(appearance, definitionId, extensionKey);
@@ -164,7 +170,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
         reload();
       });
     }
-  }, [analytics.ui, analytics.screen, analytics.track, analytics.operational, reload, details, status]);
+  }, [analytics.ui, analytics.screen, analytics.track, analytics.operational, id, reload, details, status]);
   var invoke = useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(opts, appearance) {
       var key, action, source, markName, response;
@@ -179,7 +185,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
               measure.mark(markName, 'pending');
               _context2.prev = 4;
               // Begin analytics instrumentation.
-              analytics.ui.actionClickedEvent(key, action.type, source); // Invoke action - either client-side or server-side.
+              analytics.ui.actionClickedEvent(id, key, action.type, source, opts.type); // Invoke action - either client-side or server-side.
 
               if (!(opts.type === 'client')) {
                 _context2.next = 12;