@atlaskit/smart-card 32.7.7 → 32.7.9

package/dist/es2019/view/FlexibleCard/components/elements/lozenge/lozenge-action/index.js

@@ -8,10 +8,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import DropdownMenu from '@atlaskit/dropdown-menu';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../../../../../common/analytics/generated/use-analytics-events';
 import extractLozengeActionItems from '../../../../../../extractors/action/extract-lozenge-action-items';
-import { useFlexibleUiAnalyticsContext } from '../../../../../../state/flexible-ui-context';
 import useInvoke from '../../../../../../state/hooks/use-invoke';
 import { isInvokeCustomError } from '../../../../../../state/hooks/use-invoke/utils';
 import useResolve from '../../../../../../state/hooks/use-resolve';
@@ -44,8 +42,6 @@ const LozengeAction = ({
   const [items, setItems] = useState();
   const [errorMessage, setErrorMessage] = useState();
   const reload = useResolve();
-  //TODO EDM-6583 Replace usage of useFlexibleUiAnalyticsContext with linking platform analytics context from find team.
-  const analytics = useFlexibleUiAnalyticsContext();
   const invoke = useInvoke();
   const {
     fireEvent
@@ -64,11 +60,7 @@ const LozengeAction = ({
   const handleOpenChange = useCallback(async args => {
     setIsOpen(args.isOpen);
     if (args.isOpen) {
-      if (fg('platform_migrate-some-ui-events-smart-card')) {
-        fireEvent('ui.button.clicked.smartLinkStatusLozenge', {});
-      } else {
-        analytics === null || analytics === void 0 ? void 0 : analytics.ui.smartLinkLozengeActionClickedEvent();
-      }
+      fireEvent('ui.button.clicked.smartLinkStatusLozenge', {});
       fireEvent('track.smartLinkQuickAction.started', {
         smartLinkActionType: TrackQuickActionType.StatusUpdate
       });
@@ -96,7 +88,7 @@ const LozengeAction = ({
     if (!args.isOpen) {
       setErrorMessage(undefined);
     }
-  }, [action.read, analytics, invoke, isLoaded, text, fireEvent]);
+  }, [action.read, invoke, isLoaded, text, fireEvent]);
   const trigger = useCallback(props => jsx(LozengeActionTrigger, _extends({}, props, {
     appearance: selected.appearance,
     isOpen: isOpen,
@@ -105,11 +97,7 @@ const LozengeAction = ({
   })), [selected.appearance, selected.text, isOpen, testId]);
   const handleItemClick = useCallback(async (id, text, appearance) => {
     try {
-      if (fg('platform_migrate-some-ui-events-smart-card')) {
-        fireEvent('ui.button.clicked.smartLinkStatusListItem', {});
-      } else {
-        analytics === null || analytics === void 0 ? void 0 : analytics.ui.smartLinkLozengeActionListItemClickedEvent();
-      }
+      fireEvent('ui.button.clicked.smartLinkStatusListItem', {});
       const updateAction = action === null || action === void 0 ? void 0 : action.update;
       if (updateAction && id) {
         setIsLoading(true);
@@ -140,7 +128,7 @@ const LozengeAction = ({
         fireEvent('track.smartLinkQuickAction.failed', unknownUpdateErrorAnalyticsPayload);
       }
     }
-  }, [action === null || action === void 0 ? void 0 : action.update, analytics, invoke, linkId, reload, url, fireEvent]);
+  }, [action === null || action === void 0 ? void 0 : action.update, invoke, linkId, reload, url, fireEvent]);
   const dropdownItemGroup = useMemo(() => {
     if (errorMessage) {
       return jsx(LozengeActionError, {

package/dist/es2019/view/FlexibleCard/components/elements/lozenge/lozenge-action/lozenge-action-error/index.js

@@ -41,11 +41,7 @@ const LozengeActionError = ({
   }, [reload, url]);
   const handlePreviewOpen = useCallback(() => {
     if (isPreviewAvailable) {
-      if (fg('platform_migrate-some-ui-events-smart-card')) {
-        fireEvent('ui.button.clicked.smartLinkStatusOpenPreview', {});
-      } else {
-        analytics === null || analytics === void 0 ? void 0 : analytics.ui.smartLinkLozengeActionErrorOpenPreviewClickedEvent();
-      }
+      fireEvent('ui.button.clicked.smartLinkStatusOpenPreview', {});
       if (fg('platform-smart-card-migrate-embed-modal-analytics')) {
         invokePreviewAction && invoke(invokePreviewAction);
       } else {

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

@@ -17,7 +17,7 @@ import { SmartLinkAnalyticsContext } from '../../../utils/analytics/SmartLinkAna
 import CustomPopupContainer from '../components/CustomPopupContainer';
 import HoverCardContent from '../components/HoverCardContent';
 import { CARD_GAP_PX, HOVER_CARD_Z_INDEX } from '../styled';
-const HOVER_CARD_SOURCE = 'smartLinkPreviewHoverCard';
+export const HOVER_CARD_SOURCE = 'smartLinkPreviewHoverCard';
 const FADE_IN_DELAY = 500;
 const FADE_OUT_DELAY = 300;
 const RESOLVE_DELAY = 100;

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

@@ -8,7 +8,6 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { jsx } from '@emotion/react';
 import { useAnalyticsEvents as useAnalyticsEventsNext } from '@atlaskit/analytics-next';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
 import { CardDisplay, SmartLinkPosition, SmartLinkSize } from '../../../constants';
 import { useSmartLinkAnalytics } from '../../../state/analytics';
@@ -56,17 +55,13 @@ const HoverCardContent = ({
   const isAISummaryEnabled = getIsAISummaryEnabled(isAdminHubAIEnabled, cardState.details);
   const services = getServices(linkState.details);
   const statusRef = useRef(linkStatus);
-  const analyticsRef = useRef(analytics);
   const fireEventRef = useRef(fireEvent);
   const definitionIdRef = useRef(definitionId);
   useEffect(() => {
     /**
-     * Must access current analytics object value via ref because its not stable
+     * Must access object value via ref because its not stable
      * and it can trigger useEffect to re-run below
      */
-    if (analyticsRef.current !== analytics) {
-      analyticsRef.current = analytics;
-    }
     if (statusRef.current !== linkStatus) {
       statusRef.current = linkStatus;
     }
@@ -76,66 +71,39 @@ const HoverCardContent = ({
     if (definitionIdRef.current !== definitionId) {
       definitionIdRef.current = definitionId;
     }
-  }, [analytics, linkStatus, fireEvent, definitionId]);
+  }, [linkStatus, fireEvent, definitionId]);
   useEffect(() => {
+    var _definitionIdRef$curr;
     const previewDisplay = 'card';
     const previewInvokeMethod = 'mouse_hover';
     const cardOpenTime = Date.now();
     const fireEventCurrent = fireEventRef.current;
-    if (fg('platform_migrate-some-ui-events-smart-card')) {
-      var _definitionIdRef$curr;
-      fireEventCurrent('ui.hoverCard.viewed', {
-        previewDisplay,
-        previewInvokeMethod,
-        definitionId: (_definitionIdRef$curr = definitionIdRef.current) !== null && _definitionIdRef$curr !== void 0 ? _definitionIdRef$curr : null
-      });
-    } else {
-      analyticsRef.current.ui.hoverCardViewedEvent({
+    fireEventCurrent('ui.hoverCard.viewed', {
+      previewDisplay,
+      previewInvokeMethod,
+      definitionId: (_definitionIdRef$curr = definitionIdRef.current) !== null && _definitionIdRef$curr !== void 0 ? _definitionIdRef$curr : null
+    });
+    return () => {
+      var _definitionIdRef$curr2;
+      const hoverTime = Date.now() - cardOpenTime;
+      fireEventCurrent('ui.hoverCard.dismissed', {
         previewDisplay,
         previewInvokeMethod,
-        status: statusRef.current
+        hoverTime,
+        definitionId: (_definitionIdRef$curr2 = definitionIdRef.current) !== null && _definitionIdRef$curr2 !== void 0 ? _definitionIdRef$curr2 : null
       });
-    }
-    return () => {
-      const hoverTime = Date.now() - cardOpenTime;
-      if (fg('platform_migrate-some-ui-events-smart-card')) {
-        var _definitionIdRef$curr2;
-        fireEventCurrent('ui.hoverCard.dismissed', {
-          previewDisplay,
-          previewInvokeMethod,
-          hoverTime,
-          definitionId: (_definitionIdRef$curr2 = definitionIdRef.current) !== null && _definitionIdRef$curr2 !== void 0 ? _definitionIdRef$curr2 : null
-        });
-      } else {
-        analyticsRef.current.ui.hoverCardDismissedEvent({
-          previewDisplay,
-          previewInvokeMethod,
-          hoverTime,
-          status: statusRef.current
-        });
-      }
     };
   }, []);
   const onClick = useCallback(event => {
     const isModifierKeyPressed = isSpecialEvent(event);
-    if (fg('platform_migrate-some-ui-events-smart-card')) {
-      fireEvent('ui.smartLink.clicked.titleGoToLink', {
-        id,
-        display: CardDisplay.HoverCardPreview,
-        isModifierKeyPressed,
-        definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
-      });
-    } else {
-      analytics.ui.cardClickedEvent({
-        id,
-        display: CardDisplay.HoverCardPreview,
-        status: cardState.status,
-        isModifierKeyPressed,
-        actionSubjectId: 'titleGoToLink'
-      });
-    }
+    fireEvent('ui.smartLink.clicked.titleGoToLink', {
+      id,
+      display: CardDisplay.HoverCardPreview,
+      isModifierKeyPressed,
+      definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
+    });
     fireLinkClickedEvent(createAnalyticsEvent)(event);
-  }, [createAnalyticsEvent, cardState.status, analytics.ui, id, fireEvent, definitionId]);
+  }, [createAnalyticsEvent, id, fireEvent, definitionId]);
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   const {
     subtitle

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

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

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

@@ -15,7 +15,8 @@ import { CardDisplay } from '../../constants';
 import { useSmartLinkAnalytics } from '../../state';
 import { failUfoExperience, startUfoExperience } from '../../state/analytics';
 import { SmartLinkModalProvider } from '../../state/modal';
-import { HoverCardComponent } from './components/HoverCardComponent';
+import { useSmartLinkAnalyticsContext } from '../../utils/analytics/SmartLinkAnalyticsContext';
+import { HOVER_CARD_SOURCE, HoverCardComponent } from './components/HoverCardComponent';
 const HoverCardWithErrorBoundary = props => {
   const {
     fireEvent
@@ -26,12 +27,19 @@ const HoverCardWithErrorBoundary = props => {
     children
   } = props;
   const analytics = useSmartLinkAnalytics(url, id);
+  const analyticsContext = useSmartLinkAnalyticsContext({
+    display: CardDisplay.HoverCardPreview,
+    id,
+    source: HOVER_CARD_SOURCE,
+    url
+  });
   const onError = useCallback((error, info) => {
     if (fg('platform-smart-card-migrate-embed-modal-analytics')) {
       startUfoExperience('smart-link-rendered', id || 'NULL');
       failUfoExperience('smart-link-rendered', id || 'NULL');
       failUfoExperience('smart-link-authenticated', id || 'NULL');
       fireEvent('ui.smartLink.renderFailed', {
+        ...(analyticsContext === null || analyticsContext === void 0 ? void 0 : analyticsContext.attributes),
         display: CardDisplay.HoverCardPreview,
         id: id !== null && id !== void 0 ? id : null,
         error: error,
@@ -45,7 +53,7 @@ const HoverCardWithErrorBoundary = props => {
         errorInfo: info
       });
     }
-  }, [analytics.ui, id, fireEvent]);
+  }, [analytics.ui, analyticsContext, id, fireEvent]);
   return jsx(ErrorBoundary, {
     fallback: children,
     onError: onError

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

@@ -10,7 +10,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "32.7.7",
+  packageVersion: "32.7.9",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');

package/dist/es2019/view/common/UnauthorisedViewContent.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl-next';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../common/analytics/generated/use-analytics-events';
 import { CONTENT_URL_3P_ACCOUNT_AUTH, CONTENT_URL_SECURITY_AND_PERMISSIONS } from '../../constants';
 import { messages } from '../../messages';
@@ -12,19 +11,14 @@ import { messages } from '../../messages';
 const UnauthorisedViewContent = ({
   providerName,
   isProductIntegrationSupported,
-  testId = 'unauthorised-view-content',
-  analytics
+  testId = 'unauthorised-view-content'
 }) => {
   const {
     fireEvent
   } = useAnalyticsEvents();
   const handleLearnMoreClick = useCallback(() => {
-    if (fg('platform_migrate-some-ui-events-smart-card')) {
-      fireEvent('ui.button.clicked.learnMore', {});
-    } else {
-      analytics === null || analytics === void 0 ? void 0 : analytics.ui.learnMoreClickedEvent();
-    }
-  }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, fireEvent]);
+    fireEvent('ui.button.clicked.learnMore', {});
+  }, [fireEvent]);
   const learnMoreMessage = isProductIntegrationSupported ? messages.learn_more_about_connecting_account : messages.learn_more_about_smart_links;
   return /*#__PURE__*/React.createElement(React.Fragment, null, providerName ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.connect_unauthorised_account_description, {
     values: {

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

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extractLink, extractPreview as extractPreviewData, extractProvider, extractTitle } from '@atlaskit/link-extractors';
 import { ActionName, CardAction } from '../../index';
-import { getDefinitionId, getExtensionKey, getResourceType } from '../../state/helpers';
+import { getExtensionKey } from '../../state/helpers';
 import { canShowAction } from '../../utils/actions/can-show-action';
 import { openEmbedModal } from '../../view/EmbedModal/utils';
 import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
@@ -27,6 +27,7 @@ export var extractInvokePreviewAction = function extractInvokePreviewAction(para
   var src = (_extractPreviewData = extractPreviewData(data, 'web')) === null || _extractPreviewData === void 0 ? void 0 : _extractPreviewData.src;
   if (src) {
     var url = extractLink(data);
+    var extensionKey = getExtensionKey(response);
     return {
       actionFn: function () {
         var _actionFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -36,7 +37,10 @@ export var extractInvokePreviewAction = function extractInvokePreviewAction(para
               case 0:
                 return _context.abrupt("return", openEmbedModal({
                   fireEvent: fireEvent,
+                  extensionKey: extensionKey,
+                  id: id,
                   invokeDownloadAction: extractInvokeDownloadAction(param),
+                  invokeViewAction: extractInvokeViewAction(param, true),
                   isSupportTheming: extractIsSupportTheming(meta),
                   isTrusted: extractIsTrusted(meta),
                   linkIcon: extractLinkIcon(response),
@@ -45,8 +49,7 @@ export var extractInvokePreviewAction = function extractInvokePreviewAction(para
                   origin: origin,
                   src: src,
                   title: extractTitle(data),
-                  url: url,
-                  invokeViewAction: extractInvokeViewAction(param, true)
+                  url: url
                 }));
               case 1:
               case "end":
@@ -61,11 +64,9 @@ export var extractInvokePreviewAction = function extractInvokePreviewAction(para
       }(),
       actionSubjectId: 'invokePreviewScreen',
       actionType: ActionName.PreviewAction,
-      definitionId: getDefinitionId(response),
       display: display,
-      extensionKey: getExtensionKey(response),
-      id: id,
-      resourceType: getResourceType(response)
+      extensionKey: extensionKey,
+      id: id
     };
   }
 };

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

@@ -4,7 +4,6 @@ import { useCallback, useMemo } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ACTION_RESOLVING, ACTION_UPDATE_METADATA_STATUS, cardAction } from '@atlaskit/linking-common';
 import { auth } from '@atlaskit/outbound-auth-flow-client';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../common/analytics/generated/use-analytics-events';
 import { SmartLinkStatus } from '../../constants';
 import { startUfoExperience } from '../analytics';
@@ -100,32 +99,16 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
     var services = getServices(details);
     // When authentication is triggered, let GAS know!
     if (status === 'unauthorized') {
-      if (fg('platform_migrate-some-ui-events-smart-card')) {
-        fireEvent('ui.button.clicked.connectAccount', {
-          display: appearance,
-          definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
-        });
-      } else {
-        analytics.ui.authEvent({
-          display: appearance,
-          definitionId: definitionId,
-          extensionKey: extensionKey
-        });
-      }
+      fireEvent('ui.button.clicked.connectAccount', {
+        display: appearance,
+        definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
+      });
     }
     if (status === 'forbidden') {
-      if (fg('platform_migrate-some-ui-events-smart-card')) {
-        fireEvent('ui.smartLink.clicked.tryAnotherAccount', {
-          display: appearance,
-          definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
-        });
-      } else {
-        analytics.ui.authAlternateAccountEvent({
-          display: appearance,
-          definitionId: definitionId,
-          extensionKey: extensionKey
-        });
-      }
+      fireEvent('ui.smartLink.clicked.tryAnotherAccount', {
+        display: appearance,
+        definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
+      });
     }
     if (services.length > 0) {
       fireEvent('screen.consentModal.viewed', {
@@ -154,23 +137,15 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
           reason: (_err$type = err.type) !== null && _err$type !== void 0 ? _err$type : null
         });
         if (err.type === 'auth_window_closed') {
-          if (fg('platform_migrate-some-ui-events-smart-card')) {
-            fireEvent('ui.consentModal.closed', {
-              display: appearance,
-              definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
-            });
-          } else {
-            analytics.ui.closedAuthEvent({
-              display: appearance,
-              definitionId: definitionId,
-              extensionKey: extensionKey
-            });
-          }
+          fireEvent('ui.consentModal.closed', {
+            display: appearance,
+            definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null
+          });
         }
         reload();
       });
     }
-  }, [getSmartLinkState, analytics.ui, id, reload, fireEvent]);
+  }, [getSmartLinkState, id, reload, fireEvent]);
   var invoke = useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(opts, appearance) {
       var key, action, source;