@atlaskit/smart-card 36.9.0 → 36.10.0

package/dist/esm/utils/index.js

@@ -36,7 +36,7 @@ export var getIconForFileType = function getIconForFileType(fileMimeType) {
   if (!fileMimeType) {
     return;
   }
-  var icon = fg('platform-smart-card-icon-migration') ? getTypeToIconMap(fileMimeType.toLowerCase()) : typeToIcon[fileMimeType.toLowerCase()];
+  var icon = getTypeToIconMap(fileMimeType.toLowerCase());
   if (!icon) {
     return;
   }
@@ -63,7 +63,7 @@ export var getIconForFileType = function getIconForFileType(fileMimeType) {
   });
 };
 export var getLabelForFileType = function getLabelForFileType(fileMimeType) {
-  var icon = fg('platform-smart-card-icon-migration') ? getTypeToIconMap(fileMimeType.toLowerCase()) : typeToIcon[fileMimeType.toLowerCase()];
+  var icon = getTypeToIconMap(fileMimeType.toLowerCase());
   if (!icon) {
     return;
   }
@@ -71,160 +71,6 @@ export var getLabelForFileType = function getLabelForFileType(fileMimeType) {
     label = _icon2[0];
   return label;
 };
-var typeToIcon = {
-  'text/plain': ['Document', function () {
-    return import('@atlaskit/icon-file-type/glyph/document/16');
-  }],
-  'application/vnd.oasis.opendocument.text': ['Document', function () {
-    return import('@atlaskit/icon-file-type/glyph/document/16');
-  }],
-  'application/vnd.apple.pages': ['Document', function () {
-    return import('@atlaskit/icon-file-type/glyph/document/16');
-  }],
-  'application/vnd.google-apps.document': ['Google Doc', function () {
-    return import('@atlaskit/icon-file-type/glyph/google-doc/16');
-  }],
-  'application/msword': ['Word document', function () {
-    return import('@atlaskit/icon-file-type/glyph/word-document/16');
-  }],
-  'application/vnd.openxmlformats-officedocument.wordprocessingml.document': ['Word document', function () {
-    return import('@atlaskit/icon-file-type/glyph/word-document/16');
-  }],
-  'application/pdf': ['PDF document', function () {
-    return import('@atlaskit/icon-file-type/glyph/pdf-document/16');
-  }],
-  'application/vnd.oasis.opendocument.spreadsheet': ['Spreadsheet', function () {
-    return import('@atlaskit/icon-file-type/glyph/spreadsheet/16');
-  }],
-  'application/vnd.apple.numbers': ['Spreadsheet', function () {
-    return import('@atlaskit/icon-file-type/glyph/spreadsheet/16');
-  }],
-  'application/vnd.google-apps.spreadsheet': ['Google Sheet', function () {
-    return import('@atlaskit/icon-file-type/glyph/google-sheet/16');
-  }],
-  'application/vnd.ms-excel': ['Excel spreadsheet', function () {
-    return import('@atlaskit/icon-file-type/glyph/excel-spreadsheet/16');
-  }],
-  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['Excel spreadsheet', function () {
-    return import('@atlaskit/icon-file-type/glyph/excel-spreadsheet/16');
-  }],
-  'application/vnd.oasis.opendocument.presentation': ['Presentation', function () {
-    return import('@atlaskit/icon-file-type/glyph/presentation/16');
-  }],
-  'application/vnd.apple.keynote': ['Presentation', function () {
-    return import('@atlaskit/icon-file-type/glyph/presentation/16');
-  }],
-  'application/vnd.google-apps.presentation': ['Google Slide', function () {
-    return import('@atlaskit/icon-file-type/glyph/google-slide/16');
-  }],
-  'application/vnd.ms-powerpoint': ['PowerPoint presentation', function () {
-    return import('@atlaskit/icon-file-type/glyph/powerpoint-presentation/16');
-  }],
-  'application/vnd.openxmlformats-officedocument.presentationml.presentation': ['PowerPoint presentation', function () {
-    return import('@atlaskit/icon-file-type/glyph/powerpoint-presentation/16');
-  }],
-  'application/vnd.google-apps.form': ['Google Form', function () {
-    return import('@atlaskit/icon-file-type/glyph/google-form/16');
-  }],
-  'image/png': ['Image', function () {
-    return import('@atlaskit/icon-file-type/glyph/image/16');
-  }],
-  'image/jpeg': ['Image', function () {
-    return import('@atlaskit/icon-file-type/glyph/image/16');
-  }],
-  'image/bmp': ['Image', function () {
-    return import('@atlaskit/icon-file-type/glyph/image/16');
-  }],
-  'image/webp': ['Image', function () {
-    return import('@atlaskit/icon-file-type/glyph/image/16');
-  }],
-  'image/svg+xml': ['Image', function () {
-    return import('@atlaskit/icon-file-type/glyph/image/16');
-  }],
-  'image/gif': ['GIF', function () {
-    return import('@atlaskit/icon-file-type/glyph/gif/16');
-  }],
-  'audio/midi': ['Audio', function () {
-    return import('@atlaskit/icon-file-type/glyph/audio/16');
-  }],
-  'audio/mpeg': ['Audio', function () {
-    return import('@atlaskit/icon-file-type/glyph/audio/16');
-  }],
-  'audio/webm': ['Audio', function () {
-    return import('@atlaskit/icon-file-type/glyph/audio/16');
-  }],
-  'audio/ogg': ['Audio', function () {
-    return import('@atlaskit/icon-file-type/glyph/audio/16');
-  }],
-  'audio/wav': ['Audio', function () {
-    return import('@atlaskit/icon-file-type/glyph/audio/16');
-  }],
-  'video/mp4': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'video/quicktime': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'video/mov': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'video/webm': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'video/ogg': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'video/x-ms-wmv': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'video/x-msvideo': ['Video', function () {
-    return import('@atlaskit/icon-file-type/glyph/video/16');
-  }],
-  'application/zip': ['Archive', function () {
-    return import('@atlaskit/icon-file-type/glyph/archive/16');
-  }],
-  'application/x-tar': ['Archive', function () {
-    return import('@atlaskit/icon-file-type/glyph/archive/16');
-  }],
-  'application/x-gtar': ['Archive', function () {
-    return import('@atlaskit/icon-file-type/glyph/archive/16');
-  }],
-  'application/x-7z-compressed': ['Archive', function () {
-    return import('@atlaskit/icon-file-type/glyph/archive/16');
-  }],
-  'application/x-apple-diskimage': ['Archive', function () {
-    return import('@atlaskit/icon-file-type/glyph/archive/16');
-  }],
-  'application/vnd.rar': ['Archive', function () {
-    return import('@atlaskit/icon-file-type/glyph/archive/16');
-  }],
-  'application/dmg': ['Executable', function () {
-    return import('@atlaskit/icon-file-type/glyph/executable/16');
-  }],
-  'text/css': ['Source Code', function () {
-    return import('@atlaskit/icon-file-type/glyph/source-code/16');
-  }],
-  'text/html': ['Source Code', function () {
-    return import('@atlaskit/icon-file-type/glyph/source-code/16');
-  }],
-  'application/javascript': ['Source Code', function () {
-    return import('@atlaskit/icon-file-type/glyph/source-code/16');
-  }],
-  'application/octet-stream': ['Binary file', function () {
-    return import('@atlaskit/icon-file-type/glyph/generic/16');
-  }],
-  'application/invision.prototype': ['Prototype', function () {
-    return import('@atlaskit/icon-file-type/glyph/generic/16');
-  }],
-  // TODO: Figure a way to detect those
-  'application/sketch': ['Sketch', function () {
-    return import('@atlaskit/icon-file-type/glyph/sketch/16');
-  }],
-  folder: ['Folder', function () {
-    return import('@atlaskit/icon-file-type/glyph/folder/16');
-  }]
-};
-
 // prettier-ignore
 export var getLazyIcons = function getLazyIcons() {
   var _ref3;

package/dist/esm/utils/mocks.js

@@ -108,7 +108,17 @@ var nounDataResponse = {
 };
 export var mocks = {
   success: _objectSpread({}, jsonLdResponse),
-  nounDataSuccess: _objectSpread(_objectSpread(_objectSpread({}, jsonLdResponse), nounDataResponse), {}, {
+  nounDataSuccess: _objectSpread(_objectSpread({}, jsonLdResponse), {}, {
+    data: _objectSpread(_objectSpread({}, jsonLdResponse.data), {}, {
+      generator: {
+        '@type': 'Application',
+        icon: {
+          "@type": 'Image',
+          url: 'https://www.ilovecheese.com'
+        },
+        name: 'I love cheese'
+      }
+    }),
     meta: _objectSpread(_objectSpread({}, jsonLdResponse.meta), {}, {
       generator: {
         name: 'I love cheese',
@@ -117,7 +127,7 @@ export var mocks = {
         }
       }
     })
-  }),
+  }, nounDataResponse),
   notFound: {
     meta: {
       visibility: 'not_found',

package/dist/esm/view/BlockCard/views/ErroredView.js

@@ -3,9 +3,6 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["testId"];
 import React, { useMemo } from 'react';
 import WarningIcon from '@atlaskit/icon/core/migration/warning';
-import LegacyWarningIcon from '@atlaskit/icon/glyph/warning';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { R300 } from '@atlaskit/theme/colors';
 import { messages } from '../../../messages';
 import Text from '../../FlexibleCard/components/elements/text';
 import { RetryAction } from '../actions/RetryAction';
@@ -28,19 +25,11 @@ var ErroredView = function ErroredView(_ref) {
   return /*#__PURE__*/React.createElement(UnresolvedView, _extends({}, props, {
     actions: actions,
     testId: testId
-  }), fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(WarningIcon, {
+  }), /*#__PURE__*/React.createElement(WarningIcon, {
     label: "errored-warning-icon",
     color: "var(--ds-icon-warning, #E56910)",
     LEGACY_size: "small",
     testId: "".concat(testId, "-warning-icon")
-  }) :
-  /*#__PURE__*/
-  // eslint-disable-next-line @atlaskit/design-system/no-legacy-icons -- TODO - https://product-fabric.atlassian.net/browse/DSP-19497
-  React.createElement(LegacyWarningIcon, {
-    label: "errored-warning-icon",
-    size: "small",
-    primaryColor: "var(--ds-icon-warning, ".concat(R300, ")"),
-    testId: "".concat(testId, "-warning-icon")
   }), /*#__PURE__*/React.createElement(Text, {
     maxLines: 3,
     message: {

package/dist/esm/view/BlockCard/views/ForbiddenView.js

@@ -11,9 +11,8 @@ import { useIntl } from 'react-intl-next';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import LockLockedIcon from '@atlaskit/icon/core/lock-locked';
 import LegacyLockIcon from '@atlaskit/icon/glyph/lock';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { R300 } from '@atlaskit/theme/colors';
 import { extractRequestAccessContextImproved } from '../../../extractors/common/context/extractAccessContext';
 import extractHostname from '../../../extractors/common/hostname/extractHostname';
 import { messages } from '../../../messages';
@@ -45,7 +44,7 @@ var ForbiddenView = function ForbiddenView(_ref) {
     url = props.url;
   var details = cardState === null || cardState === void 0 ? void 0 : cardState.details;
   var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
-  var provider = extractProvider(details === null || details === void 0 ? void 0 : details.data);
+  var provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(details === null || details === void 0 ? void 0 : details.data);
   var providerName = (provider === null || provider === void 0 ? void 0 : provider.text) || '';
   var messageContext = useMemo(function () {
     var hostname = /*#__PURE__*/React.createElement("b", null, extractHostname(url));
@@ -83,20 +82,12 @@ var ForbiddenView = function ForbiddenView(_ref) {
     showPreview: true,
     testId: testId,
     title: title
-  }), fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(LockLockedIcon, {
+  }), /*#__PURE__*/React.createElement(LockLockedIcon, {
     label: "forbidden-lock-icon",
     color: "var(--ds-icon-danger, #C9372C)",
     LEGACY_fallbackIcon: LegacyLockIcon,
     LEGACY_size: "small",
     testId: "".concat(testId, "-lock-icon")
-  }) :
-  /*#__PURE__*/
-  // eslint-disable-next-line @atlaskit/design-system/no-legacy-icons -- TODO - https://product-fabric.atlassian.net/browse/DSP-19497
-  React.createElement(LegacyLockIcon, {
-    label: "forbidden-lock-icon",
-    size: "small",
-    primaryColor: "var(--ds-icon-danger, ".concat(R300, ")"),
-    testId: "".concat(testId, "-lock-icon")
   }), /*#__PURE__*/React.createElement(Text, {
     maxLines: 3,
     message: {

package/dist/esm/view/BlockCard/views/NotFoundView.js

@@ -9,9 +9,8 @@ import { useMemo } from 'react';
 import { useIntl } from 'react-intl-next';
 import LockLockedIcon from '@atlaskit/icon/core/lock-locked';
 import LegacyLockIcon from '@atlaskit/icon/glyph/lock';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { R300 } from '@atlaskit/theme/colors';
 import { messages } from '../../../messages';
 import Text from '../../FlexibleCard/components/elements/text';
 import UnresolvedView from './unresolved-view';
@@ -25,17 +24,16 @@ var textStyles = null;
  * @see FlexibleCardProps
  */
 var NotFoundView = function NotFoundView(_ref) {
-  var _cardState$details2;
   var _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? 'smart-block-not-found-view' : _ref$testId,
     props = _objectWithoutProperties(_ref, _excluded);
   var intl = useIntl();
-  var cardState = props.cardState;
+  var details = props.cardState.details;
   var product = useMemo(function () {
-    var _cardState$details, _provider$text;
-    var provider = extractProvider(cardState === null || cardState === void 0 || (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data);
+    var _provider$text;
+    var provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(details === null || details === void 0 ? void 0 : details.data);
     return (_provider$text = provider === null || provider === void 0 ? void 0 : provider.text) !== null && _provider$text !== void 0 ? _provider$text : '';
-  }, [cardState === null || cardState === void 0 || (_cardState$details2 = cardState.details) === null || _cardState$details2 === void 0 ? void 0 : _cardState$details2.data]);
+  }, [details]);
   var title = useMemo(function () {
     return intl.formatMessage(messages.not_found_title, {
       product: product
@@ -49,20 +47,12 @@ var NotFoundView = function NotFoundView(_ref) {
   return /*#__PURE__*/React.createElement(UnresolvedView, _extends({}, props, {
     testId: testId,
     title: title
-  }), fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(LockLockedIcon, {
+  }), /*#__PURE__*/React.createElement(LockLockedIcon, {
     label: "not-found-lock-icon",
     color: "var(--ds-icon-danger, #C9372C)",
     LEGACY_fallbackIcon: LegacyLockIcon,
     LEGACY_size: "small",
     testId: "".concat(testId, "-lock-icon")
-  }) :
-  /*#__PURE__*/
-  // eslint-disable-next-line @atlaskit/design-system/no-legacy-icons -- TODO - https://product-fabric.atlassian.net/browse/DSP-19497
-  React.createElement(LegacyLockIcon, {
-    label: "not-found-lock-icon",
-    size: "small",
-    primaryColor: "var(--ds-icon-danger, ".concat(R300, ")"),
-    testId: "".concat(testId, "-lock-icon")
   }), /*#__PURE__*/React.createElement(Text, {
     message: description,
     testId: "".concat(testId, "-message"),

package/dist/esm/view/BlockCard/views/UnauthorisedView.js

@@ -7,7 +7,7 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useMemo } from 'react';
 import { FormattedMessage } from 'react-intl-next';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
 import { messages } from '../../../messages';
@@ -27,15 +27,15 @@ var contentStyles = null;
  * @see FlexibleCardProps
  */
 var UnauthorisedView = function UnauthorisedView(_ref) {
-  var _cardState$details, _extractProvider;
+  var _cardState$details, _extractSmartLinkProv, _extractProvider;
   var _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? 'smart-block-unauthorized-view' : _ref$testId,
     props = _objectWithoutProperties(_ref, _excluded);
   var cardState = props.cardState,
     onAuthorize = props.onAuthorize;
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
-  var providerName = (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
-  var isProductIntegrationSupported = hasAuthScopeOverrides(cardState === null || cardState === void 0 ? void 0 : cardState.details);
+  var providerName = fg('smart_links_noun_support') ? (_extractSmartLinkProv = extractSmartLinkProvider(cardState.details)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text : (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
+  var isProductIntegrationSupported = hasAuthScopeOverrides(cardState.details);
   var _useAnalyticsEvents = useAnalyticsEvents(),
     fireEvent = _useAnalyticsEvents.fireEvent;
   var handleAuthorize = useCallback(function () {

package/dist/esm/view/FlexibleCard/components/blocks/title-block/resolved/index.js

@@ -5,7 +5,6 @@ var _excluded = ["actionGroup", "metadata", "position", "subtitle", "testId", "t
 import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkAlignment, SmartLinkDirection, SmartLinkPosition, SmartLinkWidth } from '../../../../../../constants';
 import { LinkIcon } from '../../../elements';
 import Block from '../../block';
@@ -37,12 +36,11 @@ var TitleBlockResolvedView = function TitleBlockResolvedView(_ref) {
   var subtitleElements = renderElementItems(subtitle);
   return /*#__PURE__*/React.createElement(Block, _extends({}, blockProps, {
     testId: "".concat(testId, "-resolved-view")
-  }), !hideIcon && /*#__PURE__*/React.createElement(LinkIcon, _extends({
+  }), !hideIcon && /*#__PURE__*/React.createElement(LinkIcon, {
     overrideIcon: icon,
-    position: position
-  }, fg('platform-smart-card-icon-migration') && {
+    position: position,
     size: size
-  })), /*#__PURE__*/React.createElement(ElementGroup, {
+  }), /*#__PURE__*/React.createElement(ElementGroup, {
     direction: SmartLinkDirection.Vertical,
     width: SmartLinkWidth.Flexible,
     size: blockProps.size,

package/dist/esm/view/FlexibleCard/components/blocks/title-block/resolving/index.js

@@ -1,24 +1,12 @@
-/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["actionGroup", "testId", "title", "hideIcon"];
-import "./index.compiled.css";
-import * as React from 'react';
-import { ax, ix } from "@compiled/react/runtime";
 /* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
-
-import { fg } from '@atlaskit/platform-feature-flags';
+import React from 'react';
 import { SmartLinkSize } from '../../../../../../constants';
-import { LoadingSkeletonNew, LoadingSkeletonOld } from '../../../common/loading-skeleton';
+import { LoadingSkeleton } from '../../../common/loading-skeleton';
 import { getIconWidthNew } from '../../../utils';
 import Block from '../../block';
-var iconStyle = {
-  xlarge: "_16jlidpf _1o9zidpf _i0dl1wug _4t3iviql _1tkeviql _c71lviql _1bsbviql _1ul9viql _p12fviql _i2i3idpf _uhasidpf _5jw9idpf _7wy9idpf _bna7viql _1xjxviql _1752viql _qci8viql _15izviql _erubviql _19l3viql _1pr2viql _1u5tviql _mezjviql _e2ooviql _w8l5viql _1rg2viql _q7cvviql _xwbjviql _rtysviql _b8nkviql _4x20viql",
-  large: "_16jlidpf _1o9zidpf _i0dl1wug _4t3i1k8s _1tke1k8s _c71l1k8s _1bsb1k8s _1ul91k8s _p12f1k8s _i2i3idpf _uhasidpf _5jw9idpf _7wy9idpf _bna71k8s _1xjx1k8s _17521k8s _qci81k8s _15iz1k8s _erub1k8s _19l31k8s _1pr21k8s _1u5t1k8s _mezj1k8s _e2oo1k8s _w8l51k8s _1rg21k8s _q7cv1k8s _xwbj1k8s _rtys1k8s _b8nk1k8s _4x201k8s",
-  medium: "_16jlidpf _1o9zidpf _i0dl1wug _4t3i1j6v _1tke1j6v _c71l1j6v _1bsb1j6v _1ul91j6v _p12f1j6v _i2i3idpf _uhasidpf _5jw9idpf _7wy9idpf _bna71j6v _1xjx1j6v _17521j6v _qci81j6v _15iz1j6v _erub1j6v _19l31j6v _1pr21j6v _1u5t1j6v _mezj1j6v _e2oo1j6v _w8l51j6v _1rg21j6v _q7cv1j6v _xwbj1j6v _rtys1j6v _b8nk1j6v _4x201j6v",
-  small: "_16jlidpf _1o9zidpf _i0dl1wug _4t3ioqnp _1tkeoqnp _c71loqnp _1bsboqnp _1ul9oqnp _p12foqnp _i2i3idpf _uhasidpf _5jw9idpf _7wy9idpf _bna7oqnp _1xjxoqnp _1752oqnp _qci8oqnp _15izoqnp _eruboqnp _19l3oqnp _1pr2oqnp _1u5toqnp _mezjoqnp _e2oooqnp _w8l5oqnp _1rg2oqnp _q7cvoqnp _xwbjoqnp _rtysoqnp _b8nkoqnp _4x20oqnp"
-};
-
 /**
  * This represents a TitleBlock for a Smart Link that is currently waiting
  * for a request to finish.
@@ -33,28 +21,18 @@ var TitleBlockResolvingView = function TitleBlockResolvingView(_ref) {
     blockProps = _objectWithoutProperties(_ref, _excluded);
   var _blockProps$size = blockProps.size,
     size = _blockProps$size === void 0 ? SmartLinkSize.Medium : _blockProps$size;
-  if (fg('platform-smart-card-icon-migration')) {
-    var iconWidth = getIconWidthNew(size);
-    return /*#__PURE__*/React.createElement(Block, _extends({}, blockProps, {
-      testId: "".concat(testId, "-resolving-view")
-    }), !hideIcon && /*#__PURE__*/React.createElement("span", {
-      style: {
-        width: iconWidth,
-        height: iconWidth
-      },
-      "data-testid": "".concat(testId, "-icon")
-    }, /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
-      width: iconWidth,
-      height: iconWidth,
-      testId: "".concat(testId, "-icon-loading")
-    })), title, actionGroup);
-  }
+  var iconWidth = getIconWidthNew(size);
   return /*#__PURE__*/React.createElement(Block, _extends({}, blockProps, {
     testId: "".concat(testId, "-resolving-view")
   }), !hideIcon && /*#__PURE__*/React.createElement("span", {
-    "data-testid": "".concat(testId, "-icon"),
-    className: ax([iconStyle[size]])
-  }, /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
+    style: {
+      width: iconWidth,
+      height: iconWidth
+    },
+    "data-testid": "".concat(testId, "-icon")
+  }, /*#__PURE__*/React.createElement(LoadingSkeleton, {
+    width: iconWidth,
+    height: iconWidth,
     testId: "".concat(testId, "-icon-loading")
   })), title, actionGroup);
 };

package/dist/esm/view/FlexibleCard/components/common/image-icon/index.js

@@ -1,8 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import ImageLoader from 'react-render-image';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { LoadingSkeletonNew, LoadingSkeletonOld } from '../loading-skeleton';
+import { LoadingSkeleton } from '../loading-skeleton';
 var ImageIcon = function ImageIcon(_ref) {
   var defaultIcon = _ref.defaultIcon,
     testId = _ref.testId,
@@ -11,10 +9,9 @@ var ImageIcon = function ImageIcon(_ref) {
     height = _ref.height,
     onError = _ref.onError,
     onLoad = _ref.onLoad;
-  return /*#__PURE__*/React.createElement(ImageLoader, _extends({
-    src: url
-  }, fg('platform-smart-card-icon-migration') ? {
-    loading: /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  return /*#__PURE__*/React.createElement(ImageLoader, {
+    src: url,
+    loading: /*#__PURE__*/React.createElement(LoadingSkeleton, {
       testId: "".concat(testId, "-loading"),
       width: width,
       height: height
@@ -27,20 +24,10 @@ var ImageIcon = function ImageIcon(_ref) {
         width: width,
         height: height
       }
-    })
-  } : {
-    loading: /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-      testId: "".concat(testId, "-loading")
     }),
-    loaded: /*#__PURE__*/React.createElement("img", {
-      src: url,
-      "data-testid": "".concat(testId, "-image"),
-      alt: ""
-    })
-  }, {
     errored: defaultIcon,
     onError: onError,
     onLoad: onLoad
-  }));
+  });
 };
 export default ImageIcon;

package/dist/esm/view/FlexibleCard/components/common/loading-skeleton/index.js

@@ -1,11 +1,10 @@
 /* index.tsx generated by @compiled/babel-plugin v0.36.1 */
-import _extends from "@babel/runtime/helpers/extends";
 import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 var animationNameStyles = null;
 var loadingSkeletonStyle = null;
-var LoadingSkeletonNew = function LoadingSkeletonNew(_ref) {
+export var LoadingSkeleton = function LoadingSkeleton(_ref) {
   var testId = _ref.testId,
     width = _ref.width,
     height = _ref.height;
@@ -18,11 +17,4 @@ var LoadingSkeletonNew = function LoadingSkeletonNew(_ref) {
       "--_16116mi": ix("linear-gradient( to right, transparent 0%, ".concat("var(--ds-skeleton, #edeef1)", " 20%, transparent 40%, transparent 100% )"))
     }
   });
-};
-var LoadingSkeletonOld = function LoadingSkeletonOld(props) {
-  return /*#__PURE__*/React.createElement(LoadingSkeletonNew, _extends({}, props, {
-    width: "".concat(props.width, "rem"),
-    height: "".concat(props.height, "rem")
-  }));
-};
-export { LoadingSkeletonOld, LoadingSkeletonNew };
+};

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

@@ -1,11 +1,11 @@
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider, isEntityPresent } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../constants';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context';
 import extractFlexibleUiContext from '../../extractors/flexible';
-import extractPreview from '../../extractors/flexible/extract-preview';
+import extractPreview, { extractSmartLinkPreviewImage } from '../../extractors/flexible/extract-preview';
 import { extractErrorIcon } from '../../extractors/flexible/icon';
-import extractProviderIcon from '../../extractors/flexible/icon/extract-provider-icon';
+import extractProviderIcon, { extractSmartLinkProviderIcon } from '../../extractors/flexible/icon/extract-provider-icon';
 import { messages } from '../../messages';
 import { handleOnClick } from '../../utils';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
@@ -29,15 +29,23 @@ export var getContextByStatus = function getContextByStatus(params) {
     case SmartLinkStatus.Errored:
     case SmartLinkStatus.Fallback:
     default:
-      var preview = extractPreview(response === null || response === void 0 ? void 0 : response.data);
-      var linkIcon = extractErrorIcon(response, status);
-      var provider = extractProviderIcon(response === null || response === void 0 ? void 0 : response.data);
+      if (fg('smart_links_noun_support')) {
+        if (isEntityPresent(response)) {
+          return {
+            url: url,
+            title: url,
+            linkIcon: extractErrorIcon(response, status),
+            preview: extractSmartLinkPreviewImage(response),
+            provider: extractSmartLinkProviderIcon(response)
+          };
+        }
+      }
       return {
-        linkIcon: linkIcon,
-        title: url,
         url: url,
-        provider: provider,
-        preview: preview
+        title: url,
+        linkIcon: extractErrorIcon(response, status),
+        preview: extractPreview(response === null || response === void 0 ? void 0 : response.data),
+        provider: extractProviderIcon(response === null || response === void 0 ? void 0 : response.data)
       };
   }
 };
@@ -62,7 +70,7 @@ var getForbiddenMessageKey = function getForbiddenMessageKey(meta) {
 export var getRetryOptions = function getRetryOptions(url, status, response, onAuthorize) {
   var _response$meta, _access$action, _access$buttonDisable;
   var data = response && response.data || getEmptyJsonLd();
-  var provider = extractProvider(data);
+  var provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(response) : extractProvider(data);
   var context = provider === null || provider === void 0 ? void 0 : provider.text;
   var values = context ? {
     context: context

package/dist/esm/view/HoverCard/components/views/resolving/index.js

@@ -3,10 +3,9 @@ import _extends from "@babel/runtime/helpers/extends";
 import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { CustomBlock } from '../../../../FlexibleCard/components/blocks';
 import ActionGroup from '../../../../FlexibleCard/components/blocks/action-group';
-import { LoadingSkeletonNew, LoadingSkeletonOld } from '../../../../FlexibleCard/components/common/loading-skeleton';
+import { LoadingSkeleton } from '../../../../FlexibleCard/components/common/loading-skeleton';
 import Icon from '../../../../FlexibleCard/components/elements/icon';
 import { CARD_WIDTH_REM } from '../../../styled';
 var loadingViewContainer = null;
@@ -24,7 +23,6 @@ var HoverCardLoadingView = function HoverCardLoadingView(_ref) {
     items: actions,
     visibleButtonsNum: 2
   });
-  var LoadingSkeleton = fg('platform-smart-card-icon-migration') ? LoadingSkeletonNew : LoadingSkeletonOld;
   return /*#__PURE__*/React.createElement("div", {
     "data-testid": testId,
     className: ax(["_1e0c1txw _2lx21bp4 _ca0q1e9d _u5f31e9d _n3td1e9d _19bv1e9d"])
@@ -41,28 +39,17 @@ var HoverCardLoadingView = function HoverCardLoadingView(_ref) {
   }), /*#__PURE__*/React.createElement("span", {
     "data-testid": "".concat(testId, "-title"),
     className: ax(["_16jlkb7n _1o9zidpf _i0dl1wug _4t3i1k92 _e2oo1osq"])
-  }, fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  }, /*#__PURE__*/React.createElement(LoadingSkeleton, {
     height: "".concat(lineHeightRem, "rem")
-  }) : /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    height: lineHeightRem
-  })), actionGroup), fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  })), actionGroup), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LoadingSkeleton, {
     width: "".concat(skeletonWidth, "rem"),
     height: "".concat(lineHeightRem, "rem")
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  }), /*#__PURE__*/React.createElement(LoadingSkeleton, {
     width: "".concat(skeletonWidth, "rem"),
     height: "".concat(lineHeightRem * 3, "rem")
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  }), /*#__PURE__*/React.createElement(LoadingSkeleton, {
     width: "".concat(skeletonWidth, "rem"),
     height: "".concat(lineHeightRem, "rem")
-  })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    width: skeletonWidth,
-    height: lineHeightRem
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    width: skeletonWidth,
-    height: lineHeightRem * 3
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    width: skeletonWidth,
-    height: lineHeightRem
   }))));
 };
 export default HoverCardLoadingView;