@atlaskit/smart-card 17.3.2 → 17.4.0

package/dist/es2019/extractors/flexible/icon/extract-document-type-icon.js

@@ -3,25 +3,46 @@ import { IconType } from '../../../constants';
 const extractDocumentTypeIcon = (documentType, label) => {
   switch (documentType) {
     case 'schema:BlogPosting':
-      return [IconType.Blog, label || 'Blog'];
+      return {
+        icon: IconType.Blog,
+        label: label || 'Blog'
+      };
 
     case 'schema:DigitalDocument':
-      return [IconType.File, label || 'File'];
+      return {
+        icon: IconType.File,
+        label: label || 'File'
+      };
 
     case 'schema:TextDigitalDocument':
-      return [IconType.Document, label || 'Document'];
+      return {
+        icon: IconType.Document,
+        label: label || 'Document'
+      };
 
     case 'schema:PresentationDigitalDocument':
-      return [IconType.Presentation, label || 'Presentation'];
+      return {
+        icon: IconType.Presentation,
+        label: label || 'Presentation'
+      };
 
     case 'schema:SpreadsheetDigitalDocument':
-      return [IconType.Spreadsheet, label || 'Spreadsheet'];
+      return {
+        icon: IconType.Spreadsheet,
+        label: label || 'Spreadsheet'
+      };
 
     case 'atlassian:Template':
-      return [IconType.Template, label || 'Template'];
+      return {
+        icon: IconType.Template,
+        label: label || 'Template'
+      };
 
     case 'atlassian:UndefinedLink':
-      return [IconType.Document, label || 'Undefined link'];
+      return {
+        icon: IconType.Document,
+        label: label || 'Undefined link'
+      };
 
     default:
       return undefined;

package/dist/es2019/extractors/flexible/icon/extract-file-formatIcon.js

@@ -4,66 +4,111 @@ const extractFileFormatIcon = fileFormat => {
   switch (fileFormat) {
     // Generic documents
     case 'folder':
-      return [IconType.Folder, 'Folder'];
+      return {
+        icon: IconType.Folder,
+        label: 'Folder'
+      };
 
     case 'text/plain':
     case 'application/vnd.oasis.opendocument.text':
     case 'application/vnd.apple.pages':
-      return [IconType.Document, 'Document'];
+      return {
+        icon: IconType.Document,
+        label: 'Document'
+      };
 
     case 'application/pdf':
-      return [IconType.PDF, 'PDF document'];
+      return {
+        icon: IconType.PDF,
+        label: 'PDF document'
+      };
 
     case 'application/vnd.oasis.opendocument.presentation':
     case 'application/vnd.apple.keynote':
-      return [IconType.Presentation, 'Presentation'];
+      return {
+        icon: IconType.Presentation,
+        label: 'Presentation'
+      };
 
     case 'application/vnd.oasis.opendocument.spreadsheet':
     case 'application/vnd.apple.numbers':
-      return [IconType.Spreadsheet, 'Spreadsheet'];
+      return {
+        icon: IconType.Spreadsheet,
+        label: 'Spreadsheet'
+      };
     // Google Drive
 
     case 'application/vnd.google-apps.document':
-      return [IconType.GoogleDocs, 'Google Docs'];
+      return {
+        icon: IconType.GoogleDocs,
+        label: 'Google Docs'
+      };
 
     case 'application/vnd.google-apps.form':
-      return [IconType.GoogleForms, 'Google Form'];
+      return {
+        icon: IconType.GoogleForms,
+        label: 'Google Form'
+      };
 
     case 'application/vnd.google-apps.spreadsheet':
-      return [IconType.GoogleSheets, 'Google Sheets'];
+      return {
+        icon: IconType.GoogleSheets,
+        label: 'Google Sheets'
+      };
 
     case 'application/vnd.google-apps.presentation':
-      return [IconType.GoogleSlides, 'Google Slides'];
+      return {
+        icon: IconType.GoogleSlides,
+        label: 'Google Slides'
+      };
     // Microsoft
 
     case 'application/vnd.ms-excel':
     case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-      return [IconType.MSExcel, 'Excel spreadsheet'];
+      return {
+        icon: IconType.MSExcel,
+        label: 'Excel spreadsheet'
+      };
 
     case 'application/vnd.ms-powerpoint':
     case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
-      return [IconType.MSPowerpoint, 'PowerPoint presentation'];
+      return {
+        icon: IconType.MSPowerpoint,
+        label: 'PowerPoint presentation'
+      };
 
     case 'application/msword':
     case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-      return [IconType.MSWord, 'Word document'];
+      return {
+        icon: IconType.MSWord,
+        label: 'Word document'
+      };
 
     case 'image/png':
     case 'image/jpeg':
     case 'image/bmp':
     case 'image/webp':
     case 'image/svg+xml':
-      return [IconType.Image, 'Image'];
+      return {
+        icon: IconType.Image,
+        label: 'Image'
+      };
 
     case 'image/gif':
-      return [IconType.GIF, 'GIF'];
+      return {
+        icon: IconType.GIF,
+        label: 'GIF'
+      };
 
     case 'audio/midi':
     case 'audio/mpeg':
     case 'audio/webm':
     case 'audio/ogg':
     case 'audio/wav':
-      return [IconType.Audio, 'Audio'];
+      return {
+        icon: IconType.Audio,
+        label: 'Audio'
+      };
 
     case 'video/mp4':
     case 'video/quicktime':
@@ -72,13 +117,19 @@ const extractFileFormatIcon = fileFormat => {
     case 'video/ogg':
     case 'video/x-ms-wmv':
     case 'video/x-msvideo':
-      return [IconType.Video, 'Video'];
+      return {
+        icon: IconType.Video,
+        label: 'Video'
+      };
     // Others
 
     case 'text/css':
     case 'text/html':
     case 'application/javascript':
-      return [IconType.Code, 'Source Code'];
+      return {
+        icon: IconType.Code,
+        label: 'Source Code'
+      };
 
     case 'application/zip':
     case 'application/x-tar':
@@ -86,19 +137,34 @@ const extractFileFormatIcon = fileFormat => {
     case 'application/x-7z-compressed':
     case 'application/x-apple-diskimage':
     case 'application/vnd.rar':
-      return [IconType.Archive, 'Archive'];
+      return {
+        icon: IconType.Archive,
+        label: 'Archive'
+      };
 
     case 'application/dmg':
-      return [IconType.Executable, 'Executable'];
+      return {
+        icon: IconType.Executable,
+        label: 'Executable'
+      };
 
     case 'application/sketch':
-      return [IconType.Sketch, 'Sketch'];
+      return {
+        icon: IconType.Sketch,
+        label: 'Sketch'
+      };
 
     case 'application/octet-stream':
-      return [IconType.Generic, 'Binary file'];
+      return {
+        icon: IconType.Generic,
+        label: 'Binary file'
+      };
 
     case 'application/invision.prototype':
-      return [IconType.Generic, 'Prototype'];
+      return {
+        icon: IconType.Generic,
+        label: 'Prototype'
+      };
 
     default:
       return undefined;

package/dist/es2019/extractors/flexible/icon/extract-jira-task-icon.js

@@ -3,32 +3,59 @@ import { IconType } from '../../../constants';
 const extractJiraTaskIcon = (taskType, label = 'Task') => {
   switch (taskType) {
     case 'JiraBug':
-      return [IconType.Bug, label];
+      return {
+        icon: IconType.Bug,
+        label
+      };
 
     case 'JiraChange':
-      return [IconType.Change, label];
+      return {
+        icon: IconType.Change,
+        label
+      };
 
     case 'JiraEpic':
-      return [IconType.Epic, label];
+      return {
+        icon: IconType.Epic,
+        label
+      };
 
     case 'JiraIncident':
-      return [IconType.Incident, label];
+      return {
+        icon: IconType.Incident,
+        label
+      };
 
     case 'JiraProblem':
-      return [IconType.Problem, label];
+      return {
+        icon: IconType.Problem,
+        label
+      };
 
     case 'JiraServiceRequest':
-      return [IconType.ServiceRequest, label];
+      return {
+        icon: IconType.ServiceRequest,
+        label
+      };
 
     case 'JiraStory':
-      return [IconType.Story, label];
+      return {
+        icon: IconType.Story,
+        label
+      };
 
     case 'JiraSubTask':
-      return [IconType.SubTask, label];
+      return {
+        icon: IconType.SubTask,
+        label
+      };
 
     case 'JiraTask':
     default:
-      return [IconType.Task, label];
+      return {
+        icon: IconType.Task,
+        label
+      };
   }
 };
 

package/dist/es2019/extractors/flexible/icon/extract-jsonld-data-icon.js

@@ -15,7 +15,10 @@ const extractTask = (data, label) => {
     icon: url
   } = extractTaskType(data) || {};
   const taskType = id === null || id === void 0 ? void 0 : id.split('#').pop();
-  const taskIcon = url ? [undefined, label, url] : undefined;
+  const taskIcon = url ? {
+    label,
+    url
+  } : undefined;
   return {
     taskType,
     taskIcon
@@ -39,7 +42,7 @@ const extractJsonldDataIcon = data => {
   const type = extractType(data);
   const urlIcon = extractUrlIcon(data.icon, label);
   const provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
-  const providerIcon = extractProviderIcon(provider, generator === null || generator === void 0 ? void 0 : generator.icon, label);
+  const providerIcon = extractProviderIcon(data);
 
   switch (type) {
     case 'Document':
@@ -68,25 +71,46 @@ const extractJsonldDataIcon = data => {
           taskType,
           taskIcon
         } = extractTask(data);
-        return taskType === 'JiraCustomTaskType' ? taskIcon || urlIcon || providerIcon || [IconType.Task, taskLabel] : extractJiraTaskIcon(taskType, taskLabel);
+        return taskType === 'JiraCustomTaskType' ? taskIcon || urlIcon || providerIcon || {
+          icon: IconType.Task,
+          label: taskLabel
+        } : extractJiraTaskIcon(taskType, taskLabel);
       }
 
-      return [IconType.Task, taskLabel];
+      return {
+        icon: IconType.Task,
+        label: taskLabel
+      };
 
     case 'atlassian:Project':
-      return urlIcon || [IconType.Project, label || 'Project'];
+      return urlIcon || {
+        icon: IconType.Project,
+        label: label || 'Project'
+      };
 
     case 'atlassian:SourceCodeCommit':
-      return [IconType.Commit, label || 'Commit'];
+      return {
+        icon: IconType.Commit,
+        label: label || 'Commit'
+      };
 
     case 'atlassian:SourceCodePullRequest':
-      return [IconType.PullRequest, label || 'Pull request'];
+      return {
+        icon: IconType.PullRequest,
+        label: label || 'Pull request'
+      };
 
     case 'atlassian:SourceCodeReference':
-      return [IconType.Branch, label || 'Reference'];
+      return {
+        icon: IconType.Branch,
+        label: label || 'Reference'
+      };
 
     case 'atlassian:SourceCodeRepository':
-      return [IconType.Repo, label || 'Repository'];
+      return {
+        icon: IconType.Repo,
+        label: label || 'Repository'
+      };
 
     default:
       return providerIcon;

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

@@ -1,14 +1,30 @@
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../../constants';
 import { IconType } from '../../../constants';
 import extractUrlIcon from './extract-url-icon';
+import { extractTitle } from '../../common/primitives';
+
+const extractProviderIcon = data => {
+  if (!data) {
+    return undefined;
+  }
+
+  const generator = data.generator;
+  const provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
+  const icon = generator === null || generator === void 0 ? void 0 : generator.icon;
+  const label = (generator === null || generator === void 0 ? void 0 : generator.name) || extractTitle(data);
 
-const extractProviderIcon = (provider, icon, label) => {
   if (provider === CONFLUENCE_GENERATOR_ID) {
-    return [IconType.Confluence, label || 'Confluence'];
+    return {
+      icon: IconType.Confluence,
+      label: label || 'Confluence'
+    };
   }
 
   if (provider === JIRA_GENERATOR_ID) {
-    return [IconType.Jira, label || 'Jira'];
+    return {
+      icon: IconType.Jira,
+      label: label || 'Jira'
+    };
   }
 
   return extractUrlIcon(icon, label);

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

@@ -2,7 +2,10 @@ import { extractUrlFromIconJsonLd } from '../../common/utils';
 
 const extractUrlIcon = (icon, label) => {
   const url = icon && extractUrlFromIconJsonLd(icon);
-  return url ? [undefined, label, url] : undefined;
+  return url ? {
+    label,
+    url
+  } : undefined;
 };
 
 export default extractUrlIcon;

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

@@ -4,22 +4,19 @@ import { IconType, SmartLinkStatus } from '../../../constants';
 import extractIconRenderer from './extract-icon-renderer';
 export const extractLinkIcon = (response, renderers) => {
   const data = response.data;
-  const [icon, label, url] = extractJsonldDataIcon(data) || [];
   const render = extractIconRenderer(data, renderers);
-  return {
-    icon,
-    label,
-    render,
-    url
+  return { ...extractJsonldDataIcon(data),
+    render
   };
 };
 export const extractErrorIcon = (response, status) => {
   // Try to get provider icon first.
   if (response) {
     const data = response.data;
-    const generator = data.generator;
-    const provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
-    const [icon,, url] = extractProviderIcon(provider, generator === null || generator === void 0 ? void 0 : generator.icon) || [];
+    const {
+      icon,
+      url
+    } = extractProviderIcon(data) || {};
 
     if (icon || url) {
       return {

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

@@ -7,6 +7,7 @@ import { extractPersonsUpdatedBy } from './collaboratorGroup';
 import { extractDateUpdated } from '../common/date/extractDateUpdated';
 import { extractDateCreated } from '../common/date/extractDateCreated';
 import extractPriority from './extract-priority';
+import extractProviderIcon from './icon/extract-provider-icon';
 
 const extractFlexibleUiContext = (response, renderers) => {
   if (!response) {
@@ -31,6 +32,7 @@ const extractFlexibleUiContext = (response, renderers) => {
     state: extractLozenge(data),
     subscriberCount: extractSubscriberCount(data),
     title: extractTitle(data) || url,
+    provider: extractProviderIcon(data),
     url
   };
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "17.3.2",
+	"version": "17.4.0",
 	"sideEffects": false
 }

package/dist/es2019/view/FlexibleCard/components/blocks/utils.js

@@ -22,7 +22,8 @@ export const ElementDisplaySchema = {
   [ElementName.Snippet]: ['block'],
   [ElementName.State]: ['inline'],
   [ElementName.SubscriberCount]: ['inline'],
-  [ElementName.Title]: ['inline']
+  [ElementName.Title]: ['inline'],
+  [ElementName.Provider]: ['inline']
 };
 
 const getDirectionStyles = direction => {

package/dist/es2019/view/FlexibleCard/components/common/atlaskit-icon/index.js

@@ -217,6 +217,8 @@ const AtlaskitIcon = ({
     case IconType.Jira:
       // Logo component has a different prop set from other icon components
       return /*#__PURE__*/React.createElement(ImportedIcon, {
+        "data-testId": testId // Confluence and Jira imports don't have native testId prop
+        ,
         textColor: N700,
         iconColor: B200,
         iconGradientStart: B400,

package/dist/es2019/view/FlexibleCard/components/elements/badge/index.js

@@ -40,7 +40,7 @@ const messageMapper = {
   [IconType.PriorityUndefined]: messages.priority_undefined
 };
 
-const getFormattedMessageOrLabel = (icon, content) => {
+const getFormattedMessageFromIcon = icon => {
   if (icon) {
     const descriptor = messageMapper[icon];
 
@@ -50,8 +50,6 @@ const getFormattedMessageOrLabel = (icon, content) => {
       });
     }
   }
-
-  return content;
 };
 
 const renderAtlaskitIcon = (icon, testId) => {
@@ -79,7 +77,7 @@ const Badge = ({
   label,
   testId = 'smart-element-badge'
 }) => {
-  const formattedMessageOrLabel = getFormattedMessageOrLabel(icon, label);
+  const formattedMessageOrLabel = getFormattedMessageFromIcon(icon) || label;
   const badgeIcon = renderAtlaskitIcon(icon, testId) || renderImageIcon(url, testId);
 
   if (!formattedMessageOrLabel || !badgeIcon) {

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

@@ -16,4 +16,5 @@ export const ProgrammingLanguage = createElement(ElementName.ProgrammingLanguage
 export const Snippet = createElement(ElementName.Snippet);
 export const State = createElement(ElementName.State);
 export const SubscriberCount = createElement(ElementName.SubscriberCount);
-export const Title = createElement(ElementName.Title);
+export const Title = createElement(ElementName.Title);
+export const Provider = createElement(ElementName.Provider);

package/dist/es2019/view/FlexibleCard/components/elements/utils.js

@@ -64,6 +64,9 @@ const elementMappings = {
   },
   [ElementName.ModifiedOn]: {
     component: DateTime
+  },
+  [ElementName.Provider]: {
+    component: Badge
   }
 };
 

package/dist/esm/constants.js

@@ -84,6 +84,7 @@ export var ElementName;
   ElementName["State"] = "State";
   ElementName["SubscriberCount"] = "SubscriberCount";
   ElementName["Title"] = "Title";
+  ElementName["Provider"] = "Provider";
 })(ElementName || (ElementName = {}));
 
 export var ActionName;

package/dist/esm/extractors/flexible/icon/extract-document-type-icon.js

@@ -3,25 +3,46 @@ import { IconType } from '../../../constants';
 var extractDocumentTypeIcon = function extractDocumentTypeIcon(documentType, label) {
   switch (documentType) {
     case 'schema:BlogPosting':
-      return [IconType.Blog, label || 'Blog'];
+      return {
+        icon: IconType.Blog,
+        label: label || 'Blog'
+      };
 
     case 'schema:DigitalDocument':
-      return [IconType.File, label || 'File'];
+      return {
+        icon: IconType.File,
+        label: label || 'File'
+      };
 
     case 'schema:TextDigitalDocument':
-      return [IconType.Document, label || 'Document'];
+      return {
+        icon: IconType.Document,
+        label: label || 'Document'
+      };
 
     case 'schema:PresentationDigitalDocument':
-      return [IconType.Presentation, label || 'Presentation'];
+      return {
+        icon: IconType.Presentation,
+        label: label || 'Presentation'
+      };
 
     case 'schema:SpreadsheetDigitalDocument':
-      return [IconType.Spreadsheet, label || 'Spreadsheet'];
+      return {
+        icon: IconType.Spreadsheet,
+        label: label || 'Spreadsheet'
+      };
 
     case 'atlassian:Template':
-      return [IconType.Template, label || 'Template'];
+      return {
+        icon: IconType.Template,
+        label: label || 'Template'
+      };
 
     case 'atlassian:UndefinedLink':
-      return [IconType.Document, label || 'Undefined link'];
+      return {
+        icon: IconType.Document,
+        label: label || 'Undefined link'
+      };
 
     default:
       return undefined;