@atlaskit/smart-card 36.8.0 → 36.8.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/smart-card
 
+## 36.8.2
+
+### Patch Changes
+
+- [#144118](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144118)
+  [`74eae7139b13d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/74eae7139b13d) -
+  Enable resolve embed-view with nounData behind ff: smart_links_noun_support
+- Updated dependencies
+
+## 36.8.1
+
+### Patch Changes
+
+- [#142166](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/142166)
+  [`c721be0359308`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c721be0359308) -
+  Enable resolve inline-view from nounData behind ff: smart_links_noun_support
+- Updated dependencies
+
 ## 36.8.0
 
 ### Minor Changes

package/dist/cjs/extractors/embed/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.extractEmbedProps = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _linkExtractors = require("@atlaskit/link-extractors");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _jsonld = require("../../utils/jsonld");
 var _icon = require("../common/icon");
 var _extractIsSupportTheming = require("../common/meta/extractIsSupportTheming");
 var _extractIsTrusted = require("../common/meta/extractIsTrusted");
@@ -42,7 +44,29 @@ function generateContext(jsonLd) {
     icon: icon ? icon : provider.icon
   });
 }
-var extractEmbedProps = exports.extractEmbedProps = function extractEmbedProps(jsonLd, meta, platform, iframeUrlType) {
+
+/**
+ * We can migrate this to link extractors once we have deprecated JsonLd
+ */
+function extractSmartLinkContext(response) {
+  if ((0, _linkExtractors.isEntityPresent)(response)) {
+    return (0, _linkExtractors.extractEntityProvider)(response);
+  }
+  return generateContext(response === null || response === void 0 ? void 0 : response.data);
+}
+var extractEmbedProps = exports.extractEmbedProps = function extractEmbedProps(response, platform, iframeUrlType) {
+  var meta = response === null || response === void 0 ? void 0 : response.meta;
+  var jsonLd = (response === null || response === void 0 ? void 0 : response.data) || (0, _jsonld.getEmptyJsonLd)();
+  if ((0, _platformFeatureFlags.fg)('smart_links_noun_support')) {
+    return {
+      link: (0, _linkExtractors.extractSmartLinkUrl)(response) || '',
+      title: (0, _linkExtractors.extractSmartLinkTitle)(response),
+      context: extractSmartLinkContext(response),
+      preview: (0, _linkExtractors.extractSmartLinkEmbed)(response, iframeUrlType),
+      isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta),
+      isSupportTheming: (0, _extractIsSupportTheming.extractIsSupportTheming)(meta)
+    };
+  }
   return {
     link: (0, _linkExtractors.extractLink)(jsonLd) || '',
     title: (0, _linkExtractors.extractTitle)(jsonLd),

package/dist/cjs/extractors/inline/index.js

@@ -3,14 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.extractInlineProps = exports.extractInlineIcon = void 0;
+exports.extractInlineProps = void 0;
 var _linkExtractors = require("@atlaskit/link-extractors");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _icon = require("../common/icon");
 var _lozenge = require("../common/lozenge");
 var _primitives = require("../common/primitives");
 var _titlePrefix = require("../common/title-prefix");
 var _constants = require("../constants");
-var extractInlineIcon = exports.extractInlineIcon = function extractInlineIcon(jsonLd) {
+var extractInlineIcon = function extractInlineIcon(jsonLd) {
   var showIconLabel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var provider = (0, _linkExtractors.extractProvider)(jsonLd);
   if (provider && provider.id) {
@@ -20,8 +21,35 @@ var extractInlineIcon = exports.extractInlineIcon = function extractInlineIcon(j
   }
   return (0, _icon.extractIcon)(jsonLd, 'provider', showIconLabel);
 };
-var extractInlineProps = exports.extractInlineProps = function extractInlineProps(jsonLd, renderers, removeTextHighlightingFromTitle) {
+var extractSmartLinkInlineIcon = function extractSmartLinkInlineIcon(response) {
+  var showLabel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  if ((0, _linkExtractors.isEntityPresent)(response)) {
+    var provider = (0, _linkExtractors.extractEntityProvider)(response);
+    if (provider) {
+      return provider.icon;
+    }
+    // We don't need this for design entities,
+    // but we can add it back when we support more nouns
+    // it requires extractInlineIcon to be moved to the smart link extractor package.
+    // see: https://product-fabric.atlassian.net/browse/EDM-12375
+    // return extractSmartLinkIcon(response);
+  }
+  return extractInlineIcon(response === null || response === void 0 ? void 0 : response.data, showLabel);
+};
+var extractInlineProps = exports.extractInlineProps = function extractInlineProps(response, renderers, removeTextHighlightingFromTitle) {
   var showLabel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var jsonLd = response === null || response === void 0 ? void 0 : response.data;
+  if ((0, _platformFeatureFlags.fg)('smart_links_noun_support')) {
+    return {
+      icon: extractSmartLinkInlineIcon(response, showLabel),
+      link: (0, _linkExtractors.extractSmartLinkUrl)(response),
+      title: (0, _linkExtractors.extractSmartLinkTitle)(response, removeTextHighlightingFromTitle),
+      // As we migrate to support more nouns we can incorporate these fields
+      lozenge: (0, _lozenge.extractLozenge)(jsonLd),
+      titleTextColor: (0, _primitives.extractTitleTextColor)(jsonLd),
+      titlePrefix: (0, _titlePrefix.extractTitlePrefix)(jsonLd, renderers, 'inline')
+    };
+  }
   return {
     link: (0, _linkExtractors.extractLink)(jsonLd),
     title: (0, _linkExtractors.extractTitle)(jsonLd, removeTextHighlightingFromTitle),

package/dist/cjs/state/hooks/use-resolve/index.js

@@ -8,7 +8,9 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("react");
+var _linkExtractors = require("@atlaskit/link-extractors");
 var _linkProvider = require("@atlaskit/link-provider");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../../constants");
 var _analytics = require("../../analytics");
 var _useResponse2 = _interopRequireDefault(require("../use-response"));
@@ -43,7 +45,7 @@ var useResolve = function useResolve() {
               status: _constants.SmartLinkStatus.Pending,
               details: undefined
             }, details = _ref2.details;
-            hasData = !!(details && details.data);
+            hasData = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? !!(details && details.data || (0, _linkExtractors.isEntityPresent)(details)) : !!(details && details.data);
             if (!(isReloading || !hasData || isMetadataRequest)) {
               _context.next = 9;
               break;

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

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

package/dist/cjs/utils/mocks.js

@@ -86,17 +86,45 @@ var successfulResponseData = _objectSpread(_objectSpread({}, errorResponseData),
     href: 'https://www.ilovecheese.com'
   }
 });
-var mocks = exports.mocks = {
-  success: {
-    meta: {
-      visibility: 'public',
-      access: 'granted',
-      auth: [],
-      definitionId: 'd1',
-      key: 'object-provider'
-    },
-    data: successfulResponseData
+var jsonLdResponse = {
+  meta: {
+    visibility: 'public',
+    access: 'granted',
+    auth: [],
+    definitionId: 'd1',
+    key: 'object-provider'
   },
+  data: successfulResponseData
+};
+var nounDataResponse = {
+  nounData: {
+    id: 'I love cheese',
+    displayName: 'I love cheese',
+    url: 'https://some.url',
+    lastUpdatedAt: '2025-01-08T22:26:52.501Z',
+    thumbnail: {
+      externalUrl: 'https://www.ilovecheese.com'
+    },
+    'atlassian:design': {
+      liveEmbedUrl: 'https://www.ilovecheese.com',
+      type: 'FILE',
+      inspectUrl: 'https://www.ilovecheese.com',
+      iconUrl: 'https://www.ilovecheese.com'
+    }
+  }
+};
+var mocks = exports.mocks = {
+  success: _objectSpread({}, jsonLdResponse),
+  nounDataSuccess: _objectSpread(_objectSpread(_objectSpread({}, jsonLdResponse), nounDataResponse), {}, {
+    meta: _objectSpread(_objectSpread({}, jsonLdResponse.meta), {}, {
+      generator: {
+        name: 'I love cheese',
+        icon: {
+          url: 'https://www.ilovecheese.com'
+        }
+      }
+    })
+  }),
   notFound: {
     meta: {
       visibility: 'not_found',

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

@@ -46,8 +46,6 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var status = cardState.status,
     details = cardState.details;
-  var data = details && details.data || (0, _jsonld.getEmptyJsonLd)();
-  var meta = details && details.meta;
   var extensionKey = (0, _helpers.getExtensionKey)(details);
   var isProductIntegrationSupported = (0, _helpers.hasAuthScopeOverrides)(details);
   var _useControlDataExport = (0, _useControlDataExportConfig.useControlDataExportConfig)(),
@@ -67,7 +65,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
         testId: testId ? "".concat(testId, "-resolving-view") : 'embed-card-resolving-view'
       });
     case 'resolved':
-      var resolvedViewProps = (0, _embed.extractEmbedProps)(data, meta, platform, iframeUrlType);
+      var resolvedViewProps = (0, _embed.extractEmbedProps)(details, platform, iframeUrlType);
       if (onResolve) {
         var _resolvedViewProps$pr;
         onResolve({
@@ -78,7 +76,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
       }
       if ((0, _platformFeatureFlags.fg)('platform_smart_links_controlled_dsp_export_view')) {
         if ((0, _shouldDataExport.getIsDataExportEnabled)(shouldControlDataExport, cardState.details)) {
-          var unauthViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
+          var unauthViewProps = (0, _embed.extractEmbedProps)(details, platform);
           return /*#__PURE__*/_react.default.createElement(_unauthorizedView.default, {
             context: unauthViewProps.context,
             extensionKey: extensionKey,
@@ -106,7 +104,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
         }));
       } else {
         if (platform === 'mobile') {
-          var resolvedInlineViewProps = (0, _inline.extractInlineProps)(data);
+          var resolvedInlineViewProps = (0, _inline.extractInlineProps)(details);
           return /*#__PURE__*/_react.default.createElement(_ResolvedView2.InlineCardResolvedView, (0, _extends2.default)({}, resolvedInlineViewProps, {
             isSelected: isSelected,
             testId: testId,
@@ -131,7 +129,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
           status: status
         });
       }
-      var unauthorisedViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
+      var unauthorisedViewProps = (0, _embed.extractEmbedProps)(details, platform);
       return /*#__PURE__*/_react.default.createElement(_unauthorizedView.default, {
         context: unauthorisedViewProps.context,
         extensionKey: extensionKey,
@@ -151,7 +149,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
           status: status
         });
       }
-      var forbiddenViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
+      var forbiddenViewProps = (0, _embed.extractEmbedProps)(details, platform);
       var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : (0, _jsonld.getForbiddenJsonLd)().meta;
       if (forbiddenViewProps.preview) {
         return /*#__PURE__*/_react.default.createElement(_ResolvedView3.EmbedCardResolvedView, (0, _extends2.default)({}, forbiddenViewProps, {
@@ -186,7 +184,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
           status: status
         });
       }
-      var notFoundViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
+      var notFoundViewProps = (0, _embed.extractEmbedProps)(details, platform);
       var notFoundAccessContext = details !== null && details !== void 0 && details.meta ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
         jsonLd: details === null || details === void 0 ? void 0 : details.meta,
         url: url,

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

@@ -41,6 +41,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _linkExtractors = require("@atlaskit/link-extractors");
 var _linkProvider = require("@atlaskit/link-provider");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../constants");
 var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
 var _inline = require("../../extractors/inline");
@@ -85,7 +86,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
   if (showHoverPreview === undefined && showHoverPreviewFlag !== undefined) {
     showHoverPreview = Boolean(showHoverPreviewFlag);
   }
-  var resolvedProps = status === _constants.SmartLinkStatus.Resolved ? (0, _inline.extractInlineProps)(cardDetails, renderers, removeTextHighlightingFromTitle, false) : {};
+  var resolvedProps = status === _constants.SmartLinkStatus.Resolved ? (0, _inline.extractInlineProps)(details, renderers, removeTextHighlightingFromTitle, false) : {};
   (0, _react.useEffect)(function () {
     switch (status) {
       case _constants.SmartLinkStatus.Resolved:
@@ -134,7 +135,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
         truncateInline: truncateInline
       }));
     case 'unauthorized':
-      var provider = (0, _linkExtractors.extractProvider)(cardDetails);
+      var provider = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(details) : (0, _linkExtractors.extractProvider)(cardDetails);
       return /*#__PURE__*/_react.default.createElement(_UnauthorisedView.InlineCardUnauthorizedView, {
         icon: provider && provider.icon,
         context: provider && provider.text,
@@ -149,7 +150,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
         truncateInline: truncateInline
       });
     case 'forbidden':
-      var providerForbidden = (0, _linkExtractors.extractProvider)(cardDetails);
+      var providerForbidden = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(details) : (0, _linkExtractors.extractProvider)(cardDetails);
       var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : (0, _jsonld.getForbiddenJsonLd)().meta;
       var requestAccessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
         jsonLd: cardMetadata,
@@ -170,7 +171,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
         truncateInline: truncateInline
       });
     case 'not_found':
-      var providerNotFound = (0, _linkExtractors.extractProvider)(cardDetails);
+      var providerNotFound = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(details) : (0, _linkExtractors.extractProvider)(cardDetails);
       return /*#__PURE__*/_react.default.createElement(_ErroredView.InlineCardErroredView, {
         url: url,
         icon: providerNotFound && providerNotFound.icon,

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

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

package/dist/es2019/extractors/embed/index.js

@@ -1,4 +1,6 @@
-import { extractLink, extractPreview, extractProvider, extractProviderIcon, extractTitle, extractUrlFromIconJsonLd } from '@atlaskit/link-extractors';
+import { extractEntityProvider, extractLink, extractPreview, extractProvider, extractProviderIcon, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, extractUrlFromIconJsonLd, isEntityPresent } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { getEmptyJsonLd } from '../../utils/jsonld';
 import { prioritiseIcon } from '../common/icon';
 import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';
@@ -34,11 +36,35 @@ function generateContext(jsonLd) {
     icon: icon ? icon : provider.icon
   };
 }
-export const extractEmbedProps = (jsonLd, meta, platform, iframeUrlType) => ({
-  link: extractLink(jsonLd) || '',
-  title: extractTitle(jsonLd),
-  context: generateContext(jsonLd),
-  preview: extractEmbedPreview(jsonLd, platform, iframeUrlType),
-  isTrusted: extractIsTrusted(meta),
-  isSupportTheming: extractIsSupportTheming(meta)
-});
+
+/**
+ * We can migrate this to link extractors once we have deprecated JsonLd
+ */
+function extractSmartLinkContext(response) {
+  if (isEntityPresent(response)) {
+    return extractEntityProvider(response);
+  }
+  return generateContext(response === null || response === void 0 ? void 0 : response.data);
+}
+export const extractEmbedProps = (response, platform, iframeUrlType) => {
+  const meta = response === null || response === void 0 ? void 0 : response.meta;
+  const jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();
+  if (fg('smart_links_noun_support')) {
+    return {
+      link: extractSmartLinkUrl(response) || '',
+      title: extractSmartLinkTitle(response),
+      context: extractSmartLinkContext(response),
+      preview: extractSmartLinkEmbed(response, iframeUrlType),
+      isTrusted: extractIsTrusted(meta),
+      isSupportTheming: extractIsSupportTheming(meta)
+    };
+  }
+  return {
+    link: extractLink(jsonLd) || '',
+    title: extractTitle(jsonLd),
+    context: generateContext(jsonLd),
+    preview: extractEmbedPreview(jsonLd, platform, iframeUrlType),
+    isTrusted: extractIsTrusted(meta),
+    isSupportTheming: extractIsSupportTheming(meta)
+  };
+};

package/dist/es2019/extractors/inline/index.js

@@ -1,10 +1,13 @@
-import { extractLink, extractProvider, extractTitle } from '@atlaskit/link-extractors';
+import { extractEntityProvider, extractLink, extractProvider,
+// extractSmartLinkIcon,
+extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, isEntityPresent } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { extractIcon } from '../common/icon';
 import { extractLozenge } from '../common/lozenge';
 import { extractTitleTextColor } from '../common/primitives';
 import { extractTitlePrefix } from '../common/title-prefix';
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../constants';
-export const extractInlineIcon = (jsonLd, showIconLabel = true) => {
+const extractInlineIcon = (jsonLd, showIconLabel = true) => {
   const provider = extractProvider(jsonLd);
   if (provider && provider.id) {
     if (provider.id === CONFLUENCE_GENERATOR_ID || provider.id === JIRA_GENERATOR_ID) {
@@ -13,11 +16,39 @@ export const extractInlineIcon = (jsonLd, showIconLabel = true) => {
   }
   return extractIcon(jsonLd, 'provider', showIconLabel);
 };
-export const extractInlineProps = (jsonLd, renderers, removeTextHighlightingFromTitle, showLabel = true) => ({
-  link: extractLink(jsonLd),
-  title: extractTitle(jsonLd, removeTextHighlightingFromTitle),
-  lozenge: extractLozenge(jsonLd),
-  icon: extractInlineIcon(jsonLd, showLabel),
-  titleTextColor: extractTitleTextColor(jsonLd),
-  titlePrefix: extractTitlePrefix(jsonLd, renderers, 'inline')
-});
+const extractSmartLinkInlineIcon = (response, showLabel = true) => {
+  if (isEntityPresent(response)) {
+    const provider = extractEntityProvider(response);
+    if (provider) {
+      return provider.icon;
+    }
+    // We don't need this for design entities,
+    // but we can add it back when we support more nouns
+    // it requires extractInlineIcon to be moved to the smart link extractor package.
+    // see: https://product-fabric.atlassian.net/browse/EDM-12375
+    // return extractSmartLinkIcon(response);
+  }
+  return extractInlineIcon(response === null || response === void 0 ? void 0 : response.data, showLabel);
+};
+export const extractInlineProps = (response, renderers, removeTextHighlightingFromTitle, showLabel = true) => {
+  const jsonLd = response === null || response === void 0 ? void 0 : response.data;
+  if (fg('smart_links_noun_support')) {
+    return {
+      icon: extractSmartLinkInlineIcon(response, showLabel),
+      link: extractSmartLinkUrl(response),
+      title: extractSmartLinkTitle(response, removeTextHighlightingFromTitle),
+      // As we migrate to support more nouns we can incorporate these fields
+      lozenge: extractLozenge(jsonLd),
+      titleTextColor: extractTitleTextColor(jsonLd),
+      titlePrefix: extractTitlePrefix(jsonLd, renderers, 'inline')
+    };
+  }
+  return {
+    link: extractLink(jsonLd),
+    title: extractTitle(jsonLd, removeTextHighlightingFromTitle),
+    lozenge: extractLozenge(jsonLd),
+    icon: extractInlineIcon(jsonLd, showLabel),
+    titleTextColor: extractTitleTextColor(jsonLd),
+    titlePrefix: extractTitlePrefix(jsonLd, renderers, 'inline')
+  };
+};

package/dist/es2019/state/hooks/use-resolve/index.js

@@ -1,5 +1,7 @@
 import { useCallback } from 'react';
+import { isEntityPresent } from '@atlaskit/link-extractors';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../../constants';
 import { addMetadataToExperience } from '../../analytics';
 import useResponse from '../use-response';
@@ -26,7 +28,7 @@ const useResolve = () => {
       status: SmartLinkStatus.Pending,
       details: undefined
     };
-    const hasData = !!(details && details.data);
+    const hasData = fg('smart_links_noun_support') ? !!(details && details.data || isEntityPresent(details)) : !!(details && details.data);
     if (isReloading || !hasData || isMetadataRequest) {
       return connections.client.fetchData(url, isReloading).then(response => handleResolvedLinkResponse(url, response, isReloading, isMetadataRequest)).catch(error => handleResolvedLinkError(url, error, undefined, isMetadataRequest));
     } else {

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

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

package/dist/es2019/utils/mocks.js

@@ -68,16 +68,49 @@ const successfulResponseData = {
     href: 'https://www.ilovecheese.com'
   }
 };
+const jsonLdResponse = {
+  meta: {
+    visibility: 'public',
+    access: 'granted',
+    auth: [],
+    definitionId: 'd1',
+    key: 'object-provider'
+  },
+  data: successfulResponseData
+};
+const nounDataResponse = {
+  nounData: {
+    id: 'I love cheese',
+    displayName: 'I love cheese',
+    url: 'https://some.url',
+    lastUpdatedAt: '2025-01-08T22:26:52.501Z',
+    thumbnail: {
+      externalUrl: 'https://www.ilovecheese.com'
+    },
+    'atlassian:design': {
+      liveEmbedUrl: 'https://www.ilovecheese.com',
+      type: 'FILE',
+      inspectUrl: 'https://www.ilovecheese.com',
+      iconUrl: 'https://www.ilovecheese.com'
+    }
+  }
+};
 export const mocks = {
   success: {
+    ...jsonLdResponse
+  },
+  nounDataSuccess: {
+    ...jsonLdResponse,
+    ...nounDataResponse,
     meta: {
-      visibility: 'public',
-      access: 'granted',
-      auth: [],
-      definitionId: 'd1',
-      key: 'object-provider'
-    },
-    data: successfulResponseData
+      ...jsonLdResponse.meta,
+      generator: {
+        name: 'I love cheese',
+        icon: {
+          url: 'https://www.ilovecheese.com'
+        }
+      }
+    }
   },
   notFound: {
     meta: {

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

@@ -7,7 +7,7 @@ import { extractEmbedProps } from '../../extractors/embed';
 import { extractInlineProps } from '../../extractors/inline';
 import { getExtensionKey, hasAuthScopeOverrides } from '../../state/helpers';
 import { useControlDataExportConfig } from '../../state/hooks/use-control-data-export-config';
-import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
+import { getForbiddenJsonLd } from '../../utils/jsonld';
 import { getIsDataExportEnabled } from '../../utils/should-data-export';
 import BlockCardResolvedView from '../BlockCard/views/ResolvedView';
 import { InlineCardResolvedView } from '../InlineCard/ResolvedView';
@@ -43,8 +43,6 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
     status,
     details
   } = cardState;
-  const data = details && details.data || getEmptyJsonLd();
-  const meta = details && details.meta;
   const extensionKey = getExtensionKey(details);
   const isProductIntegrationSupported = hasAuthScopeOverrides(details);
   const {
@@ -64,7 +62,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
         testId: testId ? `${testId}-resolving-view` : 'embed-card-resolving-view'
       });
     case 'resolved':
-      const resolvedViewProps = extractEmbedProps(data, meta, platform, iframeUrlType);
+      const resolvedViewProps = extractEmbedProps(details, platform, iframeUrlType);
       if (onResolve) {
         var _resolvedViewProps$pr;
         onResolve({
@@ -75,7 +73,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
       }
       if (fg('platform_smart_links_controlled_dsp_export_view')) {
         if (getIsDataExportEnabled(shouldControlDataExport, cardState.details)) {
-          const unauthViewProps = extractEmbedProps(data, meta, platform);
+          const unauthViewProps = extractEmbedProps(details, platform);
           return /*#__PURE__*/React.createElement(UnauthorizedView, {
             context: unauthViewProps.context,
             extensionKey: extensionKey,
@@ -103,7 +101,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
         }));
       } else {
         if (platform === 'mobile') {
-          const resolvedInlineViewProps = extractInlineProps(data);
+          const resolvedInlineViewProps = extractInlineProps(details);
           return /*#__PURE__*/React.createElement(InlineCardResolvedView, _extends({}, resolvedInlineViewProps, {
             isSelected: isSelected,
             testId: testId,
@@ -128,7 +126,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
           status
         });
       }
-      const unauthorisedViewProps = extractEmbedProps(data, meta, platform);
+      const unauthorisedViewProps = extractEmbedProps(details, platform);
       return /*#__PURE__*/React.createElement(UnauthorizedView, {
         context: unauthorisedViewProps.context,
         extensionKey: extensionKey,
@@ -148,7 +146,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
           status
         });
       }
-      const forbiddenViewProps = extractEmbedProps(data, meta, platform);
+      const forbiddenViewProps = extractEmbedProps(details, platform);
       const cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
       if (forbiddenViewProps.preview) {
         return /*#__PURE__*/React.createElement(EmbedCardResolvedView, _extends({}, forbiddenViewProps, {
@@ -183,7 +181,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
           status
         });
       }
-      const notFoundViewProps = extractEmbedProps(data, meta, platform);
+      const notFoundViewProps = extractEmbedProps(details, platform);
       const notFoundAccessContext = details !== null && details !== void 0 && details.meta ? extractRequestAccessContextImproved({
         jsonLd: details === null || details === void 0 ? void 0 : details.meta,
         url,

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

@@ -1,8 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { useFeatureFlag } from '@atlaskit/link-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../constants';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { extractInlineProps } from '../../extractors/inline';
@@ -50,7 +51,7 @@ export const InlineCard = ({
   if (showHoverPreview === undefined && showHoverPreviewFlag !== undefined) {
     showHoverPreview = Boolean(showHoverPreviewFlag);
   }
-  const resolvedProps = status === SmartLinkStatus.Resolved ? extractInlineProps(cardDetails, renderers, removeTextHighlightingFromTitle, false) : {};
+  const resolvedProps = status === SmartLinkStatus.Resolved ? extractInlineProps(details, renderers, removeTextHighlightingFromTitle, false) : {};
   useEffect(() => {
     switch (status) {
       case SmartLinkStatus.Resolved:
@@ -99,7 +100,7 @@ export const InlineCard = ({
         truncateInline: truncateInline
       }));
     case 'unauthorized':
-      const provider = extractProvider(cardDetails);
+      const provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(cardDetails);
       return /*#__PURE__*/React.createElement(InlineCardUnauthorizedView, {
         icon: provider && provider.icon,
         context: provider && provider.text,
@@ -114,7 +115,7 @@ export const InlineCard = ({
         truncateInline: truncateInline
       });
     case 'forbidden':
-      const providerForbidden = extractProvider(cardDetails);
+      const providerForbidden = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(cardDetails);
       const cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
       const requestAccessContext = extractRequestAccessContextImproved({
         jsonLd: cardMetadata,
@@ -135,7 +136,7 @@ export const InlineCard = ({
         truncateInline: truncateInline
       });
     case 'not_found':
-      const providerNotFound = extractProvider(cardDetails);
+      const providerNotFound = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(cardDetails);
       return /*#__PURE__*/React.createElement(InlineCardErroredView, {
         url: url,
         icon: providerNotFound && providerNotFound.icon,

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: "36.8.0",
+  packageVersion: "36.8.2",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');

package/dist/esm/extractors/embed/index.js

@@ -1,7 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
-import { extractLink, extractPreview, extractProvider, extractProviderIcon, extractTitle, extractUrlFromIconJsonLd } from '@atlaskit/link-extractors';
+import { extractEntityProvider, extractLink, extractPreview, extractProvider, extractProviderIcon, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, extractUrlFromIconJsonLd, isEntityPresent } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { getEmptyJsonLd } from '../../utils/jsonld';
 import { prioritiseIcon } from '../common/icon';
 import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';
@@ -35,7 +37,29 @@ function generateContext(jsonLd) {
     icon: icon ? icon : provider.icon
   });
 }
-export var extractEmbedProps = function extractEmbedProps(jsonLd, meta, platform, iframeUrlType) {
+
+/**
+ * We can migrate this to link extractors once we have deprecated JsonLd
+ */
+function extractSmartLinkContext(response) {
+  if (isEntityPresent(response)) {
+    return extractEntityProvider(response);
+  }
+  return generateContext(response === null || response === void 0 ? void 0 : response.data);
+}
+export var extractEmbedProps = function extractEmbedProps(response, platform, iframeUrlType) {
+  var meta = response === null || response === void 0 ? void 0 : response.meta;
+  var jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();
+  if (fg('smart_links_noun_support')) {
+    return {
+      link: extractSmartLinkUrl(response) || '',
+      title: extractSmartLinkTitle(response),
+      context: extractSmartLinkContext(response),
+      preview: extractSmartLinkEmbed(response, iframeUrlType),
+      isTrusted: extractIsTrusted(meta),
+      isSupportTheming: extractIsSupportTheming(meta)
+    };
+  }
   return {
     link: extractLink(jsonLd) || '',
     title: extractTitle(jsonLd),

package/dist/esm/extractors/inline/index.js

@@ -1,10 +1,13 @@
-import { extractLink, extractProvider, extractTitle } from '@atlaskit/link-extractors';
+import { extractEntityProvider, extractLink, extractProvider,
+// extractSmartLinkIcon,
+extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, isEntityPresent } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { extractIcon } from '../common/icon';
 import { extractLozenge } from '../common/lozenge';
 import { extractTitleTextColor } from '../common/primitives';
 import { extractTitlePrefix } from '../common/title-prefix';
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../constants';
-export var extractInlineIcon = function extractInlineIcon(jsonLd) {
+var extractInlineIcon = function extractInlineIcon(jsonLd) {
   var showIconLabel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var provider = extractProvider(jsonLd);
   if (provider && provider.id) {
@@ -14,8 +17,35 @@ export var extractInlineIcon = function extractInlineIcon(jsonLd) {
   }
   return extractIcon(jsonLd, 'provider', showIconLabel);
 };
-export var extractInlineProps = function extractInlineProps(jsonLd, renderers, removeTextHighlightingFromTitle) {
+var extractSmartLinkInlineIcon = function extractSmartLinkInlineIcon(response) {
+  var showLabel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  if (isEntityPresent(response)) {
+    var provider = extractEntityProvider(response);
+    if (provider) {
+      return provider.icon;
+    }
+    // We don't need this for design entities,
+    // but we can add it back when we support more nouns
+    // it requires extractInlineIcon to be moved to the smart link extractor package.
+    // see: https://product-fabric.atlassian.net/browse/EDM-12375
+    // return extractSmartLinkIcon(response);
+  }
+  return extractInlineIcon(response === null || response === void 0 ? void 0 : response.data, showLabel);
+};
+export var extractInlineProps = function extractInlineProps(response, renderers, removeTextHighlightingFromTitle) {
   var showLabel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var jsonLd = response === null || response === void 0 ? void 0 : response.data;
+  if (fg('smart_links_noun_support')) {
+    return {
+      icon: extractSmartLinkInlineIcon(response, showLabel),
+      link: extractSmartLinkUrl(response),
+      title: extractSmartLinkTitle(response, removeTextHighlightingFromTitle),
+      // As we migrate to support more nouns we can incorporate these fields
+      lozenge: extractLozenge(jsonLd),
+      titleTextColor: extractTitleTextColor(jsonLd),
+      titlePrefix: extractTitlePrefix(jsonLd, renderers, 'inline')
+    };
+  }
   return {
     link: extractLink(jsonLd),
     title: extractTitle(jsonLd, removeTextHighlightingFromTitle),

package/dist/esm/state/hooks/use-resolve/index.js

@@ -1,7 +1,9 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback } from 'react';
+import { isEntityPresent } from '@atlaskit/link-extractors';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../../constants';
 import { addMetadataToExperience } from '../../analytics';
 import useResponse from '../use-response';
@@ -36,7 +38,7 @@ var useResolve = function useResolve() {
               status: SmartLinkStatus.Pending,
               details: undefined
             }, details = _ref2.details;
-            hasData = !!(details && details.data);
+            hasData = fg('smart_links_noun_support') ? !!(details && details.data || isEntityPresent(details)) : !!(details && details.data);
             if (!(isReloading || !hasData || isMetadataRequest)) {
               _context.next = 9;
               break;

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: "36.8.0"
+  packageVersion: "36.8.2"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/esm/utils/mocks.js

@@ -79,17 +79,45 @@ var successfulResponseData = _objectSpread(_objectSpread({}, errorResponseData),
     href: 'https://www.ilovecheese.com'
   }
 });
-export var mocks = {
-  success: {
-    meta: {
-      visibility: 'public',
-      access: 'granted',
-      auth: [],
-      definitionId: 'd1',
-      key: 'object-provider'
-    },
-    data: successfulResponseData
+var jsonLdResponse = {
+  meta: {
+    visibility: 'public',
+    access: 'granted',
+    auth: [],
+    definitionId: 'd1',
+    key: 'object-provider'
   },
+  data: successfulResponseData
+};
+var nounDataResponse = {
+  nounData: {
+    id: 'I love cheese',
+    displayName: 'I love cheese',
+    url: 'https://some.url',
+    lastUpdatedAt: '2025-01-08T22:26:52.501Z',
+    thumbnail: {
+      externalUrl: 'https://www.ilovecheese.com'
+    },
+    'atlassian:design': {
+      liveEmbedUrl: 'https://www.ilovecheese.com',
+      type: 'FILE',
+      inspectUrl: 'https://www.ilovecheese.com',
+      iconUrl: 'https://www.ilovecheese.com'
+    }
+  }
+};
+export var mocks = {
+  success: _objectSpread({}, jsonLdResponse),
+  nounDataSuccess: _objectSpread(_objectSpread(_objectSpread({}, jsonLdResponse), nounDataResponse), {}, {
+    meta: _objectSpread(_objectSpread({}, jsonLdResponse.meta), {}, {
+      generator: {
+        name: 'I love cheese',
+        icon: {
+          url: 'https://www.ilovecheese.com'
+        }
+      }
+    })
+  }),
   notFound: {
     meta: {
       visibility: 'not_found',

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

@@ -7,7 +7,7 @@ import { extractEmbedProps } from '../../extractors/embed';
 import { extractInlineProps } from '../../extractors/inline';
 import { getExtensionKey, hasAuthScopeOverrides } from '../../state/helpers';
 import { useControlDataExportConfig } from '../../state/hooks/use-control-data-export-config';
-import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
+import { getForbiddenJsonLd } from '../../utils/jsonld';
 import { getIsDataExportEnabled } from '../../utils/should-data-export';
 import BlockCardResolvedView from '../BlockCard/views/ResolvedView';
 import { InlineCardResolvedView } from '../InlineCard/ResolvedView';
@@ -39,8 +39,6 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var status = cardState.status,
     details = cardState.details;
-  var data = details && details.data || getEmptyJsonLd();
-  var meta = details && details.meta;
   var extensionKey = getExtensionKey(details);
   var isProductIntegrationSupported = hasAuthScopeOverrides(details);
   var _useControlDataExport = useControlDataExportConfig(),
@@ -60,7 +58,7 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
         testId: testId ? "".concat(testId, "-resolving-view") : 'embed-card-resolving-view'
       });
     case 'resolved':
-      var resolvedViewProps = extractEmbedProps(data, meta, platform, iframeUrlType);
+      var resolvedViewProps = extractEmbedProps(details, platform, iframeUrlType);
       if (onResolve) {
         var _resolvedViewProps$pr;
         onResolve({
@@ -71,7 +69,7 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
       }
       if (fg('platform_smart_links_controlled_dsp_export_view')) {
         if (getIsDataExportEnabled(shouldControlDataExport, cardState.details)) {
-          var unauthViewProps = extractEmbedProps(data, meta, platform);
+          var unauthViewProps = extractEmbedProps(details, platform);
           return /*#__PURE__*/React.createElement(UnauthorizedView, {
             context: unauthViewProps.context,
             extensionKey: extensionKey,
@@ -99,7 +97,7 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
         }));
       } else {
         if (platform === 'mobile') {
-          var resolvedInlineViewProps = extractInlineProps(data);
+          var resolvedInlineViewProps = extractInlineProps(details);
           return /*#__PURE__*/React.createElement(InlineCardResolvedView, _extends({}, resolvedInlineViewProps, {
             isSelected: isSelected,
             testId: testId,
@@ -124,7 +122,7 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
           status: status
         });
       }
-      var unauthorisedViewProps = extractEmbedProps(data, meta, platform);
+      var unauthorisedViewProps = extractEmbedProps(details, platform);
       return /*#__PURE__*/React.createElement(UnauthorizedView, {
         context: unauthorisedViewProps.context,
         extensionKey: extensionKey,
@@ -144,7 +142,7 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
           status: status
         });
       }
-      var forbiddenViewProps = extractEmbedProps(data, meta, platform);
+      var forbiddenViewProps = extractEmbedProps(details, platform);
       var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
       if (forbiddenViewProps.preview) {
         return /*#__PURE__*/React.createElement(EmbedCardResolvedView, _extends({}, forbiddenViewProps, {
@@ -179,7 +177,7 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
           status: status
         });
       }
-      var notFoundViewProps = extractEmbedProps(data, meta, platform);
+      var notFoundViewProps = extractEmbedProps(details, platform);
       var notFoundAccessContext = details !== null && details !== void 0 && details.meta ? extractRequestAccessContextImproved({
         jsonLd: details === null || details === void 0 ? void 0 : details.meta,
         url: url,

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

@@ -1,8 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { useFeatureFlag } from '@atlaskit/link-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../constants';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { extractInlineProps } from '../../extractors/inline';
@@ -46,7 +47,7 @@ export var InlineCard = function InlineCard(_ref) {
   if (showHoverPreview === undefined && showHoverPreviewFlag !== undefined) {
     showHoverPreview = Boolean(showHoverPreviewFlag);
   }
-  var resolvedProps = status === SmartLinkStatus.Resolved ? extractInlineProps(cardDetails, renderers, removeTextHighlightingFromTitle, false) : {};
+  var resolvedProps = status === SmartLinkStatus.Resolved ? extractInlineProps(details, renderers, removeTextHighlightingFromTitle, false) : {};
   useEffect(function () {
     switch (status) {
       case SmartLinkStatus.Resolved:
@@ -95,7 +96,7 @@ export var InlineCard = function InlineCard(_ref) {
         truncateInline: truncateInline
       }));
     case 'unauthorized':
-      var provider = extractProvider(cardDetails);
+      var provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(cardDetails);
       return /*#__PURE__*/React.createElement(InlineCardUnauthorizedView, {
         icon: provider && provider.icon,
         context: provider && provider.text,
@@ -110,7 +111,7 @@ export var InlineCard = function InlineCard(_ref) {
         truncateInline: truncateInline
       });
     case 'forbidden':
-      var providerForbidden = extractProvider(cardDetails);
+      var providerForbidden = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(cardDetails);
       var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
       var requestAccessContext = extractRequestAccessContextImproved({
         jsonLd: cardMetadata,
@@ -131,7 +132,7 @@ export var InlineCard = function InlineCard(_ref) {
         truncateInline: truncateInline
       });
     case 'not_found':
-      var providerNotFound = extractProvider(cardDetails);
+      var providerNotFound = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(cardDetails);
       return /*#__PURE__*/React.createElement(InlineCardErroredView, {
         url: url,
         icon: providerNotFound && providerNotFound.icon,

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

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

package/dist/types/extractors/embed/index.d.ts

@@ -1,4 +1,4 @@
-import { type JsonLd } from '@atlaskit/json-ld-types';
+import { SmartLinkResponse } from '@atlaskit/linking-types';
 import { type CardPlatform, type EmbedIframeUrlType } from '../../view/Card/types';
 import { type EmbedCardResolvedViewProps } from '../../view/EmbedCard/views/ResolvedView';
-export declare const extractEmbedProps: (jsonLd: JsonLd.Data.BaseData, meta?: JsonLd.Meta.BaseMeta, platform?: CardPlatform, iframeUrlType?: EmbedIframeUrlType) => EmbedCardResolvedViewProps;
+export declare const extractEmbedProps: (response?: SmartLinkResponse, platform?: CardPlatform, iframeUrlType?: EmbedIframeUrlType) => EmbedCardResolvedViewProps;

package/dist/types/extractors/inline/index.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="react" />
-import { type JsonLd } from '@atlaskit/json-ld-types';
 import { type CardProviderRenderers } from '@atlaskit/link-provider';
+import { SmartLinkResponse } from '@atlaskit/linking-types';
 import { type InlineCardResolvedViewProps } from '../../view/InlineCard/ResolvedView';
-export declare const extractInlineIcon: (jsonLd: JsonLd.Data.BaseData, showIconLabel?: boolean) => import("react").ReactNode;
-export declare const extractInlineProps: (jsonLd: JsonLd.Data.BaseData, renderers?: CardProviderRenderers, removeTextHighlightingFromTitle?: boolean, showLabel?: boolean) => InlineCardResolvedViewProps;
+export declare const extractInlineProps: (response?: SmartLinkResponse, renderers?: CardProviderRenderers, removeTextHighlightingFromTitle?: boolean, showLabel?: boolean) => InlineCardResolvedViewProps;

package/dist/types/utils/mocks.d.ts

@@ -1,4 +1,5 @@
 import { type JsonLd } from '@atlaskit/json-ld-types';
+import { SmartLinkResponse } from '@atlaskit/linking-types';
 export declare const mockContext: {
     readonly '@vocab': "https://www.w3.org/ns/activitystreams#";
     readonly atlassian: "https://schema.atlassian.com/ns/vocabulary#";
@@ -12,6 +13,7 @@ export declare const mockGenerator: {
 export declare const mockByUrl: (url: string) => JsonLd.Response<JsonLd.Data.BaseData>;
 export declare const mocks: {
     success: JsonLd.Response<JsonLd.Data.BaseData>;
+    nounDataSuccess: SmartLinkResponse;
     notFound: JsonLd.Response<JsonLd.Data.BaseData>;
     forbidden: JsonLd.Response<JsonLd.Data.BaseData>;
     forbiddenWithNoAuth: JsonLd.Response<JsonLd.Data.BaseData>;

package/dist/types/view/EmbedCard/views/ResolvedView.d.ts

@@ -13,7 +13,7 @@ export interface EmbedCardResolvedViewProps {
     frameStyle?: FrameStyle;
     /** The src to be used for the `iframe` */
     preview?: {
-        src: string;
+        src?: string;
         aspectRatio?: number;
     };
     /** A flag that determines whether link source can be trusted in iframe **/

package/dist/types-ts4.5/extractors/embed/index.d.ts

@@ -1,4 +1,4 @@
-import { type JsonLd } from '@atlaskit/json-ld-types';
+import { SmartLinkResponse } from '@atlaskit/linking-types';
 import { type CardPlatform, type EmbedIframeUrlType } from '../../view/Card/types';
 import { type EmbedCardResolvedViewProps } from '../../view/EmbedCard/views/ResolvedView';
-export declare const extractEmbedProps: (jsonLd: JsonLd.Data.BaseData, meta?: JsonLd.Meta.BaseMeta, platform?: CardPlatform, iframeUrlType?: EmbedIframeUrlType) => EmbedCardResolvedViewProps;
+export declare const extractEmbedProps: (response?: SmartLinkResponse, platform?: CardPlatform, iframeUrlType?: EmbedIframeUrlType) => EmbedCardResolvedViewProps;

package/dist/types-ts4.5/extractors/inline/index.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="react" />
-import { type JsonLd } from '@atlaskit/json-ld-types';
 import { type CardProviderRenderers } from '@atlaskit/link-provider';
+import { SmartLinkResponse } from '@atlaskit/linking-types';
 import { type InlineCardResolvedViewProps } from '../../view/InlineCard/ResolvedView';
-export declare const extractInlineIcon: (jsonLd: JsonLd.Data.BaseData, showIconLabel?: boolean) => import("react").ReactNode;
-export declare const extractInlineProps: (jsonLd: JsonLd.Data.BaseData, renderers?: CardProviderRenderers, removeTextHighlightingFromTitle?: boolean, showLabel?: boolean) => InlineCardResolvedViewProps;
+export declare const extractInlineProps: (response?: SmartLinkResponse, renderers?: CardProviderRenderers, removeTextHighlightingFromTitle?: boolean, showLabel?: boolean) => InlineCardResolvedViewProps;

package/dist/types-ts4.5/utils/mocks.d.ts

@@ -1,4 +1,5 @@
 import { type JsonLd } from '@atlaskit/json-ld-types';
+import { SmartLinkResponse } from '@atlaskit/linking-types';
 export declare const mockContext: {
     readonly '@vocab': "https://www.w3.org/ns/activitystreams#";
     readonly atlassian: "https://schema.atlassian.com/ns/vocabulary#";
@@ -12,6 +13,7 @@ export declare const mockGenerator: {
 export declare const mockByUrl: (url: string) => JsonLd.Response<JsonLd.Data.BaseData>;
 export declare const mocks: {
     success: JsonLd.Response<JsonLd.Data.BaseData>;
+    nounDataSuccess: SmartLinkResponse;
     notFound: JsonLd.Response<JsonLd.Data.BaseData>;
     forbidden: JsonLd.Response<JsonLd.Data.BaseData>;
     forbiddenWithNoAuth: JsonLd.Response<JsonLd.Data.BaseData>;

package/dist/types-ts4.5/view/EmbedCard/views/ResolvedView.d.ts

@@ -13,7 +13,7 @@ export interface EmbedCardResolvedViewProps {
     frameStyle?: FrameStyle;
     /** The src to be used for the `iframe` */
     preview?: {
-        src: string;
+        src?: string;
         aspectRatio?: number;
     };
     /** A flag that determines whether link source can be trusted in iframe **/

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "36.8.0",
+	"version": "36.8.2",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -41,8 +41,8 @@
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/icon-file-type": "^7.0.0",
-		"@atlaskit/icon-lab": "^4.8.0",
-		"@atlaskit/icon-object": "^7.0.0",
+		"@atlaskit/icon-lab": "^4.9.0",
+		"@atlaskit/icon-object": "^7.1.0",
 		"@atlaskit/icon-priority": "^6.3.0",
 		"@atlaskit/image": "^3.0.0",
 		"@atlaskit/json-ld-types": "^1.1.0",
@@ -50,16 +50,16 @@
 		"@atlaskit/link": "^3.1.0",
 		"@atlaskit/link-analytics": "^9.1.0",
 		"@atlaskit/link-client-extension": "^4.0.0",
-		"@atlaskit/link-extractors": "^2.1.0",
+		"@atlaskit/link-extractors": "^2.2.0",
 		"@atlaskit/linking-common": "^8.0.0",
-		"@atlaskit/linking-types": "^9.8.0",
+		"@atlaskit/linking-types": "^9.9.0",
 		"@atlaskit/logo": "^16.0.0",
 		"@atlaskit/lozenge": "^12.2.0",
 		"@atlaskit/menu": "^3.2.0",
 		"@atlaskit/modal-dialog": "^14.1.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/popup": "^4.0.0",
+		"@atlaskit/popup": "^4.1.0",
 		"@atlaskit/primitives": "^14.4.0",
 		"@atlaskit/section-message": "^8.2.0",
 		"@atlaskit/select": "^20.3.0",
@@ -97,7 +97,7 @@
 		"@atlaskit/css-reset": "^7.2.0",
 		"@atlaskit/link-test-helpers": "^8.0.0",
 		"@atlaskit/media-test-helpers": "^35.0.0",
-		"@atlaskit/react-ufo": "^3.5.0",
+		"@atlaskit/react-ufo": "^3.6.0",
 		"@atlaskit/ssr": "^0.4.0",
 		"@atlaskit/visual-regression": "^0.10.0",
 		"@atlassian/analytics-tooling": "^0.5.0",
@@ -223,6 +223,9 @@
 		},
 		"platform-linking-flexible-card-openness": {
 			"type": "boolean"
+		},
+		"smart_links_noun_support": {
+			"type": "boolean"
 		}
 	}
 }