@atlaskit/smart-card 42.3.3 → 42.3.5

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

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useMemo } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../common/analytics/generated/use-analytics-events';
 import { InternalActionName, SmartLinkStatus } from '../../constants';
 import { FlexibleCardContext } from '../../state/flexible-ui-context';
@@ -8,6 +9,7 @@ import { useAISummaryConfig } from '../../state/hooks/use-ai-summary-config';
 import useResolve from '../../state/hooks/use-resolve';
 import Container from './components/container';
 import { getContextByStatus } from './utils';
+const PENDING_LINK_STATUSES = [SmartLinkStatus.Pending, SmartLinkStatus.Resolving];
 
 /**
  * This represents a Flexible Card: a link represented by a card with metadata.
@@ -18,6 +20,7 @@ import { getContextByStatus } from './utils';
 const FlexibleCard = ({
   appearance = 'flexible',
   cardState,
+  placeholderData,
   children,
   id,
   onAuthorize,
@@ -48,11 +51,15 @@ const FlexibleCard = ({
     details
   } = cardState;
   const status = cardType;
+  const shouldUsePlaceholderData = PENDING_LINK_STATUSES.includes(status) && placeholderData && fg('platform_initial_data_for_smart_cards');
+  // if we have placeholder data it means we can internally use it
+  // as resolved data until the actual data comes back as one of the final statuses
+  const contextStatus = shouldUsePlaceholderData ? SmartLinkStatus.Resolved : status;
   const context = useMemo(() => getContextByStatus({
     aiSummaryConfig,
     appearance,
     fireEvent,
-    response: details,
+    response: shouldUsePlaceholderData ? placeholderData.details : details,
     id,
     onAuthorize,
     onClick,
@@ -60,16 +67,16 @@ const FlexibleCard = ({
     renderers,
     resolve,
     actionOptions,
-    status,
+    status: shouldUsePlaceholderData ? contextStatus : status,
     url,
     isPreviewPanelAvailable,
     openPreviewPanel
-  }), [aiSummaryConfig, appearance, fireEvent, details, id, onAuthorize, onClick, origin, renderers, resolve, actionOptions, status, url, isPreviewPanelAvailable, openPreviewPanel]);
+  }), [aiSummaryConfig, appearance, fireEvent, shouldUsePlaceholderData, placeholderData === null || placeholderData === void 0 ? void 0 : placeholderData.details, details, id, onAuthorize, onClick, origin, renderers, resolve, actionOptions, contextStatus, status, url, isPreviewPanelAvailable, openPreviewPanel]);
   const flexibleCardContext = useMemo(() => ({
     data: context,
-    status,
+    status: fg('platform_initial_data_for_smart_cards') ? contextStatus : status,
     ui
-  }), [context, status, ui]);
+  }), [context, contextStatus, status, ui]);
   const {
     linkTitle
   } = context || {};

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

@@ -1,19 +1,15 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useCallback, useContext } from 'react';
+import React, { useCallback } from 'react';
 import { withErrorBoundary as withReactErrorBoundary } from 'react-error-boundary';
 import { injectIntl } from 'react-intl-next';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { SmartCardContext } from '../../../state';
 import { getFirstPartyIdentifier, getServices, getThirdPartyARI } from '../../../state/helpers';
 import useResolveHyperlink from '../../../state/hooks/use-resolve-hyperlink';
-import useResolveHyperlinkValidator, { isGoogleDomain, isSharePointDomain } from '../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator';
+import useResolveHyperlinkValidator from '../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator';
 import withIntlProvider from '../../common/intl-provider';
 import { useFire3PWorkflowsClickEvent } from '../../SmartLinkEvents/useSmartLinkEvents';
 import Hyperlink from '../Hyperlink';
-import withErrorBoundary from './error-boundary';
-import { ResolveHyperlink } from './resolve-hyperlink';
 import HyperlinkUnauthorizedView from './unauthorize-view';
 const HyperlinkFallbackComponent = () => null;
 const withValidator = (Component, DefaultComponent) => props => {
@@ -75,24 +71,4 @@ export const HyperlinkWithSmartLinkResolver = withReactErrorBoundary(withValidat
   enforceContext: false
 }), Hyperlink), {
   FallbackComponent: HyperlinkFallbackComponent
-});
-
-// Remove on navx-1834-refactor-resolved-hyperlink cleanup
-
-const HyperlinkResolver = ({
-  href
-}) => {
-  const hasSmartCardProvider = !!useContext(SmartCardContext);
-  const isSharePointResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
-  const isGoogleResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
-  const shouldResolveSharePoint = isSharePointDomain(href) && isSharePointResolveEnabled;
-  const shouldResolveGoogle = isGoogleDomain(href) && isGoogleResolveEnabled;
-  const shouldResolveHyperlink = hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
-  if (!shouldResolveHyperlink) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(ResolveHyperlink, {
-    href: href
-  });
-};
-export default withErrorBoundary(HyperlinkResolver);
+});

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

@@ -4,16 +4,15 @@ import { di } from 'react-magnetic-di';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
 import AKLink from '@atlaskit/link';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { withLinkClickedEvent } from '../../utils/analytics/click';
 import { LinkAnalyticsContext } from '../../utils/analytics/LinkAnalyticsContext';
 import Hyperlink from './Hyperlink';
-import HyperlinkResolver, { HyperlinkWithSmartLinkResolver } from './HyperlinkResolver';
+import { HyperlinkWithSmartLinkResolver } from './HyperlinkResolver';
 import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "0.0.0-development",
+  packageVersion: "42.3.4",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');
@@ -34,30 +33,28 @@ const LinkUrl = ({
     ...linkWarningModalProps
   } = useLinkWarningModal();
   const resolveHyperlinkFG = FeatureGates.checkGate('platform_editor_resolve_hyperlinks_killswitch');
-  if (fg('navx-1834-refactor-resolved-hyperlink')) {
-    if (resolveHyperlinkFG) {
-      const Link = enableResolve ? HyperlinkWithSmartLinkResolver : Hyperlink;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
-        url: href,
-        display: "url"
-      }, /*#__PURE__*/React.createElement(Link, _extends({
-        href: href,
-        isLinkComponent: isLinkComponent,
-        onClick: e => {
-          if (!checkSafety) {
-            onClick && onClick(e);
-            return;
-          }
+  if (resolveHyperlinkFG) {
+    const Link = enableResolve ? HyperlinkWithSmartLinkResolver : Hyperlink;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
+      url: href,
+      display: "url"
+    }, /*#__PURE__*/React.createElement(Link, _extends({
+      href: href,
+      isLinkComponent: isLinkComponent,
+      onClick: e => {
+        if (!checkSafety) {
+          onClick && onClick(e);
+          return;
+        }
 
-          // Only call the onClick if the link is safe
-          if (isLinkSafe(e, href)) {
-            onClick && onClick(e);
-          } else {
-            showSafetyWarningModal(e, href);
-          }
+        // Only call the onClick if the link is safe
+        if (isLinkSafe(e, href)) {
+          onClick && onClick(e);
+        } else {
+          showSafetyWarningModal(e, href);
         }
-      }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
-    }
+      }
+    }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
   }
   const Link = isLinkComponent ? LinkComponent : Anchor;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
@@ -82,8 +79,6 @@ const LinkUrl = ({
         showSafetyWarningModal(e, href);
       }
     }
-  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && !fg('navx-1834-refactor-resolved-hyperlink') && /*#__PURE__*/React.createElement(HyperlinkResolver, {
-    href: href
-  }));
+  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
 };
 export default withAnalyticsContext(PACKAGE_DATA)(LinkUrl);

package/dist/esm/messages.js

@@ -794,11 +794,6 @@ export var messages = defineMessages({
     defaultMessage: 'Follow to get notifications on this space',
     description: 'Description on what Follow does'
   },
-  follow_projectGalaxia: {
-    id: 'fabric.linking.follow_project-galaxia',
-    defaultMessage: 'Follow space',
-    description: 'Click to follow a project.'
-  },
   follow_project_errorGalaxia: {
     id: 'fabric.linking.follow_project_error-galaxia',
     defaultMessage: 'We encountered an error while trying to follow the space. Check your connection or refresh the page and try again.',
@@ -809,11 +804,6 @@ export var messages = defineMessages({
     defaultMessage: 'Unfollow to stop receiving space notifications',
     description: 'Description on what Unfollow does'
   },
-  unfollow_projectGalaxia: {
-    id: 'fabric.linking.unfollow_project-galaxia',
-    defaultMessage: 'Unfollow space',
-    description: 'Click to unfollow a project.'
-  },
   unfollow_project_errorGalaxia: {
     id: 'fabric.linking.unfollow_project_error-galaxia',
     defaultMessage: 'We encountered an error while trying to unfollow the space. Check your connection or refresh the page and try again.',

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

@@ -4,14 +4,13 @@ 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';
 import { getByDefinitionId, getDefinitionId, getExtensionKey, getServices } from '../helpers';
 import useInvokeClientAction from '../hooks/use-invoke-client-action';
 import useResolve from '../hooks/use-resolve';
-export var useSmartCardActions = function useSmartCardActions(id, url, placeholderData) {
+export var useSmartCardActions = function useSmartCardActions(id, url) {
   var resolveUrl = useResolve();
   var invokeClientAction = useInvokeClientAction({});
   var _useAnalyticsEvents = useAnalyticsEvents(),
@@ -21,9 +20,8 @@ export var useSmartCardActions = function useSmartCardActions(id, url, placehold
   var getState = store.getState,
     dispatch = store.dispatch;
   var getSmartLinkState = useCallback(function () {
-    var _ref2, _getState$url;
-    var placeholderObject = fg('platform_initial_data_for_smart_cards') ? placeholderData : undefined;
-    var _ref = (_ref2 = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : placeholderObject) !== null && _ref2 !== void 0 ? _ref2 : {
+    var _getState$url;
+    var _ref = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : {
         status: SmartLinkStatus.Pending
       },
       details = _ref.details,
@@ -34,7 +32,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, placehold
       status: status,
       metadataStatus: metadataStatus
     };
-  }, [getState, url, placeholderData]);
+  }, [getState, url]);
   var setMetadataStatus = useCallback(function (metadataStatus) {
     dispatch(cardAction(ACTION_UPDATE_METADATA_STATUS, {
       url: url
@@ -147,7 +145,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, placehold
     }
   }, [getSmartLinkState, id, reload, fireEvent]);
   var invoke = useCallback( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(opts, appearance) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(opts, appearance) {
       var key, action, source;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -174,7 +172,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, placehold
       }, _callee2);
     }));
     return function (_x, _x2) {
-      return _ref4.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }(), [invokeClientAction]);
   return useMemo(function () {

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

@@ -5,13 +5,13 @@ import { useSmartCardActions as useSmartLinkActions } from '../actions';
 import { useSmartLinkConfig } from '../config';
 import { useSmartLinkRenderers } from '../renderers';
 import { useSmartCardState as useSmartLinkState } from '../store';
-export function useSmartLink(id, url, placeholderData) {
-  var state = useSmartLinkState(url, placeholderData);
+export function useSmartLink(id, url) {
+  var state = useSmartLinkState(url);
   var _useSmartLinkContext = useSmartLinkContext(),
     store = _useSmartLinkContext.store,
     isPreviewPanelAvailable = _useSmartLinkContext.isPreviewPanelAvailable,
     openPreviewPanel = _useSmartLinkContext.openPreviewPanel;
-  var actions = useSmartLinkActions(id, url, placeholderData);
+  var actions = useSmartLinkActions(id, url);
   var config = useSmartLinkConfig();
   var renderers = useSmartLinkRenderers();
 

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

@@ -1,17 +1,13 @@
 import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 var PENDING_STATE = {
   status: 'pending'
 };
-export function useSmartCardState(url, placeholderData) {
+export function useSmartCardState(url) {
   var _useSmartLinkContext = useSmartLinkContext(),
     store = _useSmartLinkContext.store;
   var cardState = useSyncExternalStoreWithSelector(store.subscribe, store.getState, store.getState, function (state) {
     return state[url];
   });
-  if (fg('platform_initial_data_for_smart_cards')) {
-    return (cardState === null || cardState === void 0 ? void 0 : cardState.status) !== 'resolved' && placeholderData ? placeholderData : cardState !== null && cardState !== void 0 ? cardState : PENDING_STATE;
-  }
   return cardState !== null && cardState !== void 0 ? cardState : PENDING_STATE;
 }

package/dist/esm/utils/analytics/analytics.js

@@ -4,7 +4,7 @@ export var ANALYTICS_CHANNEL = 'media';
 export var context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "0.0.0-development"
+  packageVersion: "42.3.4"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -58,22 +58,9 @@ function Component(_ref) {
   var isFlexibleUi = useMemo(function () {
     return isFlexibleUiCard(children, ui);
   }, [children, ui]);
-  var structuredPlaceholderData = fg('platform_initial_data_for_smart_cards') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useMemo(function () {
-    // execute some basic validation logic to ensure we should consider using placeholder data
-    if (appearance === 'inline' && isValidPlaceholderData(placeholderData)) {
-      var data = {
-        status: 'resolved',
-        metadataStatus: undefined,
-        details: placeholderData
-      };
-      return data;
-    }
-  }, [appearance, placeholderData]) : undefined;
 
   // Get state, actions for this card.
-  var _useSmartLink = useSmartLink(id, url, fg('platform_initial_data_for_smart_cards') ? structuredPlaceholderData : undefined),
+  var _useSmartLink = useSmartLink(id, url),
     state = _useSmartLink.state,
     actions = _useSmartLink.actions,
     config = _useSmartLink.config,
@@ -233,6 +220,19 @@ function Component(_ref) {
       display: isFlexibleUi ? 'flexible' : appearance
     });
   }, [id, appearance, definitionId, isFlexibleUi, fireEvent]);
+  var structuredPlaceholderData = fg('platform_initial_data_for_smart_cards') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useMemo(function () {
+    // execute some basic validation logic to ensure we should consider using placeholder data
+    if (isFlexibleUi && isValidPlaceholderData(placeholderData)) {
+      var data = {
+        status: 'resolved',
+        metadataStatus: undefined,
+        details: placeholderData
+      };
+      return data;
+    }
+  }, [isFlexibleUi, placeholderData]) : undefined;
   if (isFlexibleUi) {
     var cardState = state;
     if (error) {
@@ -247,6 +247,7 @@ function Component(_ref) {
     return /*#__PURE__*/React.createElement(FlexibleCard, {
       id: id,
       cardState: cardState,
+      placeholderData: fg('platform_initial_data_for_smart_cards') ? structuredPlaceholderData : undefined,
       onAuthorize: services.length && handleAuthorize || undefined,
       onClick: handleClickWrapper,
       origin: "smartLinkCard",

package/dist/esm/view/FlexibleCard/components/actions/follow-action/index.js

@@ -47,7 +47,7 @@ var FollowAction = function FollowAction(props) {
     data = _objectWithoutProperties(actionData, _excluded);
   var isStackItem = props.as === 'stack-item';
   var message = value ? messages.follow : messages.unfollow;
-  var projectMessage = value ? FeatureGates.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? messages.follow_projectGalaxia : messages.follow_project : FeatureGates.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? messages.unfollow_projectGalaxia : messages.unfollow_project;
+  var projectMessage = value ? messages.follow_project : messages.unfollow_project;
   var goalMessage = value ? messages.follow_goal : messages.unfollow_goal;
   var stackMessage = isProject ? projectMessage : goalMessage;
   var label = isStackItem ? stackMessage : message;

package/dist/esm/view/FlexibleCard/index.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useMemo } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../common/analytics/generated/use-analytics-events';
 import { InternalActionName, SmartLinkStatus } from '../../constants';
 import { FlexibleCardContext } from '../../state/flexible-ui-context';
@@ -8,6 +9,7 @@ import { useAISummaryConfig } from '../../state/hooks/use-ai-summary-config';
 import useResolve from '../../state/hooks/use-resolve';
 import Container from './components/container';
 import { getContextByStatus } from './utils';
+var PENDING_LINK_STATUSES = [SmartLinkStatus.Pending, SmartLinkStatus.Resolving];
 
 /**
  * This represents a Flexible Card: a link represented by a card with metadata.
@@ -20,6 +22,7 @@ var FlexibleCard = function FlexibleCard(_ref) {
   var _ref$appearance = _ref.appearance,
     appearance = _ref$appearance === void 0 ? 'flexible' : _ref$appearance,
     cardState = _ref.cardState,
+    placeholderData = _ref.placeholderData,
     children = _ref.children,
     id = _ref.id,
     onAuthorize = _ref.onAuthorize,
@@ -44,12 +47,16 @@ var FlexibleCard = function FlexibleCard(_ref) {
   var cardType = cardState.status,
     details = cardState.details;
   var status = cardType;
+  var shouldUsePlaceholderData = PENDING_LINK_STATUSES.includes(status) && placeholderData && fg('platform_initial_data_for_smart_cards');
+  // if we have placeholder data it means we can internally use it
+  // as resolved data until the actual data comes back as one of the final statuses
+  var contextStatus = shouldUsePlaceholderData ? SmartLinkStatus.Resolved : status;
   var context = useMemo(function () {
     return getContextByStatus({
       aiSummaryConfig: aiSummaryConfig,
       appearance: appearance,
       fireEvent: fireEvent,
-      response: details,
+      response: shouldUsePlaceholderData ? placeholderData.details : details,
       id: id,
       onAuthorize: onAuthorize,
       onClick: onClick,
@@ -57,19 +64,19 @@ var FlexibleCard = function FlexibleCard(_ref) {
       renderers: renderers,
       resolve: resolve,
       actionOptions: actionOptions,
-      status: status,
+      status: shouldUsePlaceholderData ? contextStatus : status,
       url: url,
       isPreviewPanelAvailable: isPreviewPanelAvailable,
       openPreviewPanel: openPreviewPanel
     });
-  }, [aiSummaryConfig, appearance, fireEvent, details, id, onAuthorize, onClick, origin, renderers, resolve, actionOptions, status, url, isPreviewPanelAvailable, openPreviewPanel]);
+  }, [aiSummaryConfig, appearance, fireEvent, shouldUsePlaceholderData, placeholderData === null || placeholderData === void 0 ? void 0 : placeholderData.details, details, id, onAuthorize, onClick, origin, renderers, resolve, actionOptions, contextStatus, status, url, isPreviewPanelAvailable, openPreviewPanel]);
   var flexibleCardContext = useMemo(function () {
     return {
       data: context,
-      status: status,
+      status: fg('platform_initial_data_for_smart_cards') ? contextStatus : status,
       ui: ui
     };
-  }, [context, status, ui]);
+  }, [context, contextStatus, status, ui]);
   var _ref2 = context || {},
     linkTitle = _ref2.linkTitle;
   var title = linkTitle === null || linkTitle === void 0 ? void 0 : linkTitle.text;

package/dist/esm/view/LinkUrl/HyperlinkResolver/index.js

@@ -1,21 +1,17 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["onClick"];
-import React, { useCallback, useContext } from 'react';
+import React, { useCallback } from 'react';
 import { withErrorBoundary as withReactErrorBoundary } from 'react-error-boundary';
 import { injectIntl } from 'react-intl-next';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { SmartCardContext } from '../../../state';
 import { getFirstPartyIdentifier, getServices, getThirdPartyARI } from '../../../state/helpers';
 import useResolveHyperlink from '../../../state/hooks/use-resolve-hyperlink';
-import useResolveHyperlinkValidator, { isGoogleDomain, isSharePointDomain } from '../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator';
+import useResolveHyperlinkValidator from '../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator';
 import withIntlProvider from '../../common/intl-provider';
 import { useFire3PWorkflowsClickEvent } from '../../SmartLinkEvents/useSmartLinkEvents';
 import Hyperlink from '../Hyperlink';
-import withErrorBoundary from './error-boundary';
-import { ResolveHyperlink } from './resolve-hyperlink';
 import HyperlinkUnauthorizedView from './unauthorize-view';
 var HyperlinkFallbackComponent = function HyperlinkFallbackComponent() {
   return null;
@@ -82,23 +78,4 @@ export var HyperlinkWithSmartLinkResolver = withReactErrorBoundary(withValidator
   enforceContext: false
 }), Hyperlink), {
   FallbackComponent: HyperlinkFallbackComponent
-});
-
-// Remove on navx-1834-refactor-resolved-hyperlink cleanup
-
-var HyperlinkResolver = function HyperlinkResolver(_ref2) {
-  var href = _ref2.href;
-  var hasSmartCardProvider = !!useContext(SmartCardContext);
-  var isSharePointResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
-  var isGoogleResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
-  var shouldResolveSharePoint = isSharePointDomain(href) && isSharePointResolveEnabled;
-  var shouldResolveGoogle = isGoogleDomain(href) && isGoogleResolveEnabled;
-  var shouldResolveHyperlink = hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
-  if (!shouldResolveHyperlink) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(ResolveHyperlink, {
-    href: href
-  });
-};
-export default withErrorBoundary(HyperlinkResolver);
+});

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

@@ -7,16 +7,15 @@ import { di } from 'react-magnetic-di';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
 import AKLink from '@atlaskit/link';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { withLinkClickedEvent } from '../../utils/analytics/click';
 import { LinkAnalyticsContext } from '../../utils/analytics/LinkAnalyticsContext';
 import Hyperlink from './Hyperlink';
-import HyperlinkResolver, { HyperlinkWithSmartLinkResolver } from './HyperlinkResolver';
+import { HyperlinkWithSmartLinkResolver } from './HyperlinkResolver';
 import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "0.0.0-development",
+  packageVersion: "42.3.4",
   componentName: 'linkUrl'
 };
 var Anchor = withLinkClickedEvent('a');
@@ -39,30 +38,28 @@ var LinkUrl = function LinkUrl(_ref) {
     showSafetyWarningModal = _useLinkWarningModal.showSafetyWarningModal,
     linkWarningModalProps = _objectWithoutProperties(_useLinkWarningModal, _excluded2);
   var resolveHyperlinkFG = FeatureGates.checkGate('platform_editor_resolve_hyperlinks_killswitch');
-  if (fg('navx-1834-refactor-resolved-hyperlink')) {
-    if (resolveHyperlinkFG) {
-      var _Link = enableResolve ? HyperlinkWithSmartLinkResolver : Hyperlink;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
-        url: href,
-        display: "url"
-      }, /*#__PURE__*/React.createElement(_Link, _extends({
-        href: href,
-        isLinkComponent: isLinkComponent,
-        onClick: function onClick(e) {
-          if (!checkSafety) {
-            _onClick && _onClick(e);
-            return;
-          }
+  if (resolveHyperlinkFG) {
+    var _Link = enableResolve ? HyperlinkWithSmartLinkResolver : Hyperlink;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
+      url: href,
+      display: "url"
+    }, /*#__PURE__*/React.createElement(_Link, _extends({
+      href: href,
+      isLinkComponent: isLinkComponent,
+      onClick: function onClick(e) {
+        if (!checkSafety) {
+          _onClick && _onClick(e);
+          return;
+        }
 
-          // Only call the onClick if the link is safe
-          if (isLinkSafe(e, href)) {
-            _onClick && _onClick(e);
-          } else {
-            showSafetyWarningModal(e, href);
-          }
+        // Only call the onClick if the link is safe
+        if (isLinkSafe(e, href)) {
+          _onClick && _onClick(e);
+        } else {
+          showSafetyWarningModal(e, href);
         }
-      }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
-    }
+      }
+    }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
   }
   var Link = isLinkComponent ? LinkComponent : Anchor;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
@@ -87,8 +84,6 @@ var LinkUrl = function LinkUrl(_ref) {
         showSafetyWarningModal(e, href);
       }
     }
-  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && !fg('navx-1834-refactor-resolved-hyperlink') && /*#__PURE__*/React.createElement(HyperlinkResolver, {
-    href: href
-  }));
+  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
 };
 export default withAnalyticsContext(PACKAGE_DATA)(LinkUrl);

package/dist/types/messages.d.ts

@@ -1,6 +1,6 @@
 import { type MessageDescriptor } from 'react-intl-next';
 export type RequestAccessMessageKey = 'click_to_join' | 'click_to_join_description' | 'forbidden_description' | 'request_access' | 'request_access_description' | 'request_access_pending' | 'request_access_pending_title' | 'request_access_pending_description' | 'request_denied_description' | 'default_no_access_title' | 'direct_access_title' | 'direct_access_description' | 'direct_access' | 'access_exists_description' | 'not_found_description' | 'not_found_title';
-export type MessageKey = 'assigned_to' | 'ai_summarize' | 'ai_summarized' | 'ai_summarized_abbreviation' | 'ai_summarized_info' | 'ai_summarized_info_short' | 'ai_summarizing' | 'ai_summary_error_generic' | 'ai_summary_error_acceptable_use_violation' | 'ai_summary_error_hipaa_content_detected' | 'ai_summary_error_exceeding_context_length_error' | 'ai_summary_action' | 'ai_summary_action_description' | 'automation_action_title' | 'automation_action_tooltip' | 'automation_action_icon_label' | 'automation_action_confluence_page_modal_title' | 'automation_action_confluence_page_modal_description' | 'copy_summary_action' | 'copy_summary_action_description' | 'copied_summary_action_description' | 'beta' | 'cannot_find_link' | 'compass_applied_components_count' | 'connect_link_account_card' | 'connect_link_account_card_name' | 'connect_link_account_card_description' | 'connect_unauthorised_account_action' | 'connect_unauthorised_account_description' | 'connect_unauthorised_account_description_no_provider' | 'continue' | 'copy_url_to_clipboard' | 'copied_url_to_clipboard' | 'could_not_load_link' | 'download' | 'download_description' | 'download_file' | 'follow' | 'follow_project_description' | 'follow_project_descriptionGalaxia' | 'follow_project' | 'follow_projectGalaxia' | 'follow_goal' | 'follow_goal_description' | 'follow_project_error' | 'follow_project_errorGalaxia' | 'follow_goal_error' | 'go_back' | 'invalid_permissions' | 'invalid_permissions_description' | 'join_to_view' | 'connect_link_account' | 'created_by' | 'created_on_relative' | 'created_on_absolute' | 'check_this_link' | 'delete' | 'edit' | 'learn_more_about_smart_links' | 'learn_more_about_connecting_account' | 'loading' | 'link_safety_warning_message' | 'modified_by' | 'modified_on_relative' | 'modified_on_absolute' | 'more_actions' | 'not_found_title' | 'not_found_description' | 'open_issue_in_jira' | 'open_link_in_a_new_tab' | 'owned_by' | 'owned_by_override' | 'preview_description' | 'preview_improved' | 'preview_modal' | 'preview_panel' | 'preview_close' | 'preview_max_size' | 'preview_min_size' | 'priority_blocker' | 'priority_critical' | 'priority_high' | 'priority_highest' | 'priority_low' | 'priority_lowest' | 'priority_major' | 'priority_medium' | 'priority_minor' | 'priority_trivial' | 'priority_undefined' | 'forbidden_access' | 'pending_request' | 'read_time' | 'restricted_link' | 'request_access_to_view' | 'request_denied' | 'sent_on_relative' | 'sent_on_absolute' | 'status_change_load_error' | 'status_change_permission_error' | 'status_change_update_error' | 'try_again' | 'try_another_account' | 'unauthorised_account_description' | 'unauthorised_account_description_no_provider' | 'unauthorised_account_name' | 'unauthorised_account_name_no_provider' | 'unassigned' | 'unfollow' | 'unfollow_project_description' | 'unfollow_project_descriptionGalaxia' | 'unfollow_projectGalaxia' | 'unfollow_project' | 'unfollow_projectGalaxia' | 'unfollow_project_error' | 'unfollow_project_errorGalaxia' | 'unfollow_goal' | 'unfollow_goal_description' | 'unfollow_goal_error' | 'user_attributes' | 'view' | 'viewIn' | 'viewOriginal' | 'actions' | 'add_account' | 'cancel' | 'close' | 'connect_to' | 'connect_account_description' | 'retry' | 'save' | 'unlink_account' | RequestAccessMessageKey | 'related' | 'generic_error_message' | 'related_links_modal_error_title' | 'related_links_modal_error_description' | 'related_links_modal_unavailable_title' | 'related_links_modal_unavailable_description' | 'related_links_modal_title' | 'related_links_view_related_urls' | 'related_links_view_related_links' | 'related_links_found_in' | 'related_links_includes_links_to' | 'related_links_not_found' | 'join_to_viewIssueTermRefresh' | 'open_issue_in_jiraIssueTermRefresh' | 'request_access_to_viewIssueTermRefresh' | 'team_members_count' | 'status_change_permission_errorIssueTermRefresh' | 'connect_unauthorised_account_description_appify' | 'connect_unauthorised_account_description_no_provider_appify' | 'learn_more_about_connecting_account_appify';
+export type MessageKey = 'assigned_to' | 'ai_summarize' | 'ai_summarized' | 'ai_summarized_abbreviation' | 'ai_summarized_info' | 'ai_summarized_info_short' | 'ai_summarizing' | 'ai_summary_error_generic' | 'ai_summary_error_acceptable_use_violation' | 'ai_summary_error_hipaa_content_detected' | 'ai_summary_error_exceeding_context_length_error' | 'ai_summary_action' | 'ai_summary_action_description' | 'automation_action_title' | 'automation_action_tooltip' | 'automation_action_icon_label' | 'automation_action_confluence_page_modal_title' | 'automation_action_confluence_page_modal_description' | 'copy_summary_action' | 'copy_summary_action_description' | 'copied_summary_action_description' | 'beta' | 'cannot_find_link' | 'compass_applied_components_count' | 'connect_link_account_card' | 'connect_link_account_card_name' | 'connect_link_account_card_description' | 'connect_unauthorised_account_action' | 'connect_unauthorised_account_description' | 'connect_unauthorised_account_description_no_provider' | 'continue' | 'copy_url_to_clipboard' | 'copied_url_to_clipboard' | 'could_not_load_link' | 'download' | 'download_description' | 'download_file' | 'follow' | 'follow_project_description' | 'follow_project_descriptionGalaxia' | 'follow_project' | 'follow_goal' | 'follow_goal_description' | 'follow_project_error' | 'follow_project_errorGalaxia' | 'follow_goal_error' | 'go_back' | 'invalid_permissions' | 'invalid_permissions_description' | 'join_to_view' | 'connect_link_account' | 'created_by' | 'created_on_relative' | 'created_on_absolute' | 'check_this_link' | 'delete' | 'edit' | 'learn_more_about_smart_links' | 'learn_more_about_connecting_account' | 'loading' | 'link_safety_warning_message' | 'modified_by' | 'modified_on_relative' | 'modified_on_absolute' | 'more_actions' | 'not_found_title' | 'not_found_description' | 'open_issue_in_jira' | 'open_link_in_a_new_tab' | 'owned_by' | 'owned_by_override' | 'preview_description' | 'preview_improved' | 'preview_modal' | 'preview_panel' | 'preview_close' | 'preview_max_size' | 'preview_min_size' | 'priority_blocker' | 'priority_critical' | 'priority_high' | 'priority_highest' | 'priority_low' | 'priority_lowest' | 'priority_major' | 'priority_medium' | 'priority_minor' | 'priority_trivial' | 'priority_undefined' | 'forbidden_access' | 'pending_request' | 'read_time' | 'restricted_link' | 'request_access_to_view' | 'request_denied' | 'sent_on_relative' | 'sent_on_absolute' | 'status_change_load_error' | 'status_change_permission_error' | 'status_change_update_error' | 'try_again' | 'try_another_account' | 'unauthorised_account_description' | 'unauthorised_account_description_no_provider' | 'unauthorised_account_name' | 'unauthorised_account_name_no_provider' | 'unassigned' | 'unfollow' | 'unfollow_project_description' | 'unfollow_project_descriptionGalaxia' | 'unfollow_project' | 'unfollow_project_error' | 'unfollow_project_errorGalaxia' | 'unfollow_goal' | 'unfollow_goal_description' | 'unfollow_goal_error' | 'user_attributes' | 'view' | 'viewIn' | 'viewOriginal' | 'actions' | 'add_account' | 'cancel' | 'close' | 'connect_to' | 'connect_account_description' | 'retry' | 'save' | 'unlink_account' | RequestAccessMessageKey | 'related' | 'generic_error_message' | 'related_links_modal_error_title' | 'related_links_modal_error_description' | 'related_links_modal_unavailable_title' | 'related_links_modal_unavailable_description' | 'related_links_modal_title' | 'related_links_view_related_urls' | 'related_links_view_related_links' | 'related_links_found_in' | 'related_links_includes_links_to' | 'related_links_not_found' | 'join_to_viewIssueTermRefresh' | 'open_issue_in_jiraIssueTermRefresh' | 'request_access_to_viewIssueTermRefresh' | 'team_members_count' | 'status_change_permission_errorIssueTermRefresh' | 'connect_unauthorised_account_description_appify' | 'connect_unauthorised_account_description_no_provider_appify' | 'learn_more_about_connecting_account_appify';
 type Messages = {
     [K in MessageKey]: MessageDescriptor;
 };

package/dist/types/state/actions/index.d.ts

@@ -1,8 +1,7 @@
 import { type JsonLd } from '@atlaskit/json-ld-types';
-import { type CardState } from '@atlaskit/linking-common';
 import { type InvokeClientOpts, type InvokeServerOpts } from '../../model/invoke-opts';
 import { type CardInnerAppearance } from '../../view/Card/types';
-export declare const useSmartCardActions: (id: string, url: string, placeholderData?: CardState) => {
+export declare const useSmartCardActions: (id: string, url: string) => {
     register: () => Promise<void>;
     reload: () => void;
     authorize: (appearance: CardInnerAppearance) => void;

package/dist/types/state/hooks/useSmartLink.d.ts

@@ -1,6 +1,5 @@
-import type { CardState } from '@atlaskit/linking-common';
-export declare function useSmartLink(id: string, url: string, placeholderData?: CardState): {
-    state: CardState;
+export declare function useSmartLink(id: string, url: string): {
+    state: import("@atlaskit/linking-common").CardState;
     actions: {
         register: () => Promise<void>;
         reload: () => void;

package/dist/types/state/store/index.d.ts

@@ -1,3 +1,3 @@
 import { type CardState } from '@atlaskit/linking-common';
 export type { CardType } from '@atlaskit/linking-common';
-export declare function useSmartCardState(url: string, placeholderData?: CardState): CardState;
+export declare function useSmartCardState(url: string): CardState;