@atlaskit/smart-card 23.7.2 → 23.8.0

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

@@ -135,11 +135,12 @@ var BlockCard = function BlockCard(_ref) {
       details = cardState.details;
   var data = details && details.data || (0, _jsonld.getEmptyJsonLd)();
   var meta = details && details.meta;
+  var extensionKey = (0, _helpers.getExtensionKey)(details);
   var extractorOpts = {
     analytics: analytics,
     origin: 'smartLinkCard',
     handleInvoke: handleInvoke,
-    extensionKey: (0, _helpers.getExtensionKey)(details)
+    extensionKey: extensionKey
   };
 
   if (enableFlexibleBlockCard) {
@@ -154,7 +155,8 @@ var BlockCard = function BlockCard(_ref) {
       onError: onError,
       renderers: renderers,
       ui: ui,
-      analytics: analytics
+      analytics: analytics,
+      extensionKey: extensionKey
     };
 
     switch (status) {

package/dist/cjs/view/BlockCard/views/flexible/FlexibleNotFoundView.js

@@ -63,7 +63,7 @@ var FlexibleNotFoundView = function FlexibleNotFoundView(_ref) {
     message: {
       descriptor: _messages.messages.not_found_description
     },
-    testId: testId
+    testId: "".concat(testId, "-message")
   })), /*#__PURE__*/_react.default.createElement(_blocks.CustomBlock, null, /*#__PURE__*/_react.default.createElement(_footer.default, {
     status: status
   })));

package/dist/cjs/view/BlockCard/views/flexible/FlexibleResolvedView.js

@@ -112,7 +112,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
         analytics.operational.invokeSucceededEvent({
           id: analyticsId,
           actionType: 'preview',
-          display: 'block'
+          display: _constants.CardDisplay.Block
         });
       }
     }, {
@@ -122,7 +122,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
         analytics.operational.invokeSucceededEvent({
           id: analyticsId,
           actionType: 'view',
-          display: 'block'
+          display: _constants.CardDisplay.Block
         });
       }
     }, {
@@ -132,7 +132,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
         analytics.operational.invokeSucceededEvent({
           id: analyticsId,
           actionType: 'download',
-          display: 'block'
+          display: _constants.CardDisplay.Block
         });
       }
     }]

package/dist/cjs/view/BlockCard/views/flexible/FlexibleUnauthorisedView.js

@@ -49,7 +49,10 @@ var contentStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _
 var FlexibleUnauthorisedView = function FlexibleUnauthorisedView(_ref) {
   var _cardState$details, _extractProvider;
 
-  var cardState = _ref.cardState,
+  var analytics = _ref.analytics,
+      cardState = _ref.cardState,
+      _ref$extensionKey = _ref.extensionKey,
+      extensionKey = _ref$extensionKey === void 0 ? '' : _ref$extensionKey,
       onAuthorize = _ref.onAuthorize,
       onClick = _ref.onClick,
       onError = _ref.onError,
@@ -59,9 +62,17 @@ var FlexibleUnauthorisedView = function FlexibleUnauthorisedView(_ref) {
       url = _ref.url;
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   var providerName = (_extractProvider = (0, _extractors.extractProvider)(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
+  var handleAuthorize = (0, _react.useCallback)(function () {
+    if (onAuthorize) {
+      analytics.track.appAccountAuthStarted({
+        extensionKey: extensionKey
+      });
+      onAuthorize();
+    }
+  }, [onAuthorize, extensionKey, analytics.track]);
   var actions = (0, _react.useMemo)(function () {
-    return onAuthorize ? [(0, _AuthorizeAction.AuthorizeAction)(onAuthorize, providerName)] : [];
-  }, [onAuthorize, providerName]);
+    return onAuthorize ? [(0, _AuthorizeAction.AuthorizeAction)(handleAuthorize, providerName)] : [];
+  }, [handleAuthorize, onAuthorize, providerName]);
   return /*#__PURE__*/_react.default.createElement(_FlexibleCard.default, {
     appearance: "block",
     cardState: cardState,
@@ -77,7 +88,9 @@ var FlexibleUnauthorisedView = function FlexibleUnauthorisedView(_ref) {
     overrideCss: contentStyles,
     testId: "".concat(testId, "-content")
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_UnauthorisedViewContent.default, {
-    providerName: providerName
+    providerName: providerName,
+    analytics: analytics,
+    testId: testId
   }))), /*#__PURE__*/_react.default.createElement(_blocks.CustomBlock, null, /*#__PURE__*/_react.default.createElement(_footer.default, {
     actions: actions,
     status: _constants.SmartLinkStatus.Unauthorized,

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

@@ -33,6 +33,8 @@ var _FlexibleCard = _interopRequireDefault(require("../FlexibleCard"));
 
 var _ = require("../..");
 
+var _constants = require("../../constants");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -95,7 +97,7 @@ function CardWithUrlContent(_ref) {
     var isModifierKeyPressed = (0, _utils.isSpecialEvent)(event);
     analytics.ui.cardClickedEvent({
       id: id,
-      display: isFlexibleUi ? 'flexible' : appearance,
+      display: isFlexibleUi ? _constants.CardDisplay.Flexible : appearance,
       status: state.status,
       definitionId: definitionId,
       extensionKey: extensionKey,

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

@@ -59,6 +59,7 @@ var EmbedCard = /*#__PURE__*/_react.default.forwardRef(function (_ref, iframeRef
       inheritDimensions = _ref.inheritDimensions;
   var data = details && details.data || (0, _jsonld.getEmptyJsonLd)();
   var meta = details && details.meta;
+  var extensionKey = (0, _helpers.getExtensionKey)(details);
 
   switch (status) {
     case 'pending':
@@ -104,7 +105,7 @@ var EmbedCard = /*#__PURE__*/_react.default.forwardRef(function (_ref, iframeRef
           analytics: analytics,
           origin: 'smartLinkEmbed',
           handleInvoke: handleInvoke,
-          extensionKey: (0, _helpers.getExtensionKey)(details)
+          extensionKey: extensionKey
         });
         return /*#__PURE__*/_react.default.createElement(_BlockCard.BlockCardResolvedView, (0, _extends2.default)({}, resolvedBlockViewProps, {
           isSelected: isSelected,
@@ -127,7 +128,10 @@ var EmbedCard = /*#__PURE__*/_react.default.forwardRef(function (_ref, iframeRef
         isSelected: isSelected,
         onAuthorise: handleAuthorize,
         inheritDimensions: inheritDimensions,
-        onClick: handleFrameClick
+        onClick: handleFrameClick,
+        analytics: analytics,
+        extensionKey: extensionKey,
+        testId: testId
       }));
 
     case 'forbidden':

package/dist/cjs/view/EmbedCard/views/UnauthorisedView.js

@@ -2,12 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EmbedCardUnauthorisedView = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _UnresolvedView = require("./UnresolvedView");
 
@@ -19,22 +21,36 @@ var _ImageIcon = require("../components/ImageIcon");
 
 var _UnauthorisedViewContent = _interopRequireDefault(require("../../common/UnauthorisedViewContent"));
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 var EmbedCardUnauthorisedView = function EmbedCardUnauthorisedView(_ref) {
   var _context$image;
 
-  var link = _ref.link,
+  var analytics = _ref.analytics,
+      link = _ref.link,
       context = _ref.context,
       isSelected = _ref.isSelected,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'embed-card-unauthorized-view' : _ref$testId,
       onAuthorise = _ref.onAuthorise,
       inheritDimensions = _ref.inheritDimensions,
-      onClick = _ref.onClick;
+      onClick = _ref.onClick,
+      extensionKey = _ref.extensionKey;
 
   var icon = context && context.icon && /*#__PURE__*/_react.default.createElement(_ImageIcon.ImageIcon, {
     src: typeof context.icon === 'string' ? context.icon : undefined
   });
 
+  var handleOnAuthorizeClick = (0, _react.useCallback)(function () {
+    if (onAuthorise) {
+      analytics.track.appAccountAuthStarted({
+        extensionKey: extensionKey
+      });
+      onAuthorise();
+    }
+  }, [onAuthorise, analytics.track, extensionKey]);
   return /*#__PURE__*/_react.default.createElement(_ExpandedFrame.ExpandedFrame, {
     href: link,
     icon: icon,
@@ -55,9 +71,10 @@ var EmbedCardUnauthorisedView = function EmbedCardUnauthorisedView(_ref) {
       text: 'connect_unauthorised_account_action',
       testId: 'connect-account'
     },
-    onClick: onAuthorise,
+    onClick: handleOnAuthorizeClick,
     testId: testId
   }, /*#__PURE__*/_react.default.createElement(_UnauthorisedViewContent.default, {
+    analytics: analytics,
     providerName: context === null || context === void 0 ? void 0 : context.text,
     testId: testId
   })));

package/dist/cjs/view/EmbedModal/components/analytics/index.js

@@ -15,6 +15,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _types = require("../../types");
 
+var _constants = require("../../../../constants");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -41,7 +43,7 @@ var withAnalytics = function withAnalytics(Component) {
       });
       analytics.ui.renderSuccessEvent({
         status: 'resolved',
-        display: 'preview'
+        display: _constants.CardDisplay.EmbedPreview
       });
 
       if (onOpen) {
@@ -50,7 +52,7 @@ var withAnalytics = function withAnalytics(Component) {
     }, [analytics.screen, analytics.ui, onOpen, origin]);
     var handleOnOpenFailed = (0, _react.useCallback)(function (error, errorInfo) {
       analytics.ui.renderFailedEvent({
-        display: 'preview',
+        display: _constants.CardDisplay.EmbedPreview,
         error: error,
         errorInfo: errorInfo
       });

package/dist/cjs/view/HoverCard/components/HoverCardComponent.js

@@ -29,7 +29,7 @@ var _HoverCardContent = _interopRequireDefault(require("../components/HoverCardC
 
 var _styled = require("../styled");
 
-var _utils = require("../utils");
+var _constants = require("../../../constants");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -43,8 +43,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
   var children = _ref.children,
       url = _ref.url,
       analyticsHandler = _ref.analyticsHandler,
-      analytics = _ref.analytics,
-      onAuthorize = _ref.onAuthorize;
+      analytics = _ref.analytics;
   var delay = 300;
 
   var _React$useState = _react2.default.useState(false),
@@ -60,6 +59,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
   var parentSpan = (0, _react2.useRef)(null);
   var renderers = (0, _renderers.useSmartLinkRenderers)();
   var linkState = (0, _store.useSmartCardState)(url);
+  var linkStatus = linkState.status;
   var hoverDisplay = 'card';
   var invokeMethod = 'mouse_hover';
   var setMousePosition = (0, _react2.useCallback)(function (event) {
@@ -79,12 +79,13 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
       analytics.ui.hoverCardDismissedEvent({
         previewDisplay: 'card',
         hoverTime: hoverTime,
-        previewInvokeMethod: 'mouse_hover'
+        previewInvokeMethod: 'mouse_hover',
+        status: linkStatus
       });
     }
 
     setIsOpen(false);
-  }, [analytics.ui, isOpen]);
+  }, [analytics.ui, isOpen, linkStatus]);
   var initHideCard = (0, _react2.useCallback)(function () {
     if (fadeInTimeoutId.current) {
       clearTimeout(fadeInTimeoutId.current);
@@ -107,7 +108,8 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
         cardOpenTime.current = Date.now();
         analytics.ui.hoverCardViewedEvent({
           previewDisplay: hoverDisplay,
-          previewInvokeMethod: invokeMethod
+          previewInvokeMethod: invokeMethod,
+          status: linkStatus
         });
       } //If these are undefined then popupOffset is undefined and we fallback to default bottom-start placement
 
@@ -122,10 +124,10 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
 
       setIsOpen(true);
     }, delay);
-  }, [isOpen, setMousePosition, analytics.ui]);
+  }, [isOpen, setMousePosition, analytics.ui, linkStatus]);
   var linkActions = (0, _useSmartLinkActions.useSmartLinkActions)({
     url: url,
-    appearance: _utils.SMART_CARD_ANALYTICS_DISPLAY,
+    appearance: _constants.CardDisplay.HoverCardPreview,
     analyticsHandler: analyticsHandler,
     origin: 'smartLinkPreviewHoverCard'
   });
@@ -161,8 +163,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
         onActionClick: onActionClick,
         onResolve: update,
         renderers: renderers,
-        url: url,
-        onAuthorize: onAuthorize
+        url: url
       }));
     },
     trigger: function trigger(triggerProps) {

package/dist/cjs/view/HoverCard/components/HoverCardContent.js

@@ -78,8 +78,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
       onActionClick = _ref.onActionClick,
       onResolve = _ref.onResolve,
       renderers = _ref.renderers,
-      url = _ref.url,
-      onAuthorize = _ref.onAuthorize;
+      url = _ref.url;
   var extensionKey = (0, _react.useMemo)(function () {
     return (0, _helpers.getExtensionKey)(cardState.details);
   }, [cardState.details]);
@@ -87,7 +86,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
     var isModifierKeyPressed = (0, _utils.isSpecialEvent)(event);
     analytics.ui.cardClickedEvent({
       id: id,
-      display: _utils2.SMART_CARD_ANALYTICS_DISPLAY,
+      display: _constants.CardDisplay.HoverCardPreview,
       status: cardState.status,
       isModifierKeyPressed: isModifierKeyPressed,
       actionSubjectId: 'titleGoToLink'
@@ -130,8 +129,11 @@ var HoverCardContent = function HoverCardContent(_ref) {
 
   if (cardState.status === 'unauthorized') {
     return /*#__PURE__*/_react.default.createElement(_unauthorised.default, {
+      analytics: analytics,
+      extensionKey: extensionKey,
+      id: id,
       flexibleCardProps: flexibleCardProps,
-      onAuthorize: onAuthorize
+      url: url
     });
   } // if metadataStatus is 'errored' simply render using data available (normal path)
 

package/dist/cjs/view/HoverCard/components/views/resolved/index.js

@@ -77,7 +77,7 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref) {
     // Since this hover view is only rendered on resolved status,
     // there is no need to check for statuses.
     analytics.ui.renderSuccessEvent({
-      display: _utils.SMART_CARD_ANALYTICS_DISPLAY,
+      display: _constants.CardDisplay.HoverCardPreview,
       status: cardState.status
     });
   }, [analytics.ui, cardState.status]);

package/dist/cjs/view/HoverCard/components/views/unauthorised/index.js

@@ -33,6 +33,8 @@ var _elements = require("../../../../FlexibleCard/components/elements");
 
 var _constants = require("../../../../../constants");
 
+var _actions = require("../../../../../state/actions");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -40,24 +42,40 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var HoverCardUnauthorisedView = function HoverCardUnauthorisedView(_ref) {
   var _cardState$details, _extractProvider;
 
-  var flexibleCardProps = _ref.flexibleCardProps,
+  var analytics = _ref.analytics,
+      extensionKey = _ref.extensionKey,
+      _ref$id = _ref.id,
+      id = _ref$id === void 0 ? '' : _ref$id,
+      flexibleCardProps = _ref.flexibleCardProps,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'hover-card-unauthorised-view' : _ref$testId,
-      onAuthorize = _ref.onAuthorize;
+      url = _ref.url;
   var cardState = flexibleCardProps.cardState;
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   var providerName = (_extractProvider = (0, _extractors.extractProvider)(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
+
+  var _useSmartCardActions = (0, _actions.useSmartCardActions)(id, url, analytics),
+      authorize = _useSmartCardActions.authorize;
+
+  var handleAuthorize = (0, _react.useCallback)(function () {
+    if (authorize) {
+      analytics.track.appAccountAuthStarted({
+        extensionKey: extensionKey
+      });
+      authorize(_constants.CardDisplay.HoverCardPreview);
+    }
+  }, [authorize, extensionKey, analytics.track]);
   var actions = (0, _react.useMemo)(function () {
-    return onAuthorize ? [{
+    return [{
       name: _constants.ActionName.CustomAction,
       content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages.connect_unauthorised_account_action, {
         values: {
           context: providerName
         }
       })),
-      onClick: onAuthorize
-    }] : [];
-  }, [onAuthorize, providerName]);
+      onClick: handleAuthorize
+    }];
+  }, [handleAuthorize, providerName]);
   return /*#__PURE__*/_react.default.createElement(_FlexibleCard.default, (0, _extends2.default)({}, flexibleCardProps, {
     testId: testId
   }), /*#__PURE__*/_react.default.createElement(_blocks.CustomBlock, {
@@ -71,7 +89,8 @@ var HoverCardUnauthorisedView = function HoverCardUnauthorisedView(_ref) {
     overrideCss: _styled.mainTextStyles,
     testId: "".concat(testId, "-content")
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_UnauthorisedViewContent.default, {
-    providerName: providerName
+    providerName: providerName,
+    analytics: analytics
   }))), /*#__PURE__*/_react.default.createElement(_blocks.CustomBlock, {
     overrideCss: _styled.connectButtonStyles,
     testId: "".concat(testId, "-button")

package/dist/cjs/view/HoverCard/index.js

@@ -23,7 +23,7 @@ var _analytics2 = require("../../utils/analytics");
 
 var _HoverCardComponent = require("./components/HoverCardComponent");
 
-var _utils = require("./utils");
+var _constants = require("../../constants");
 
 /** @jsx jsx */
 var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
@@ -37,7 +37,7 @@ var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
   var analytics = (0, _analytics.useSmartLinkAnalytics)(url, analyticsHandler, id);
   var onError = (0, _react2.useCallback)(function (error, info) {
     analytics.ui.renderFailedEvent({
-      display: _utils.SMART_CARD_ANALYTICS_DISPLAY,
+      display: _constants.CardDisplay.HoverCardPreview,
       id: id,
       error: error,
       errorInfo: info
@@ -53,6 +53,9 @@ var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
 };
 
 var HoverCard = (0, _analyticsNext.withAnalyticsContext)({
-  source: 'smartLinkPreviewHoverCard'
+  source: 'smartLinkPreviewHoverCard',
+  attributes: {
+    display: _constants.CardDisplay.HoverCardPreview
+  }
 })((0, _analyticsNext.withAnalyticsEvents)()(HoverCardWithErrorBoundary));
 exports.HoverCard = HoverCard;

package/dist/cjs/view/HoverCard/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toActionableMetadata = exports.getSimulatedMetadata = exports.SMART_CARD_ANALYTICS_DISPLAY = void 0;
+exports.toActionableMetadata = exports.getSimulatedMetadata = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -15,9 +15,6 @@ 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 SMART_CARD_ANALYTICS_DISPLAY = 'flexible';
-exports.SMART_CARD_ANALYTICS_DISPLAY = SMART_CARD_ANALYTICS_DISPLAY;
-
 var getSimulatedMetadata = function getSimulatedMetadata() {
   var extensionKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var types = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];

package/dist/cjs/view/InlineCard/ErroredView/index.js

@@ -71,17 +71,11 @@ var InlineCardErroredView = /*#__PURE__*/function (_React$Component) {
         onRetry();
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderMessage", function () {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderRightSide", function () {
       var _this$props = _this.props,
           onRetry = _this$props.onRetry,
-          url = _this$props.url,
           message = _this$props.message;
-
-      var link = /*#__PURE__*/_react.default.createElement(_styled.LinkAppearance, null, url);
-
-      var errorMessage = /*#__PURE__*/_react.default.createElement(_styled.NoLinkAppearance, null, message);
-
-      return !onRetry ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, link, " - ", errorMessage) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, link, " - ", errorMessage, ",\xA0", /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
+      return !onRetry ? message : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message, ', ', /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
         spacing: "none",
         appearance: "subtle-link",
         component: _styled.IconStyledButton,
@@ -105,8 +99,6 @@ var InlineCardErroredView = /*#__PURE__*/function (_React$Component) {
           icon = _this$props2.icon;
       return /*#__PURE__*/_react.default.createElement(_Frame.Frame, {
         testId: testId,
-        link: url,
-        onClick: onClick,
         isSelected: isSelected
       }, /*#__PURE__*/_react.default.createElement(_IconAndTitleLayout.IconAndTitleLayout, {
         icon: icon || /*#__PURE__*/_react.default.createElement(_Icon.AKIconWrapper, null, /*#__PURE__*/_react.default.createElement(_error.default, {
@@ -114,7 +106,10 @@ var InlineCardErroredView = /*#__PURE__*/function (_React$Component) {
           size: "small",
           primaryColor: (0, _tokens.token)('color.icon.danger', _colors.R300)
         })),
-        title: this.renderMessage()
+        link: url,
+        title: url,
+        onClick: onClick,
+        rightSide: this.renderRightSide()
       }));
     }
   }]);

package/dist/cjs/view/InlineCard/ForbiddenView/index.js

@@ -101,23 +101,18 @@ var InlineCardForbiddenView = /*#__PURE__*/function (_React$Component) {
         return /*#__PURE__*/_react.default.createElement(_styled.LowercaseAppearance, null, formattedMessage);
       }));
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderMessage", function () {
-      var _this$props4, _this$props4$requestA;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderRightSide", function () {
+      var _this$props3, _this$props3$requestA;
 
-      var _this$props3 = _this.props,
-          url = _this$props3.url,
-          onAuthorise = _this$props3.onAuthorise;
-
-      var link = /*#__PURE__*/_react.default.createElement(_styled.LinkAppearance, null, url);
-
-      var hasRequestAccessContextMessage = (_this$props4 = _this.props) === null || _this$props4 === void 0 ? void 0 : (_this$props4$requestA = _this$props4.requestAccessContext) === null || _this$props4$requestA === void 0 ? void 0 : _this$props4$requestA.callToActionMessageKey;
-      return !onAuthorise && !hasRequestAccessContextMessage ? link : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, link, ' - ', /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
+      var onAuthorise = _this.props.onAuthorise;
+      var hasRequestAccessContextMessage = (_this$props3 = _this.props) === null || _this$props3 === void 0 ? void 0 : (_this$props3$requestA = _this$props3.requestAccessContext) === null || _this$props3$requestA === void 0 ? void 0 : _this$props3$requestA.callToActionMessageKey;
+      return onAuthorise || hasRequestAccessContextMessage ? /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
         spacing: "none",
         appearance: "subtle-link",
         onClick: _this.handleRetry,
         component: _styled.IconStyledButton,
         testId: "button-connect-other-account"
-      }, _this.renderForbiddenAccessMessage()));
+      }, _this.renderForbiddenAccessMessage()) : null;
     });
     return _this;
   }
@@ -125,21 +120,22 @@ var InlineCardForbiddenView = /*#__PURE__*/function (_React$Component) {
   (0, _createClass2.default)(InlineCardForbiddenView, [{
     key: "render",
     value: function render() {
-      var _this$props5 = this.props,
-          url = _this$props5.url,
-          icon = _this$props5.icon,
-          onClick = _this$props5.onClick,
-          isSelected = _this$props5.isSelected,
-          _this$props5$testId = _this$props5.testId,
-          testId = _this$props5$testId === void 0 ? 'inline-card-forbidden-view' : _this$props5$testId;
+      var _this$props4 = this.props,
+          url = _this$props4.url,
+          icon = _this$props4.icon,
+          onClick = _this$props4.onClick,
+          isSelected = _this$props4.isSelected,
+          _this$props4$testId = _this$props4.testId,
+          testId = _this$props4$testId === void 0 ? 'inline-card-forbidden-view' : _this$props4$testId;
       return /*#__PURE__*/_react.default.createElement(_Frame.Frame, {
         testId: testId,
-        link: url,
-        onClick: onClick,
         isSelected: isSelected
       }, /*#__PURE__*/_react.default.createElement(_IconAndTitleLayout.IconAndTitleLayout, {
         icon: icon ? icon : FallbackForbiddenIcon,
-        title: this.renderMessage(),
+        link: url,
+        title: url,
+        onClick: onClick,
+        rightSide: this.renderRightSide(),
         titleColor: (0, _tokens.token)('color.text.subtle', _colors.N500)
       }));
     }

package/dist/cjs/view/InlineCard/Frame/index.js

@@ -23,7 +23,6 @@ var Frame = function Frame(props) {
       onClick = props.onClick,
       link = props.link,
       withoutBackground = props.withoutBackground,
-      withoutHover = props.withoutHover,
       testId = props.testId,
       className = props.className;
   var handleClick = (0, _react.useCallback)(function (event) {
@@ -44,14 +43,15 @@ var Frame = function Frame(props) {
       onClick(event);
     }
   }, [onClick]);
-  var isInteractive = Boolean(onClick); // TODO Theming doesn't work right now in editor. Required React context does not trickle down atm.
+  var isInteractive = Boolean(onClick); // Depending on whenever Frame was given onClick or link itself we display span or anchor elements
+
+  var Wrapper = link || onClick ? _styled.WrapperAnchor : _styled.WrapperSpan; // TODO Theming doesn't work right now in editor. Required React context does not trickle down atm.
   //  It will be worked as part of https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-154
 
-  return /*#__PURE__*/_react.default.createElement(_styled.Wrapper, {
+  return /*#__PURE__*/_react.default.createElement(Wrapper, {
     theme: (0, _components.useGlobalTheme)(),
     href: link,
     withoutBackground: withoutBackground,
-    withoutHover: withoutHover,
     isSelected: isSelected,
     isInteractive: isInteractive,
     tabIndex: isInteractive ? 0 : undefined,