@atlaskit/smart-card 36.9.0 → 36.10.1

package/dist/es2019/extractors/flexible/icon/extract-provider-icon.js

@@ -1,4 +1,4 @@
-import { extractTitle } from '@atlaskit/link-extractors';
+import { extractEntity, extractEntityProvider, extractTitle, isEntityPresent } from '@atlaskit/link-extractors';
 import { IconType } from '../../../constants';
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../../constants';
 import extractUrlIcon from './extract-url-icon';
@@ -34,4 +34,44 @@ const extractProviderIcon = data => {
   }
   return extractUrlIcon(icon, label);
 };
-export default extractProviderIcon;
+export default extractProviderIcon;
+
+/**
+ * Should be moved to link-extractors when jsonLd is deprecated
+ */
+export const extractSmartLinkProviderIcon = response => {
+  var _extractEntity, _generator$icon;
+  if (!response || !(response !== null && response !== void 0 && response.data)) {
+    return undefined;
+  }
+  if (isEntityPresent(response)) {
+    const provider = extractEntityProvider(response);
+    if (!provider) {
+      return undefined;
+    }
+    switch (provider.id) {
+      case CONFLUENCE_GENERATOR_ID:
+        return {
+          icon: IconType.Confluence,
+          label: provider.text || 'Confluence'
+        };
+      case JIRA_GENERATOR_ID:
+        return {
+          icon: IconType.Jira,
+          label: provider.text || 'Jira'
+        };
+      default:
+        const {
+          generator
+        } = response.meta;
+        if (!generator) {
+          return undefined;
+        }
+        return {
+          label: generator.name || ((_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.displayName),
+          url: (_generator$icon = generator.icon) === null || _generator$icon === void 0 ? void 0 : _generator$icon.url
+        };
+    }
+  }
+  return extractProviderIcon(response.data);
+};

package/dist/es2019/extractors/flexible/icon/index.js

@@ -1,3 +1,4 @@
+import { extractEntityIcon, isEntityPresent } from '@atlaskit/link-extractors';
 import { IconType, SmartLinkStatus } from '../../../constants';
 import extractIconRenderer from './extract-icon-renderer';
 import extractJsonldDataIcon from './extract-jsonld-data-icon';
@@ -44,4 +45,17 @@ export const extractErrorIcon = (response, status) => {
         icon: IconType.Default
       };
   }
+};
+
+/**
+ * Should be moved to link-extractors when jsonLd is deprecated
+ */
+export const extractSmartLinkIcon = (response, renderers) => {
+  if (!response || !(response !== null && response !== void 0 && response.data)) {
+    return undefined;
+  }
+  if (isEntityPresent(response)) {
+    return extractEntityIcon(response);
+  }
+  return extractLinkIcon(response, renderers);
 };

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

@@ -1,15 +1,16 @@
-import { extractAri, extractDateCreated, extractDateUpdated, extractLink, extractPersonCreatedBy, extractPersonOwnedBy, extractTitle } from '@atlaskit/link-extractors';
+import { extractAri, extractDateCreated, extractDateUpdated, extractLink, extractPersonCreatedBy, extractPersonOwnedBy, extractSmartLinkAri, extractSmartLinkCreatedBy, extractSmartLinkCreatedOn, extractSmartLinkModifiedBy, extractSmartLinkModifiedOn, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { extractSummary } from '../common/primitives';
 import { extractFlexibleCardActions } from './actions';
 import { extractPersonsUpdatedBy } from './collaboratorGroup';
-import extractPreview from './extract-preview';
+import extractPreview, { extractSmartLinkPreviewImage } from './extract-preview';
 import extractPriority from './extract-priority';
 import extractState from './extract-state';
-import { extractLinkIcon } from './icon';
-import extractProviderIcon from './icon/extract-provider-icon';
+import { extractLinkIcon, extractSmartLinkIcon } from './icon';
+import extractProviderIcon, { extractSmartLinkProviderIcon } from './icon/extract-provider-icon';
 import { extractLatestCommit } from './latest-commit';
 import { extractAppliedToComponentsCount, extractAssignedTo, extractAttachmentCount, extractChecklistProgress, extractCommentCount, extractCreatedBy, extractDueOn, extractLocation, extractModifiedBy, extractOwnedBy, extractPersonAssignedToAsArray, extractProgrammingLanguage, extractReactCount, extractReadTime, extractSentOn, extractSourceBranch, extractStoryPoints, extractSubscriberCount, extractSubTasksProgress, extractTargetBranch, extractViewCount, extractVoteCount } from './utils';
-const extractFlexibleUiContext = ({
+const extractFlexibleUiContextFromJsonLd = ({
   appearance,
   fireEvent,
   id,
@@ -77,4 +78,73 @@ const extractFlexibleUiContext = ({
     ari: extractAri(data)
   };
 };
+const extractFlexibleUiContextFromEntity = ({
+  actionOptions,
+  appearance,
+  fireEvent,
+  id,
+  origin,
+  resolve,
+  response
+} = {}) => {
+  if (!response) {
+    return undefined;
+  }
+  const data = response.data;
+  const url = extractSmartLinkUrl(response);
+  return {
+    actions: extractFlexibleCardActions({
+      response,
+      actionOptions,
+      id,
+      appearance,
+      fireEvent
+    }),
+    url,
+    ari: extractSmartLinkAri(response),
+    title: extractSmartLinkTitle(response) || url,
+    linkIcon: extractSmartLinkIcon(response),
+    preview: extractSmartLinkPreviewImage(response),
+    provider: extractSmartLinkProviderIcon(response),
+    modifiedOn: extractSmartLinkModifiedOn(response),
+    createdOn: extractSmartLinkCreatedOn(response),
+    createdBy: extractSmartLinkCreatedBy(response),
+    modifiedBy: extractSmartLinkModifiedBy(response),
+    // We need to add/remove these as we support new entity types
+    assignedToGroup: extractPersonAssignedToAsArray(data),
+    appliedToComponentsCount: extractAppliedToComponentsCount(data),
+    attachmentCount: extractAttachmentCount(data),
+    authorGroup: extractPersonCreatedBy(data),
+    ownedByGroup: extractPersonOwnedBy(data),
+    collaboratorGroup: extractPersonsUpdatedBy(data),
+    commentCount: extractCommentCount(data),
+    viewCount: extractViewCount(data),
+    reactCount: extractReactCount(data),
+    voteCount: extractVoteCount(data),
+    checklistProgress: extractChecklistProgress(data),
+    ownedBy: extractOwnedBy(data),
+    assignedTo: extractAssignedTo(data),
+    dueOn: extractDueOn(data),
+    latestCommit: extractLatestCommit(data),
+    location: extractLocation(data),
+    priority: extractPriority(data),
+    programmingLanguage: extractProgrammingLanguage(data),
+    readTime: extractReadTime(data),
+    sentOn: extractSentOn(data),
+    snippet: extractSummary(data) || undefined,
+    // Explicitly set here to remove an empty string
+    sourceBranch: extractSourceBranch(data),
+    state: extractState(response, actionOptions, id, appearance, origin, fireEvent, resolve),
+    subscriberCount: extractSubscriberCount(data),
+    subTasksProgress: extractSubTasksProgress(data),
+    storyPoints: extractStoryPoints(data),
+    targetBranch: extractTargetBranch(data)
+  };
+};
+const extractFlexibleUiContext = (props = {}) => {
+  if (fg('smart_links_noun_support')) {
+    return extractFlexibleUiContextFromEntity(props);
+  }
+  return extractFlexibleUiContextFromJsonLd(props);
+};
 export default extractFlexibleUiContext;

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

@@ -16,6 +16,10 @@ const extractInlineIcon = (jsonLd, showIconLabel = true) => {
   }
   return extractIcon(jsonLd, 'provider', showIconLabel);
 };
+
+/**
+ * Should be moved to the smart link-extractor when jsonld is deprecated
+ */
 const extractSmartLinkInlineIcon = (response, showLabel = true) => {
   if (isEntityPresent(response)) {
     const provider = extractEntityProvider(response);
@@ -34,9 +38,9 @@ export const extractInlineProps = (response, renderers, removeTextHighlightingFr
   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),
+      icon: extractSmartLinkInlineIcon(response, showLabel),
       // As we migrate to support more nouns we can incorporate these fields
       lozenge: extractLozenge(jsonLd),
       titleTextColor: extractTitleTextColor(jsonLd),

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

package/dist/es2019/utils/index.js

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

package/dist/es2019/utils/mocks.js

@@ -101,7 +101,17 @@ export const mocks = {
   },
   nounDataSuccess: {
     ...jsonLdResponse,
-    ...nounDataResponse,
+    data: {
+      ...jsonLdResponse.data,
+      generator: {
+        '@type': 'Application',
+        icon: {
+          '@type': 'Image',
+          url: 'https://www.ilovecheese.com'
+        },
+        name: 'I love cheese'
+      }
+    },
     meta: {
       ...jsonLdResponse.meta,
       generator: {
@@ -110,7 +120,8 @@ export const mocks = {
           url: 'https://www.ilovecheese.com'
         }
       }
-    }
+    },
+    ...nounDataResponse
   },
   notFound: {
     meta: {

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

@@ -1,9 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 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';
@@ -24,19 +21,11 @@ const ErroredView = ({
   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: `${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, ${R300})`,
-    testId: `${testId}-warning-icon`
   }), /*#__PURE__*/React.createElement(Text, {
     maxLines: 3,
     message: {

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

@@ -8,9 +8,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 @@ const ForbiddenView = ({
   } = props;
   const details = cardState === null || cardState === void 0 ? void 0 : cardState.details;
   const cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
-  const provider = extractProvider(details === null || details === void 0 ? void 0 : details.data);
+  const provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(details === null || details === void 0 ? void 0 : details.data);
   const providerName = (provider === null || provider === void 0 ? void 0 : provider.text) || '';
   const messageContext = useMemo(() => {
     const hostname = /*#__PURE__*/React.createElement("b", null, extractHostname(url));
@@ -85,20 +84,12 @@ const ForbiddenView = ({
     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: `${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, ${R300})`,
-    testId: `${testId}-lock-icon`
   }), /*#__PURE__*/React.createElement(Text, {
     maxLines: 3,
     message: {

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

@@ -7,9 +7,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';
@@ -26,16 +25,17 @@ const NotFoundView = ({
   testId = 'smart-block-not-found-view',
   ...props
 }) => {
-  var _cardState$details2;
   const intl = useIntl();
   const {
-    cardState
+    cardState: {
+      details
+    }
   } = props;
   const product = useMemo(() => {
-    var _cardState$details, _provider$text;
-    const provider = extractProvider(cardState === null || cardState === void 0 ? void 0 : (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data);
+    var _provider$text;
+    const 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 ? void 0 : (_cardState$details2 = cardState.details) === null || _cardState$details2 === void 0 ? void 0 : _cardState$details2.data]);
+  }, [details]);
   const title = useMemo(() => intl.formatMessage(messages.not_found_title, {
     product
   }), [intl, product]);
@@ -45,20 +45,12 @@ const NotFoundView = ({
   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: `${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, ${R300})`,
-    testId: `${testId}-lock-icon`
   }), /*#__PURE__*/React.createElement(Text, {
     message: description,
     testId: `${testId}-message`,

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

@@ -5,7 +5,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';
@@ -28,14 +28,14 @@ const UnauthorisedView = ({
   testId = 'smart-block-unauthorized-view',
   ...props
 }) => {
-  var _cardState$details, _extractProvider;
+  var _cardState$details, _extractSmartLinkProv, _extractProvider;
   const {
     cardState,
     onAuthorize
   } = props;
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
-  const providerName = (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
-  const isProductIntegrationSupported = hasAuthScopeOverrides(cardState === null || cardState === void 0 ? void 0 : cardState.details);
+  const 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;
+  const isProductIntegrationSupported = hasAuthScopeOverrides(cardState.details);
   const {
     fireEvent
   } = useAnalyticsEvents();

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

@@ -3,7 +3,6 @@ import _extends from "@babel/runtime/helpers/extends";
 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';
@@ -36,12 +35,11 @@ const TitleBlockResolvedView = ({
   const subtitleElements = renderElementItems(subtitle);
   return /*#__PURE__*/React.createElement(Block, _extends({}, blockProps, {
     testId: `${testId}-resolved-view`
-  }), !hideIcon && /*#__PURE__*/React.createElement(LinkIcon, _extends({
+  }), !hideIcon && /*#__PURE__*/React.createElement(LinkIcon, {
     overrideIcon: icon,
-    position: position
-  }, fg('platform-smart-card-icon-migration') && {
-    size
-  })), /*#__PURE__*/React.createElement(ElementGroup, {
+    position: position,
+    size: size
+  }), /*#__PURE__*/React.createElement(ElementGroup, {
     direction: SmartLinkDirection.Vertical,
     width: SmartLinkWidth.Flexible,
     size: blockProps.size,

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

@@ -1,22 +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";
 /* 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';
-const 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 @@ const TitleBlockResolvingView = ({
   const {
     size = SmartLinkSize.Medium
   } = blockProps;
-  if (fg('platform-smart-card-icon-migration')) {
-    const iconWidth = getIconWidthNew(size);
-    return /*#__PURE__*/React.createElement(Block, _extends({}, blockProps, {
-      testId: `${testId}-resolving-view`
-    }), !hideIcon && /*#__PURE__*/React.createElement("span", {
-      style: {
-        width: iconWidth,
-        height: iconWidth
-      },
-      "data-testid": `${testId}-icon`
-    }, /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
-      width: iconWidth,
-      height: iconWidth,
-      testId: `${testId}-icon-loading`
-    })), title, actionGroup);
-  }
+  const iconWidth = getIconWidthNew(size);
   return /*#__PURE__*/React.createElement(Block, _extends({}, blockProps, {
     testId: `${testId}-resolving-view`
   }), !hideIcon && /*#__PURE__*/React.createElement("span", {
-    "data-testid": `${testId}-icon`,
-    className: ax([iconStyle[size]])
-  }, /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
+    style: {
+      width: iconWidth,
+      height: iconWidth
+    },
+    "data-testid": `${testId}-icon`
+  }, /*#__PURE__*/React.createElement(LoadingSkeleton, {
+    width: iconWidth,
+    height: iconWidth,
     testId: `${testId}-icon-loading`
   })), title, actionGroup);
 };

package/dist/es2019/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';
 const ImageIcon = ({
   defaultIcon,
   testId,
@@ -11,10 +9,9 @@ const ImageIcon = ({
   height,
   onError,
   onLoad
-}) => /*#__PURE__*/React.createElement(ImageLoader, _extends({
-  src: url
-}, fg('platform-smart-card-icon-migration') ? {
-  loading: /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+}) => /*#__PURE__*/React.createElement(ImageLoader, {
+  src: url,
+  loading: /*#__PURE__*/React.createElement(LoadingSkeleton, {
     testId: `${testId}-loading`,
     width: width,
     height: height
@@ -27,19 +24,9 @@ const ImageIcon = ({
       width,
       height
     }
-  })
-} : {
-  loading: /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    testId: `${testId}-loading`
   }),
-  loaded: /*#__PURE__*/React.createElement("img", {
-    src: url,
-    "data-testid": `${testId}-image`,
-    alt: ""
-  })
-}, {
   errored: defaultIcon,
   onError: onError,
   onLoad: onLoad
-}));
+});
 export default ImageIcon;

package/dist/es2019/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";
 const animationNameStyles = null;
 const loadingSkeletonStyle = null;
-const LoadingSkeletonNew = ({
+export const LoadingSkeleton = ({
   testId,
   width,
   height
@@ -18,11 +17,4 @@ const LoadingSkeletonNew = ({
     },
     className: ax(["_2rkoyh40 _uiztglyw _bfhk178v _1itkvl7m _12vemgnk _1lrw6rms _1e0c1o8l _5sag9cwz _1o51q7pw _tip812c5 _j7hqqkar _1pglp3kn"])
   });
-};
-const LoadingSkeletonOld = props => {
-  return /*#__PURE__*/React.createElement(LoadingSkeletonNew, _extends({}, props, {
-    width: `${props.width}rem`,
-    height: `${props.height}rem`
-  }));
-};
-export { LoadingSkeletonOld, LoadingSkeletonNew };
+};