@atlaskit/smart-card 32.7.8 → 32.7.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/smart-card
 
+## 32.7.9
+
+### Patch Changes
+
+- [#171388](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171388)
+  [`87d9dab6e4f6d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/87d9dab6e4f6d) -
+  Add definitionId and resourceType to SmartLinkAnalyticsContext and migrate EmbedModal analytics
+
 ## 32.7.8
 
 ### Patch Changes

package/analytics.spec.yaml

@@ -381,6 +381,19 @@ events:
           required: false
           type: string
           description: The definitionId of the Smart Link resolver invoked.
+  - embedPreviewModal viewed:
+      type: screen
+      description: Fires an event that represents when a user view a modal.
+      attributes:
+        <<: [ *PackageMetaDataContext, *CommonContext ]
+        origin:
+          required: false
+          type: [ 'smartLinkCard', 'smartLinkEmbed', 'smartLinkInline', 'smartLinkPreviewHoverCard' ]
+          description: The origin of the event
+        size:
+          required: false
+          type: [ 'large', 'small' ]
+          description: The size of the modal
   - smartLink connectSucceeded:
       type: operational
       description:
@@ -629,6 +642,23 @@ events:
           required: false
           type: string
           description: The definitionId of the Smart Link resolver invoked.
+  - modal closed (embedPreview):
+      type: ui
+      description: Fires an event that represents when a user close a modal.
+      attributes:
+        <<: [ *PackageMetaDataContext, *CommonContext ]
+        origin:
+          required: false
+          type: [ 'smartLinkCard', 'smartLinkEmbed', 'smartLinkInline', 'smartLinkPreviewHoverCard' ]
+          description: The origin of the event
+        previewTime:
+          required: false
+          type: number
+          description: Duration that user spent on the preview.
+        size:
+          required: false
+          type: [ 'large', 'small' ]
+          description: The size of the modal
   - button clicked (learnMore):
       type: ui
       description:
@@ -695,15 +725,11 @@ events:
           required: true
           type: [ 'inline', 'block', 'embed', 'embedPreview', 'flexible', 'hoverCardPreview' ]
           description: Whether the card was an Inline, Block, Embed or Flexible UI
-        definitionId:
-          required: false
-          type: string
-          description: The definitionId of the Smart Link resolver invoked.
   - smartLink renderFailed:
       type: ui
       description: fires an event that represents when a Smart Link renders unsuccessfully.
       attributes:
-        <<: [ *PackageMetaDataContext, *CommonContext ]
+        <<: [ *PackageMetaDataContext, *CommonContext]
         display:
           required: true
           type: [ 'inline', 'block', 'embed', 'embedPreview', 'flexible', 'hoverCardPreview' ]

package/dist/cjs/extractors/action/extract-invoke-preview-action.js

@@ -34,6 +34,7 @@ var extractInvokePreviewAction = exports.extractInvokePreviewAction = function e
   var src = (_extractPreviewData = (0, _linkExtractors.extractPreview)(data, 'web')) === null || _extractPreviewData === void 0 ? void 0 : _extractPreviewData.src;
   if (src) {
     var url = (0, _linkExtractors.extractLink)(data);
+    var extensionKey = (0, _helpers.getExtensionKey)(response);
     return {
       actionFn: function () {
         var _actionFn = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -43,7 +44,10 @@ var extractInvokePreviewAction = exports.extractInvokePreviewAction = function e
               case 0:
                 return _context.abrupt("return", (0, _utils.openEmbedModal)({
                   fireEvent: fireEvent,
+                  extensionKey: extensionKey,
+                  id: id,
                   invokeDownloadAction: (0, _extractInvokeDownloadAction.extractInvokeDownloadAction)(param),
+                  invokeViewAction: (0, _extractInvokeViewAction.extractInvokeViewAction)(param, true),
                   isSupportTheming: (0, _extractIsSupportTheming.extractIsSupportTheming)(meta),
                   isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta),
                   linkIcon: (0, _icon.extractLinkIcon)(response),
@@ -52,8 +56,7 @@ var extractInvokePreviewAction = exports.extractInvokePreviewAction = function e
                   origin: origin,
                   src: src,
                   title: (0, _linkExtractors.extractTitle)(data),
-                  url: url,
-                  invokeViewAction: (0, _extractInvokeViewAction.extractInvokeViewAction)(param, true)
+                  url: url
                 }));
               case 1:
               case "end":
@@ -68,11 +71,9 @@ var extractInvokePreviewAction = exports.extractInvokePreviewAction = function e
       }(),
       actionSubjectId: 'invokePreviewScreen',
       actionType: _index.ActionName.PreviewAction,
-      definitionId: (0, _helpers.getDefinitionId)(response),
       display: display,
-      extensionKey: (0, _helpers.getExtensionKey)(response),
-      id: id,
-      resourceType: (0, _helpers.getResourceType)(response)
+      extensionKey: extensionKey,
+      id: id
     };
   }
 };

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

@@ -75,6 +75,7 @@ var useSmartLinkAnalytics = exports.useSmartLinkAnalytics = function useSmartLin
        * This fires an event that represents when a user
        * click a button.
        * @param data A partial analytics event payload
+       * @deprecated consider removing when cleaning up FF platform-smart-card-migrate-embed-modal-analytics
        */
       buttonClickedEvent: function buttonClickedEvent(data) {
         return dispatchAnalytics(applyCommonAttributes({
@@ -120,6 +121,7 @@ var useSmartLinkAnalytics = exports.useSmartLinkAnalytics = function useSmartLin
       /**
        * This fires an event that represents when a user close a modal.
        * @param data A partial analytics event payload
+       * @deprecated consider removing when cleaning up FF platform-smart-card-migrate-embed-modal-analytics
        */
       modalClosedEvent: function modalClosedEvent(data) {
         return dispatchAnalytics(applyCommonAttributes({
@@ -138,6 +140,7 @@ var useSmartLinkAnalytics = exports.useSmartLinkAnalytics = function useSmartLin
        * @param definitionId The definitionId of the Smart Link resolver invoked.
        * @param extensionKey The extensionKey of the Smart Link resovler invoked.
        * @param canBeDatasource An indicator that shows that a smart link can be converted to a datasource
+       * @deprecated consider removing when cleaning up FF platform-smart-card-migrate-embed-modal-analytics
        */
       renderSuccessEvent: function renderSuccessEvent(_ref2) {
         var display = _ref2.display,
@@ -179,6 +182,7 @@ var useSmartLinkAnalytics = exports.useSmartLinkAnalytics = function useSmartLin
        * @param id The unique ID for this Smart Link.
        * @param error: An error representing why the Smart Link render failed.
        * @param errorInfo: Additional details about the error including the stack trace.
+       * @deprecated consider removing when cleaning up FF platform-smart-card-migrate-embed-modal-analytics
        */
       renderFailedEvent: function renderFailedEvent(_ref3) {
         var display = _ref3.display,
@@ -284,7 +288,7 @@ var useSmartLinkAnalytics = exports.useSmartLinkAnalytics = function useSmartLin
     return {
       /**
        * This fires an event that represents when a user view a modal.
-       * @param data A partial analytics event payload
+       * @deprecated consider removing when cleaning up FF platform-smart-card-migrate-embed-modal-analytics
        */
       modalViewedEvent: function modalViewedEvent(data) {
         return dispatchAnalytics(applyCommonAttributes({

package/dist/cjs/utils/analytics/LinkAnalyticsContext.js

@@ -5,13 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LinkAnalyticsContext = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _analytics = require("./analytics");
-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; }
 /**
  * Provides an analytics context to supply attributes to events based on a URL
  */
@@ -24,11 +19,11 @@ var LinkAnalyticsContext = exports.LinkAnalyticsContext = function LinkAnalytics
   return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
     data: {
       source: source,
-      attributes: _objectSpread(_objectSpread({}, (0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics') ? _analytics.context : {}), {}, {
+      attributes: {
         displayCategory: displayCategory,
         display: display,
         id: id
-      })
+      }
     }
   }, children);
 };

package/dist/cjs/utils/analytics/SmartLinkAnalyticsContext.js

@@ -1,27 +1,112 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SmartLinkAnalyticsContext = void 0;
+exports.useSmartLinkAnalyticsContext = exports.SmartLinkAnalyticsContext = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireDefault(require("react"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _resolvedAttributes = require("@atlaskit/link-analytics/resolved-attributes");
+var _linkProvider = require("@atlaskit/link-provider");
+var _linkingCommon = require("@atlaskit/linking-common");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _store = require("../../state/store");
+var _analytics = require("./analytics");
 var _LinkAnalyticsContext = require("./LinkAnalyticsContext");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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 getExtendedResolvedAttributes = function getExtendedResolvedAttributes(linkDetails, details, linkStatus) {
+  var _details$meta$definit, _details$meta, _details$meta$resourc, _details$meta2;
+  return _objectSpread({
+    definitionId: (_details$meta$definit = details === null || details === void 0 || (_details$meta = details.meta) === null || _details$meta === void 0 ? void 0 : _details$meta.definitionId) !== null && _details$meta$definit !== void 0 ? _details$meta$definit : null,
+    resourceType: (_details$meta$resourc = details === null || details === void 0 || (_details$meta2 = details.meta) === null || _details$meta2 === void 0 ? void 0 : _details$meta2.resourceType) !== null && _details$meta$resourc !== void 0 ? _details$meta$resourc : null
+  }, (0, _resolvedAttributes.getResolvedAttributes)(linkDetails, details, linkStatus));
+};
+var getSmartLinkAnalyticsContext = function getSmartLinkAnalyticsContext(_ref) {
+  var display = _ref.display,
+    id = _ref.id,
+    response = _ref.response,
+    source = _ref.source,
+    status = _ref.status,
+    url = _ref.url;
+  var resolvedAttributes = getExtendedResolvedAttributes({
+    url: url
+  }, response, status);
+  return {
+    source: source,
+    attributes: _objectSpread(_objectSpread({}, _analytics.context), {}, {
+      display: display,
+      id: id
+    }, resolvedAttributes)
+  };
+};
+/**
+ * Provides an analytics context data to supply attributes to events based on a URL
+ * and the link state in the store
+ */
+var useSmartLinkAnalyticsContext = exports.useSmartLinkAnalyticsContext = function useSmartLinkAnalyticsContext(_ref2) {
+  var display = _ref2.display,
+    id = _ref2.id,
+    source = _ref2.source,
+    url = _ref2.url;
+  var _useSmartLinkContext = (0, _linkProvider.useSmartLinkContext)(),
+    store = _useSmartLinkContext.store;
+  var state = store ? (0, _linkingCommon.getUrl)(store, url) : undefined;
+  return (0, _react.useMemo)(function () {
+    return (0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics') ? getSmartLinkAnalyticsContext({
+      display: display,
+      id: id,
+      response: state === null || state === void 0 ? void 0 : state.details,
+      source: source,
+      status: state === null || state === void 0 ? void 0 : state.status,
+      url: url
+    }) : {};
+  }, [display, id, source, state === null || state === void 0 ? void 0 : state.details, state === null || state === void 0 ? void 0 : state.status, url]);
+};
+
 /**
  * Provides an analytics context to supply attributes to events based on a URL
  * and the link state in the store
  */
-var SmartLinkAnalyticsContext = exports.SmartLinkAnalyticsContext = function SmartLinkAnalyticsContext(props) {
-  var children = props.children,
-    url = props.url,
-    display = props.display;
+var ExtendedSmartLinkAnalyticsContext = function ExtendedSmartLinkAnalyticsContext(_ref3) {
+  var children = _ref3.children,
+    display = _ref3.display,
+    id = _ref3.id,
+    source = _ref3.source,
+    url = _ref3.url;
   var _useSmartLinkState = (0, _store.useSmartCardState)(url),
     details = _useSmartLinkState.details,
     status = _useSmartLinkState.status;
+  var data = getSmartLinkAnalyticsContext({
+    display: display,
+    id: id,
+    response: details,
+    source: source,
+    status: status,
+    url: url
+  });
+  return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
+    data: data
+  }, children);
+};
+
+/**
+ * Provides an analytics context to supply attributes to events based on a URL
+ * and the link state in the store
+ */
+var LegacySmartLinkAnalyticsContext = function LegacySmartLinkAnalyticsContext(props) {
+  var children = props.children,
+    url = props.url,
+    display = props.display;
+  var _useSmartLinkState2 = (0, _store.useSmartCardState)(url),
+    details = _useSmartLinkState2.details,
+    status = _useSmartLinkState2.status;
   var attributes = (0, _resolvedAttributes.getResolvedAttributes)({
     url: url
   }, details, status);
@@ -32,4 +117,12 @@ var SmartLinkAnalyticsContext = exports.SmartLinkAnalyticsContext = function Sma
       attributes: attributes
     }
   }, children));
+};
+
+/**
+ * Provides an analytics context to supply attributes to events based on a URL
+ * and the link state in the store
+ */
+var SmartLinkAnalyticsContext = exports.SmartLinkAnalyticsContext = function SmartLinkAnalyticsContext(props) {
+  return (0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics') ? /*#__PURE__*/_react.default.createElement(ExtendedSmartLinkAnalyticsContext, props) : /*#__PURE__*/_react.default.createElement(LegacySmartLinkAnalyticsContext, props);
 };

package/dist/cjs/utils/analytics/analytics.js

@@ -15,7 +15,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
 var context = exports.context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "32.7.8"
+  packageVersion: "32.7.9"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -163,7 +163,6 @@ function Component(_ref) {
           display: isFlexibleUi ? 'flexible' : appearance
         });
         fireEvent('ui.smartLink.renderSuccess', {
-          definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null,
           display: isFlexibleUi ? 'flexible' : appearance
         });
       } else {

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.CardWithURLRenderer = CardWithURLRenderer;
 exports.LazyCardWithUrlContent = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactErrorBoundary = require("react-error-boundary");
@@ -17,9 +18,12 @@ var _useAnalyticsEvents2 = require("../../common/analytics/generated/use-analyti
 var _state = require("../../state");
 var _analytics = require("../../state/analytics");
 var _utils = require("../../utils");
+var _SmartLinkAnalyticsContext = require("../../utils/analytics/SmartLinkAnalyticsContext");
 var _flexible = require("../../utils/flexible");
 var _performance = require("../../utils/performance");
 var _LoadingCardLink = require("./component-lazy/LoadingCardLink");
+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; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var LazyCardWithUrlContent = exports.LazyCardWithUrlContent = /*#__PURE__*/(0, _react.lazy)(function () {
@@ -72,6 +76,11 @@ function CardWithURLRenderer(props) {
     truncateInline = props.truncateInline;
   var analytics = (0, _state.useSmartLinkAnalytics)(url !== null && url !== void 0 ? url : '', id);
   var isFlexibleUi = (0, _flexible.isFlexibleUiCard)(children);
+  var analyticsContext = (0, _SmartLinkAnalyticsContext.useSmartLinkAnalyticsContext)({
+    display: isFlexibleUi ? 'flexible' : appearance,
+    id: id,
+    url: url !== null && url !== void 0 ? url : ''
+  });
   var errorHandler = (0, _react.useCallback)(function (error, info) {
     var componentStack = info.componentStack;
     var errorInfo = {
@@ -83,23 +92,23 @@ function CardWithURLRenderer(props) {
     // to the reliability of the smart-card front-end components.
     // Likewise, chunk loading errors are not caused by a failure of smart-card rendering.
     if (error.name === 'ChunkLoadError') {
-      fireEvent('operational.smartLink.chunkLoadFailed', {
+      fireEvent('operational.smartLink.chunkLoadFailed', _objectSpread(_objectSpread({}, analyticsContext === null || analyticsContext === void 0 ? void 0 : analyticsContext.attributes), {}, {
         display: appearance,
         error: error,
         errorInfo: errorInfo,
         definitionId: null
-      });
+      }));
     } else if (error.name !== 'APIError') {
       if ((0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics')) {
         (0, _analytics.startUfoExperience)('smart-link-rendered', id || 'NULL');
         (0, _analytics.failUfoExperience)('smart-link-rendered', id || 'NULL');
         (0, _analytics.failUfoExperience)('smart-link-authenticated', id || 'NULL');
-        fireEvent('ui.smartLink.renderFailed', {
+        fireEvent('ui.smartLink.renderFailed', _objectSpread(_objectSpread({}, analyticsContext === null || analyticsContext === void 0 ? void 0 : analyticsContext.attributes), {}, {
           display: isFlexibleUi ? 'flexible' : appearance,
           id: id !== null && id !== void 0 ? id : null,
           error: error,
           errorInfo: errorInfo
-        });
+        }));
       } else {
         analytics.ui.renderFailedEvent({
           display: isFlexibleUi ? 'flexible' : appearance,
@@ -114,7 +123,7 @@ function CardWithURLRenderer(props) {
       url: url !== null && url !== void 0 ? url : '',
       err: error
     });
-  }, [analytics.ui, appearance, id, onError, url, isFlexibleUi, fireEvent]);
+  }, [analytics.ui, analyticsContext, appearance, id, onError, url, isFlexibleUi, fireEvent]);
   if (!url) {
     throw new Error('@atlaskit/smart-card: url property is missing.');
   }

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

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../../../constants");
+var _analytics = require("../../../../state/analytics");
 var _types = require("../../types");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -18,63 +20,117 @@ var getResizeFrom = function getResizeFrom(size) {
 var withAnalytics = function withAnalytics(Component) {
   return function (props) {
     var analytics = props.analytics,
+      fireEvent = props.fireEvent,
+      extensionKey = props.extensionKey,
+      id = props.id,
       onClose = props.onClose,
       onOpen = props.onOpen,
       onOpenFailed = props.onOpenFailed,
       onResize = props.onResize,
       origin = props.origin;
     var handleOnOpen = (0, _react.useCallback)(function (context) {
-      analytics === null || analytics === void 0 || analytics.screen.modalViewedEvent({
-        name: 'embedPreviewModal',
-        attributes: {
-          origin: origin,
+      if ((0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics')) {
+        fireEvent === null || fireEvent === void 0 || fireEvent('screen.embedPreviewModal.viewed', {
+          origin: origin !== null && origin !== void 0 ? origin : null,
           size: context.size
-        }
-      });
-      analytics === null || analytics === void 0 || analytics.ui.renderSuccessEvent({
-        status: 'resolved',
-        display: _constants.CardDisplay.EmbedPreview
-      });
+        });
+      } else {
+        analytics === null || analytics === void 0 || analytics.screen.modalViewedEvent({
+          name: 'embedPreviewModal',
+          attributes: {
+            origin: origin,
+            size: context.size
+          }
+        });
+      }
+      if ((0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics')) {
+        (0, _analytics.succeedUfoExperience)('smart-link-rendered', id || 'NULL', {
+          extensionKey: extensionKey,
+          display: _constants.CardDisplay.EmbedPreview
+        });
+
+        // UFO will disregard this if authentication experience has not yet been started
+        (0, _analytics.succeedUfoExperience)('smart-link-authenticated', id || 'NULL', {
+          display: _constants.CardDisplay.EmbedPreview
+        });
+        fireEvent === null || fireEvent === void 0 || fireEvent('ui.smartLink.renderSuccess', {
+          display: _constants.CardDisplay.EmbedPreview
+        });
+      } else {
+        analytics === null || analytics === void 0 || analytics.ui.renderSuccessEvent({
+          status: 'resolved',
+          display: _constants.CardDisplay.EmbedPreview
+        });
+      }
       if (onOpen) {
         onOpen(context);
       }
-    }, [analytics === null || analytics === void 0 ? void 0 : analytics.screen, analytics === null || analytics === void 0 ? void 0 : analytics.ui, onOpen, origin]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.screen, analytics === null || analytics === void 0 ? void 0 : analytics.ui, fireEvent, extensionKey, id, onOpen, origin]);
     var handleOnOpenFailed = (0, _react.useCallback)(function (error, errorInfo) {
-      analytics === null || analytics === void 0 || analytics.ui.renderFailedEvent({
-        display: _constants.CardDisplay.EmbedPreview,
-        error: error,
-        errorInfo: errorInfo
-      });
+      if ((0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics')) {
+        (0, _analytics.startUfoExperience)('smart-link-rendered', id || 'NULL');
+        (0, _analytics.failUfoExperience)('smart-link-rendered', id || 'NULL');
+        (0, _analytics.failUfoExperience)('smart-link-authenticated', id || 'NULL');
+        fireEvent === null || fireEvent === void 0 || fireEvent('ui.smartLink.renderFailed', {
+          display: _constants.CardDisplay.EmbedPreview,
+          error: error,
+          errorInfo: errorInfo,
+          id: id !== null && id !== void 0 ? id : null
+        });
+      } else {
+        analytics === null || analytics === void 0 || analytics.ui.renderFailedEvent({
+          display: _constants.CardDisplay.EmbedPreview,
+          error: error,
+          errorInfo: errorInfo
+        });
+      }
       if (onOpenFailed) {
         onOpenFailed(error, errorInfo);
       }
-    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, onOpenFailed]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, fireEvent, id, onOpenFailed]);
     var handleOnClose = (0, _react.useCallback)(function (context) {
-      analytics === null || analytics === void 0 || analytics.ui.modalClosedEvent({
-        actionSubjectId: 'embedPreview',
-        attributes: {
-          origin: origin,
-          previewTime: context.duration,
+      if ((0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics')) {
+        var _context$duration;
+        fireEvent === null || fireEvent === void 0 || fireEvent('ui.modal.closed.embedPreview', {
+          origin: origin !== null && origin !== void 0 ? origin : null,
+          previewTime: (_context$duration = context.duration) !== null && _context$duration !== void 0 ? _context$duration : null,
           size: context.size
-        }
-      });
+        });
+      } else {
+        analytics === null || analytics === void 0 || analytics.ui.modalClosedEvent({
+          actionSubjectId: 'embedPreview',
+          attributes: {
+            origin: origin,
+            previewTime: context.duration,
+            size: context.size
+          }
+        });
+      }
       if (onClose) {
         onClose(context);
       }
-    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, onClose, origin]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, fireEvent, onClose, origin]);
     var handleOnResize = (0, _react.useCallback)(function (context) {
-      analytics === null || analytics === void 0 || analytics.ui.buttonClickedEvent({
-        actionSubjectId: 'embedPreviewResize',
-        attributes: {
+      if ((0, _platformFeatureFlags.fg)('platform-smart-card-migrate-embed-modal-analytics')) {
+        fireEvent === null || fireEvent === void 0 || fireEvent('ui.button.clicked.embedPreviewResize', {
           newSize: context.size,
-          origin: origin,
+          origin: origin !== null && origin !== void 0 ? origin : null,
           previousSize: getResizeFrom(context.size)
-        }
-      });
+        });
+      } else {
+        analytics === null || analytics === void 0 || analytics.ui.buttonClickedEvent({
+          actionSubjectId: 'embedPreviewResize',
+          attributes: {
+            newSize: context.size,
+            origin: origin,
+            previousSize: getResizeFrom(context.size)
+          }
+        });
+      }
       if (onResize) {
         onResize(context);
       }
-    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, onResize, origin]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, fireEvent, onResize, origin]);
     return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, props, {
       onClose: handleOnClose,
       onOpen: handleOnOpen,

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

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.HoverCardComponent = void 0;
+exports.HoverCardComponent = exports.HOVER_CARD_SOURCE = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -29,7 +29,7 @@ var _excluded = ["aria-haspopup", "aria-expanded"];
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var HOVER_CARD_SOURCE = 'smartLinkPreviewHoverCard';
+var HOVER_CARD_SOURCE = exports.HOVER_CARD_SOURCE = 'smartLinkPreviewHoverCard';
 var FADE_IN_DELAY = 500;
 var FADE_OUT_DELAY = 300;
 var RESOLVE_DELAY = 100;

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

@@ -52,7 +52,6 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref) {
         display: _constants.CardDisplay.HoverCardPreview
       });
       fireEvent('ui.smartLink.renderSuccess', {
-        definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null,
         display: _constants.CardDisplay.HoverCardPreview
       });
     } else {