@atlaskit/smart-card 26.57.1 → 26.57.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/smart-card
 
+## 26.57.3
+
+### Patch Changes
+
+- [#93402](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/93402) [`a76cfc6ce93f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a76cfc6ce93f) - Hover preview redesign: Remove second metadata block
+
+## 26.57.2
+
+### Patch Changes
+
+- [#92944](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92944) [`1d66db78c1c9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1d66db78c1c9) - Refactor hover card metadata function
+- Updated dependencies
+
 ## 26.57.1
 
 ### Patch Changes

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

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

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

@@ -15,7 +15,6 @@ var _copy = _interopRequireDefault(require("@atlaskit/icon/glyph/copy"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _linkProvider = require("@atlaskit/link-provider");
 var _constants = require("../../../constants");
-var _extractMetadata2 = require("../../../extractors/hover/extractMetadata");
 var _analytics2 = require("../../../state/analytics");
 var _helpers = require("../../../state/helpers");
 var _utils = require("../../../utils");
@@ -144,8 +143,8 @@ var HoverCardContent = function HoverCardContent(_ref) {
     return [getCopyAction(url)];
   }, [url]);
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
-  var _extractMetadata = (0, _extractMetadata2.extractMetadata)((0, _utils2.getSimulatedMetadata)(extensionKey, data)),
-    subtitle = _extractMetadata.subtitle;
+  var _getMetadata = (0, _utils2.getMetadata)(extensionKey, data),
+    subtitle = _getMetadata.subtitle;
   var titleMaxLines = subtitle && subtitle.length > 0 ? 1 : 2;
   var titleBlockProps = {
     actions: (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.hover-card-action-redesign') ? undefined : titleActions,

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

@@ -15,7 +15,6 @@ var _styled = require("./styled");
 var _FlexibleCard = _interopRequireDefault(require("../../../../FlexibleCard"));
 var _utils = require("../../../utils");
 var _ImagePreview = _interopRequireDefault(require("../../ImagePreview"));
-var _extractMetadata = require("../../../../../extractors/hover/extractMetadata");
 var _messages = require("../../../../../messages");
 var _reactIntlNext = require("react-intl-next");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -84,7 +83,7 @@ var ConnectedAIBlock = function ConnectedAIBlock(_ref) {
   return showData ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !imagePreview && /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, {
     testId: 'connected-AI',
     status: _constants.SmartLinkStatus.Resolved
-  }), /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
+  }), !(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.hover-card-action-redesign') && /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
     primary: bottomPrimary,
     size: _constants.SmartLinkSize.Large,
     overrideCss: _styled.metadataBlockCss,
@@ -119,16 +118,11 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
   }, [cardActions, onActionClick]);
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   var _useMemo = (0, _react.useMemo)(function () {
-      var betterMetadata = (0, _utils.getSimulatedBetterMetadata)(extensionKey, data);
-      return {
-        topPrimary: (0, _extractMetadata.elementNamesToItems)(betterMetadata.topMetadataBlock.primary),
-        topSecondary: (0, _extractMetadata.elementNamesToItems)(betterMetadata.topMetadataBlock.secondary),
-        bottomPrimary: (0, _extractMetadata.elementNamesToItems)(betterMetadata.bottomMetadataBlock.primary)
-      };
+      return (0, _utils.getMetadata)(extensionKey, data);
     }, [data, extensionKey]),
-    topPrimary = _useMemo.topPrimary,
-    topSecondary = _useMemo.topSecondary,
-    bottomPrimary = _useMemo.bottomPrimary;
+    primary = _useMemo.primary,
+    secondary = _useMemo.secondary,
+    tertiary = _useMemo.tertiary;
   var snippetHeight = _react.default.useRef(0);
   var snippetBlockRef = (0, _react.useRef)(null);
   var onSnippetRender = (0, _react.useCallback)(function () {
@@ -152,8 +146,8 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
   return /*#__PURE__*/_react.default.createElement(_FlexibleCard.default, flexibleCardProps, imagePreview, /*#__PURE__*/_react.default.createElement(_blocks.TitleBlock, (0, _extends2.default)({}, titleBlockProps, {
     metadataPosition: _constants.SmartLinkPosition.Top
   })), /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
-    primary: topPrimary,
-    secondary: topSecondary,
+    primary: primary,
+    secondary: secondary,
     overrideCss: _styled.metadataBlockCss,
     maxLines: 1,
     size: _constants.SmartLinkSize.Medium
@@ -167,7 +161,7 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
     blockRef: connectedAIBlockRef
   }, /*#__PURE__*/_react.default.createElement(ConnectedAIBlock, {
     imagePreview: !!imagePreview,
-    bottomPrimary: bottomPrimary,
+    bottomPrimary: tertiary,
     data: data
   })), !isAISummaryEnabled && !imagePreview && /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, {
     status: _constants.SmartLinkStatus.Resolved
@@ -176,8 +170,8 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
     onRender: onSnippetRender,
     blockRef: snippetBlockRef,
     overrideCss: _styled.hiddenSnippetStyles
-  }), !isAISummaryEnabled && /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
-    primary: bottomPrimary,
+  }), !isAISummaryEnabled && !isActionBlockEnabled && /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
+    primary: tertiary,
     size: _constants.SmartLinkSize.Large,
     overrideCss: _styled.metadataBlockCss,
     maxLines: 1,

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSimulatedMetadata = exports.getSimulatedBetterMetadata = void 0;
+exports.getMetadata = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _constants = require("../../constants");
 var _linkExtractors = require("@atlaskit/link-extractors");
@@ -12,197 +12,98 @@ var _utils = require("../../extractors/flexible/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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 getSimulatedMetadata = exports.getSimulatedMetadata = function getSimulatedMetadata() {
-  var extensionKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var data = arguments.length > 1 ? arguments[1] : undefined;
+var getSimulatedBetterMetadata = function getSimulatedBetterMetadata(extensionKey, data) {
+  var _data$Type$includes, _data$Type;
   var types = data ? (0, _linkExtractors.extractType)(data) : undefined;
+  var defaultMetadata = {
+    primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn]
+  };
   switch (extensionKey) {
     case 'bitbucket-object-provider':
     case 'native-bitbucket-object-provider':
       if (types !== null && types !== void 0 && types.includes('atlassian:SourceCodePullRequest')) {
         return {
-          metadata: {
-            primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.SubscriberCount, _constants.ElementName.State],
-            secondary: [],
-            subtitle: [_constants.ElementName.SourceBranch, _constants.ElementName.TargetBranch]
-          }
+          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.SubscriberCount, _constants.ElementName.State],
+          subtitle: [_constants.ElementName.SourceBranch, _constants.ElementName.TargetBranch]
         };
       }
-      return {
-        metadata: {
-          primary: [_constants.ElementName.ModifiedOn, _constants.ElementName.CreatedBy],
-          secondary: [],
-          subtitle: []
-        }
-      };
-    case 'confluence-object-provider':
-      var primaryAttribution = data && (0, _utils.extractOwnedBy)(data) ? _constants.ElementName.OwnedBy : _constants.ElementName.CreatedBy;
-      return {
-        metadata: {
-          primary: [_constants.ElementName.AuthorGroup, primaryAttribution],
-          secondary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount, _constants.ElementName.ViewCount],
-          subtitle: []
-        }
-      };
-    case 'jira-object-provider':
-      return {
-        metadata: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.Priority],
-          secondary: [],
-          subtitle: []
-        }
-      };
-    case 'trello-object-provider':
-      return {
-        metadata: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.DueOn],
-          secondary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount, _constants.ElementName.AttachmentCount, _constants.ElementName.ChecklistProgress],
-          subtitle: [_constants.ElementName.Location]
-        }
-      };
-    case 'watermelon-object-provider':
-      if (types !== null && types !== void 0 && types.includes('atlassian:Project')) {
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.extractor.improve-bitbucket-file-links') && types !== null && types !== void 0 && types.includes('schema:DigitalDocument')) {
         return {
-          metadata: {
-            primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.State, _constants.ElementName.DueOn],
-            secondary: [],
-            subtitle: []
-          }
+          primary: [_constants.ElementName.LatestCommit, _constants.ElementName.CollaboratorGroup, _constants.ElementName.ModifiedOn]
         };
       }
       return {
-        metadata: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.DueOn],
-          secondary: [],
-          subtitle: []
-        }
-      };
-    default:
-      return {
-        metadata: {
-          primary: [_constants.ElementName.ModifiedOn, _constants.ElementName.CreatedBy],
-          secondary: [],
-          subtitle: []
-        }
+        primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn]
       };
-  }
-};
-var getSimulatedBetterMetadata = exports.getSimulatedBetterMetadata = function getSimulatedBetterMetadata() {
-  var _data$Type$includes, _data$Type;
-  var extensionKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var data = arguments.length > 1 ? arguments[1] : undefined;
-  var types = data ? (0, _linkExtractors.extractType)(data) : undefined;
-  var defaultMetadata = {
-    topMetadataBlock: {
-      primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn],
-      secondary: [],
-      subtitle: []
-    },
-    bottomMetadataBlock: {
-      primary: [],
-      secondary: [],
-      subtitle: []
-    }
-  };
-  switch (extensionKey) {
-    case 'bitbucket-object-provider':
-    case 'native-bitbucket-object-provider':
-      if (types !== null && types !== void 0 && types.includes('atlassian:SourceCodePullRequest')) {
-        return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-          topMetadataBlock: {
-            primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.SubscriberCount, _constants.ElementName.State],
-            secondary: [],
-            subtitle: [_constants.ElementName.SourceBranch, _constants.ElementName.TargetBranch]
-          }
-        });
-      }
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.extractor.improve-bitbucket-file-links') && types !== null && types !== void 0 && types.includes('schema:DigitalDocument')) {
-        return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-          topMetadataBlock: {
-            primary: [_constants.ElementName.LatestCommit, _constants.ElementName.CollaboratorGroup, _constants.ElementName.ModifiedOn],
-            secondary: [],
-            subtitle: []
-          }
-        });
-      }
-      return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-        topMetadataBlock: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn],
-          secondary: [],
-          subtitle: []
-        }
-      });
     case 'confluence-object-provider':
       var primaryAttribution = data && (0, _utils.extractOwnedBy)(data) ? _constants.ElementName.OwnedByGroup : _constants.ElementName.AuthorGroup;
       return {
-        topMetadataBlock: {
-          primary: [primaryAttribution, _constants.ElementName.ModifiedOn],
-          secondary: [],
-          subtitle: []
-        },
-        bottomMetadataBlock: {
-          primary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount, _constants.ElementName.ViewCount],
-          secondary: [],
-          subtitle: []
-        }
+        primary: [primaryAttribution, _constants.ElementName.ModifiedOn],
+        tertiary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount, _constants.ElementName.ViewCount]
       };
     case 'jira-object-provider':
-      var isJiraTask = (_data$Type$includes = (_data$Type = data['@type']) === null || _data$Type === void 0 ? void 0 : _data$Type.includes('atlassian:Task')) !== null && _data$Type$includes !== void 0 ? _data$Type$includes : false;
+      var isJiraTask = (_data$Type$includes = data === null || data === void 0 || (_data$Type = data['@type']) === null || _data$Type === void 0 ? void 0 : _data$Type.includes('atlassian:Task')) !== null && _data$Type$includes !== void 0 ? _data$Type$includes : false;
       return _objectSpread(_objectSpread({}, defaultMetadata), isJiraTask && {
-        topMetadataBlock: {
-          primary: [_constants.ElementName.AssignedToGroup, _constants.ElementName.State, _constants.ElementName.StoryPoints, _constants.ElementName.Priority],
-          secondary: [],
-          subtitle: []
-        }
+        primary: [_constants.ElementName.AssignedToGroup, _constants.ElementName.State, _constants.ElementName.StoryPoints, _constants.ElementName.Priority]
       });
     case 'trello-object-provider':
-      return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-        topMetadataBlock: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.DueOn],
-          secondary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount, _constants.ElementName.AttachmentCount, _constants.ElementName.ChecklistProgress],
-          subtitle: [_constants.ElementName.Location]
-        }
-      });
+      return {
+        primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.DueOn],
+        secondary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount, _constants.ElementName.AttachmentCount, _constants.ElementName.ChecklistProgress],
+        subtitle: [_constants.ElementName.Location]
+      };
     case 'watermelon-object-provider':
       if (types !== null && types !== void 0 && types.includes('atlassian:Project')) {
-        return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-          topMetadataBlock: {
-            primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.State, _constants.ElementName.DueOn],
-            secondary: [],
-            subtitle: []
-          }
-        });
+        return {
+          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.State, _constants.ElementName.DueOn]
+        };
       }
-      return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-        topMetadataBlock: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.DueOn],
-          secondary: [],
-          subtitle: []
-        }
-      });
+      return {
+        primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.DueOn]
+      };
     case 'slack-object-provider':
       return {
-        topMetadataBlock: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.SentOn],
-          secondary: [],
-          subtitle: []
-        },
-        bottomMetadataBlock: {
-          primary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount],
-          secondary: [],
-          subtitle: []
-        }
+        primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.SentOn],
+        tertiary: [_constants.ElementName.ReactCount, _constants.ElementName.CommentCount]
       };
     case 'google-object-provider':
     case 'figma-object-provider':
-      return _objectSpread(_objectSpread({}, defaultMetadata), {}, {
-        topMetadataBlock: {
-          primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn],
-          secondary: [],
-          subtitle: []
-        }
-      });
+      return {
+        primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn]
+      };
     default:
       return defaultMetadata;
   }
+};
+var AvatarGroupsWithNamePrefix = [_constants.ElementName.AssignedToGroup, _constants.ElementName.OwnedByGroup, _constants.ElementName.AuthorGroup];
+var toElementItem = function toElementItem(name) {
+  var showNamePrefix = AvatarGroupsWithNamePrefix.indexOf(name) !== -1 ? true : undefined;
+  var testId = "".concat(name.toLowerCase(), "-metadata-element");
+  return {
+    name: name,
+    showNamePrefix: showNamePrefix,
+    testId: testId
+  };
+};
+var toElementItems = function toElementItems(elementNames) {
+  if (!(elementNames !== null && elementNames !== void 0 && elementNames.length)) {
+    return;
+  }
+  return elementNames.filter(function (name) {
+    return name in _constants.ElementName;
+  }).map(toElementItem);
+};
+var getMetadata = exports.getMetadata = function getMetadata(extensionKey, data) {
+  var metadata = getSimulatedBetterMetadata(extensionKey, data);
+  var primary = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.hover-card-action-redesign') ? [].concat(metadata.primary, metadata.tertiary) : metadata.primary;
+
+  // `tertiary` should be removed completely during cleanup:
+  // https://product-fabric.atlassian.net/browse/EDM-9556
+  var tertiary = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.hover-card-action-redesign') ? undefined : metadata.tertiary;
+  return {
+    subtitle: toElementItems(metadata.subtitle),
+    primary: toElementItems(primary),
+    secondary: toElementItems(metadata.secondary),
+    tertiary: toElementItems(tertiary)
+  };
 };

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

@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.57.1",
+  packageVersion: "26.57.3",
   componentName: 'linkUrl'
 };
 var Link = (0, _click.withLinkClickedEvent)('a');

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

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

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

@@ -6,12 +6,11 @@ import CopyIcon from '@atlaskit/icon/glyph/copy';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ActionName, CardDisplay, SmartLinkPosition, SmartLinkSize } from '../../../constants';
-import { extractMetadata } from '../../../extractors/hover/extractMetadata';
 import { useSmartLinkAnalytics } from '../../../state/analytics';
 import { getExtensionKey, getServices } from '../../../state/helpers';
 import { isSpecialEvent } from '../../../utils';
 import { flexibleUiOptions, titleBlockCss } from '../styled';
-import { getSimulatedMetadata } from '../utils';
+import { getMetadata } from '../utils';
 import HoverCardLoadingView from './views/resolving';
 import HoverCardUnauthorisedView from './views/unauthorised';
 import HoverCardResolvedView from './views/resolved';
@@ -109,7 +108,7 @@ const HoverCardContent = ({
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   const {
     subtitle
-  } = extractMetadata(getSimulatedMetadata(extensionKey, data));
+  } = getMetadata(extensionKey, data);
   const titleMaxLines = subtitle && subtitle.length > 0 ? 1 : 2;
   const titleBlockProps = {
     actions: getBooleanFF('platform.linking-platform.smart-card.hover-card-action-redesign') ? undefined : titleActions,

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

@@ -4,9 +4,8 @@ import { ActionName, CardDisplay, ElementName, SmartLinkPosition, SmartLinkSize,
 import { FooterBlock, MetadataBlock, RelatedUrlsBlock, SnippetBlock, TitleBlock, AISummaryBlock, CustomBlock, ActionBlock } from '../../../../FlexibleCard/components/blocks';
 import { footerBlockCss, hiddenSnippetStyles, metadataBlockCss } from './styled';
 import FlexibleCard from '../../../../FlexibleCard';
-import { getSimulatedBetterMetadata } from '../../../utils';
+import { getMetadata } from '../../../utils';
 import ImagePreview from '../../ImagePreview';
-import { elementNamesToItems } from '../../../../../extractors/hover/extractMetadata';
 import { messages } from '../../../../../messages';
 import { FormattedMessage } from 'react-intl-next';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -78,7 +77,7 @@ const ConnectedAIBlock = ({
   return showData ? /*#__PURE__*/React.createElement(React.Fragment, null, !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
     testId: 'connected-AI',
     status: SmartLinkStatus.Resolved
-  }), /*#__PURE__*/React.createElement(MetadataBlock, {
+  }), !getBooleanFF('platform.linking-platform.smart-card.hover-card-action-redesign') && /*#__PURE__*/React.createElement(MetadataBlock, {
     primary: bottomPrimary,
     size: SmartLinkSize.Large,
     overrideCss: metadataBlockCss,
@@ -111,16 +110,11 @@ const HoverCardResolvedView = ({
   const footerActions = useMemo(() => toFooterActions(cardActions, onActionClick), [cardActions, onActionClick]);
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   const {
-    topPrimary,
-    topSecondary,
-    bottomPrimary
+    primary,
+    secondary,
+    tertiary
   } = useMemo(() => {
-    const betterMetadata = getSimulatedBetterMetadata(extensionKey, data);
-    return {
-      topPrimary: elementNamesToItems(betterMetadata.topMetadataBlock.primary),
-      topSecondary: elementNamesToItems(betterMetadata.topMetadataBlock.secondary),
-      bottomPrimary: elementNamesToItems(betterMetadata.bottomMetadataBlock.primary)
-    };
+    return getMetadata(extensionKey, data);
   }, [data, extensionKey]);
   const snippetHeight = React.useRef(0);
   const snippetBlockRef = useRef(null);
@@ -145,8 +139,8 @@ const HoverCardResolvedView = ({
   return /*#__PURE__*/React.createElement(FlexibleCard, flexibleCardProps, imagePreview, /*#__PURE__*/React.createElement(TitleBlock, _extends({}, titleBlockProps, {
     metadataPosition: SmartLinkPosition.Top
   })), /*#__PURE__*/React.createElement(MetadataBlock, {
-    primary: topPrimary,
-    secondary: topSecondary,
+    primary: primary,
+    secondary: secondary,
     overrideCss: metadataBlockCss,
     maxLines: 1,
     size: SmartLinkSize.Medium
@@ -160,7 +154,7 @@ const HoverCardResolvedView = ({
     blockRef: connectedAIBlockRef
   }, /*#__PURE__*/React.createElement(ConnectedAIBlock, {
     imagePreview: !!imagePreview,
-    bottomPrimary: bottomPrimary,
+    bottomPrimary: tertiary,
     data: data
   })), !isAISummaryEnabled && !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
     status: SmartLinkStatus.Resolved
@@ -169,8 +163,8 @@ const HoverCardResolvedView = ({
     onRender: onSnippetRender,
     blockRef: snippetBlockRef,
     overrideCss: hiddenSnippetStyles
-  }), !isAISummaryEnabled && /*#__PURE__*/React.createElement(MetadataBlock, {
-    primary: bottomPrimary,
+  }), !isAISummaryEnabled && !isActionBlockEnabled && /*#__PURE__*/React.createElement(MetadataBlock, {
+    primary: tertiary,
     size: SmartLinkSize.Large,
     overrideCss: metadataBlockCss,
     maxLines: 1,