@atlaskit/smart-card 19.1.29 → 19.2.0

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

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useContext } from 'react';
+import { FormattedDate } from 'react-intl-next';
 import { css } from '@emotion/core';
 import { ElementName, IconType } from '../../../../constants';
 import Icon from './icon';
@@ -48,12 +49,27 @@ const elementMappings = {
   [ElementName.CreatedBy]: {
     component: Text
   },
+  [ElementName.CreatedOn]: {
+    component: DateTime
+  },
+  [ElementName.DueOn]: {
+    component: Lozenge
+  },
+  [ElementName.LatestCommit]: {
+    component: Badge,
+    props: {
+      icon: IconType.Commit
+    }
+  },
   [ElementName.LinkIcon]: {
     component: Icon
   },
   [ElementName.ModifiedBy]: {
     component: Text
   },
+  [ElementName.ModifiedOn]: {
+    component: DateTime
+  },
   [ElementName.Preview]: {
     component: Media
   },
@@ -66,6 +82,9 @@ const elementMappings = {
       icon: IconType.ProgrammingLanguage
     }
   },
+  [ElementName.Provider]: {
+    component: Badge
+  },
   [ElementName.Snippet]: {
     component: Text,
     props: {
@@ -75,6 +94,9 @@ const elementMappings = {
       `
     }
   },
+  [ElementName.SourceBranch]: {
+    component: Text
+  },
   [ElementName.State]: {
     component: Lozenge
   },
@@ -84,23 +106,11 @@ const elementMappings = {
       icon: IconType.Subscriber
     }
   },
+  [ElementName.TargetBranch]: {
+    component: Text
+  },
   [ElementName.Title]: {
     component: Link
-  },
-  [ElementName.CreatedOn]: {
-    component: DateTime
-  },
-  [ElementName.ModifiedOn]: {
-    component: DateTime
-  },
-  [ElementName.Provider]: {
-    component: Badge
-  },
-  [ElementName.LatestCommit]: {
-    component: Badge,
-    props: {
-      icon: IconType.Commit
-    }
   }
 };
 
@@ -137,6 +147,9 @@ const getData = (elementName, contextKey, context) => {
     case ElementName.CreatedOn:
       return toDateTimeProps('created', context.createdOn);
 
+    case ElementName.DueOn:
+      return toDateLozengeProps(context.dueOn);
+
     case ElementName.ModifiedBy:
       return toFormattedTextProps(messages.modified_by, context.modifiedBy);
 
@@ -144,6 +157,8 @@ const getData = (elementName, contextKey, context) => {
       return toDateTimeProps('modified', context.modifiedOn);
 
     case ElementName.Snippet:
+    case ElementName.SourceBranch:
+    case ElementName.TargetBranch:
       return toTextProps(data);
 
     case ElementName.Title:
@@ -166,6 +181,21 @@ const toBadgeProps = label => {
   } : undefined;
 };
 
+const toDateLozengeProps = dateString => {
+  if (dateString) {
+    const text = Date.parse(dateString) ? /*#__PURE__*/React.createElement(FormattedDate, {
+      value: new Date(dateString),
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+      formatMatcher: "best fit"
+    }) : dateString;
+    return {
+      text
+    };
+  }
+};
+
 const toDateTimeProps = (type, dateString) => {
   return dateString ? {
     date: new Date(dateString),
@@ -211,6 +241,8 @@ export const createElement = name => {
   return overrides => {
     const context = useContext(FlexibleUiContext);
     const data = getData(name, contextKey, context);
-    return data ? /*#__PURE__*/React.createElement(BaseElement, _extends({}, props, data, overrides)) : null;
+    return data ? /*#__PURE__*/React.createElement(BaseElement, _extends({}, props, data, overrides, {
+      name: name
+    })) : null;
   };
 };

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

@@ -1,10 +1,11 @@
 import { SmartLinkStatus } from '../../constants';
 import { getEmptyJsonLd, getUnauthorizedJsonLd } from '../../utils/jsonld';
-import { extractProvider, extractRequestAccessContext } from '../../extractors/common/context';
+import { extractRequestAccessContext } from '../../extractors/common/context';
 import { messages } from '../../messages';
 import extractFlexibleLinkContext from '../../extractors/flexible';
 import { extractErrorIcon } from '../../extractors/flexible/icon';
 import { handleOnClick } from '../../utils';
+import { extractProvider } from '@atlaskit/linking-common/extractors';
 export const getContextByStatus = (url, status, details, renderers) => {
   switch (status) {
     case SmartLinkStatus.Pending:

package/dist/es2019/view/HoverCard/components/hover-card-content.js

@@ -9,6 +9,7 @@ import { isSpecialEvent } from '../../../utils';
 import ShortcutIcon from '@atlaskit/icon/glyph/shortcut';
 import { getExtensionKey } from '../../../state/helpers';
 import { titleBlockCss, metadataBlockCss, footerBlockCss } from '../styled';
+import { extractType } from '@atlaskit/linking-common/extractors';
 const flexibleUiOptions = {
   hideElevation: true,
   size: SmartLinkSize.Medium,
@@ -59,13 +60,16 @@ const HoverCardContent = ({
     analytics.ui.cardClickedEvent(undefined, HOVER_CARD_ANALYTICS_DISPLAY, cardState.status, undefined, undefined, isModifierKeyPressed, undefined, undefined, undefined, 'titleGoToLink');
   }, [cardState.status, analytics.ui]);
   const titleActions = useMemo(() => [getOpenAction(url, analytics)], [url, analytics]);
-  const footerActions = useMemo(() => toFooterActions(cardActions), [cardActions]); //TODO: EDM-3224 deleted simulated and use real JsonLd
+  const footerActions = useMemo(() => toFooterActions(cardActions), [cardActions]);
+  const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+  const types = data ? extractType(data) : undefined; //TODO: EDM-3224 deleted simulated and use real JsonLd
 
   const {
     primary,
-    secondary
-  } = extractMetadata(getSimulatedMetadata(extensionKey));
-  const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+    secondary,
+    subtitle
+  } = extractMetadata(getSimulatedMetadata(extensionKey, types));
+  const titleMaxLines = subtitle && subtitle.length > 0 ? 1 : 2;
   const body = data && extractPreview(data) ? /*#__PURE__*/React.createElement(PreviewBlock, null) : /*#__PURE__*/React.createElement(SnippetBlock, null);
   return /*#__PURE__*/React.createElement(FlexibleCard, {
     cardState: cardState,
@@ -76,9 +80,11 @@ const HoverCardContent = ({
     url: url
   }, /*#__PURE__*/React.createElement(TitleBlock, {
     actions: titleActions,
+    maxLines: titleMaxLines,
     overrideCss: titleBlockCss,
     size: SmartLinkSize.Large,
-    position: SmartLinkPosition.Center
+    position: SmartLinkPosition.Center,
+    subtitle: subtitle
   }), /*#__PURE__*/React.createElement(MetadataBlock, {
     primary: primary,
     secondary: secondary,

package/dist/es2019/view/HoverCard/styled.js

@@ -1,5 +1,12 @@
 import { css } from '@emotion/core';
 import { loadingPlaceholderClassName } from '../../index';
+const blockGap = '0.5rem';
+const elementGap = '0.5rem';
+const separatorCss = css`
+  [data-separator] + [data-separator]:before {
+    margin-right: ${elementGap};
+  }
+`;
 export const HoverCardContainer = css`
   background: none;
   border-width: 0;
@@ -12,25 +19,44 @@ export const HoverCardContainer = css`
   }
 `;
 export const titleBlockCss = css`
-  gap: 0.5rem;
+  gap: ${blockGap};
+
+  ${separatorCss}
+
+  // title and subtitle element group
+  [data-smart-element-group] {
+    // gap between title and subtitle
+    gap: 0.06rem;
+
+    /* subtitle element group */
+    > [data-smart-element-group] {
+      > span {
+        margin-right: ${elementGap};
+      }
+    }
+  }
 `;
 export const metadataBlockCss = css`
   gap: 0px;
 
   /* primary element group */
-  [data-smart-element-group]:first-of-type {
+  [data-smart-element-group]:nth-of-type(1) {
     flex-grow: 7;
+
+    // a separator between text-based element
+    ${separatorCss}
+
     /* horizontal spacing between elements in group */
     > span {
-      margin-right: 0.5rem;
+      margin-right: ${elementGap};
     }
   }
   /* secondary element group */
-  [data-smart-element-group]:last-of-type {
+  [data-smart-element-group]:nth-of-type(2) {
     flex-grow: 3;
     /* horizontal spacing between elements in group */
     > span {
-      margin-left: 0.5rem;
+      margin-left: ${elementGap};
     }
   }
 `;

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

@@ -1,12 +1,33 @@
 import { ElementName } from '../../constants';
 export const HOVER_CARD_ANALYTICS_DISPLAY = 'flexible';
-export const getSimulatedMetadata = (extensionKey = '') => {
+export const getSimulatedMetadata = (extensionKey = '', types = []) => {
   switch (extensionKey) {
+    case 'bitbucket-object-provider':
+    case 'native-bitbucket-object-provider':
+      if (types.includes('atlassian:SourceCodePullRequest')) {
+        return {
+          metadata: {
+            primary: [ElementName.AuthorGroup, ElementName.ModifiedOn, ElementName.SubscriberCount, ElementName.State],
+            secondary: [],
+            subtitle: [ElementName.SourceBranch, ElementName.TargetBranch]
+          }
+        };
+      }
+
+      return {
+        metadata: {
+          primary: [ElementName.ModifiedOn, ElementName.CreatedBy],
+          secondary: [],
+          subtitle: []
+        }
+      };
+
     case 'confluence-object-provider':
       return {
         metadata: {
           primary: [ElementName.AuthorGroup, ElementName.CreatedBy],
-          secondary: [ElementName.CommentCount, ElementName.ReactCount]
+          secondary: [ElementName.CommentCount, ElementName.ReactCount],
+          subtitle: []
         }
       };
 
@@ -14,7 +35,27 @@ export const getSimulatedMetadata = (extensionKey = '') => {
       return {
         metadata: {
           primary: [ElementName.AuthorGroup, ElementName.State, ElementName.Priority],
-          secondary: []
+          secondary: [],
+          subtitle: []
+        }
+      };
+
+    case 'watermelon-object-provider':
+      if (types.includes('atlassian:Project')) {
+        return {
+          metadata: {
+            primary: [ElementName.AuthorGroup, ElementName.ModifiedOn, ElementName.State, ElementName.DueOn],
+            secondary: [],
+            subtitle: []
+          }
+        };
+      }
+
+      return {
+        metadata: {
+          primary: [ElementName.AuthorGroup, ElementName.State, ElementName.DueOn],
+          secondary: [],
+          subtitle: []
         }
       };
 
@@ -22,7 +63,8 @@ export const getSimulatedMetadata = (extensionKey = '') => {
       return {
         metadata: {
           primary: [ElementName.ModifiedOn, ElementName.CreatedBy],
-          secondary: []
+          secondary: [],
+          subtitle: []
         }
       };
   }

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

@@ -2,13 +2,14 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { getEmptyJsonLd, getUnauthorizedJsonLd } from '../../utils/jsonld';
 import { extractInlineProps } from '../../extractors/inline';
-import { extractProvider, extractRequestAccessContext } from '../../extractors/common/context';
+import { extractRequestAccessContext } from '../../extractors/common/context';
 import { CardLinkView } from '../LinkView';
 import { InlineCardErroredView } from './ErroredView';
 import { InlineCardForbiddenView } from './ForbiddenView';
 import { InlineCardResolvedView } from './ResolvedView';
 import { InlineCardResolvingView } from './ResolvingView';
 import { InlineCardUnauthorizedView } from './UnauthorisedView';
+import { extractProvider } from '@atlaskit/linking-common/extractors';
 export { InlineCardResolvedView, InlineCardResolvingView, InlineCardErroredView, InlineCardForbiddenView, InlineCardUnauthorizedView };
 export const InlineCard = ({
   id,

package/dist/esm/constants.js

@@ -83,7 +83,7 @@ export var SmartLinkWidth;
  * When adding an element...
  * 1) Create base element if it doesn't already exist.
  *    Base element are inside src/view/FlexibleCard/components/elements.
- *    E.g. Badge,DateTime, Icon, Lozenge, etc.
+ *    E.g. Badge, DateTime, Icon, Lozenge, etc.
  * 2) Update FlexibleUiContext with the new prop for data representing
  *    the element, preferably with the same name as the element itself.
  *    (src/state/flexible-ui-context/types.ts)
@@ -111,6 +111,7 @@ export var ElementName;
   ElementName["CommentCount"] = "CommentCount";
   ElementName["CreatedBy"] = "CreatedBy";
   ElementName["CreatedOn"] = "CreatedOn";
+  ElementName["DueOn"] = "DueOn";
   ElementName["LinkIcon"] = "LinkIcon";
   ElementName["ModifiedBy"] = "ModifiedBy";
   ElementName["ModifiedOn"] = "ModifiedOn";
@@ -120,8 +121,10 @@ export var ElementName;
   ElementName["Provider"] = "Provider";
   ElementName["ReactCount"] = "ReactCount";
   ElementName["Snippet"] = "Snippet";
+  ElementName["SourceBranch"] = "SourceBranch";
   ElementName["State"] = "State";
   ElementName["SubscriberCount"] = "SubscriberCount";
+  ElementName["TargetBranch"] = "TargetBranch";
   ElementName["Title"] = "Title";
   ElementName["ViewCount"] = "ViewCount";
   ElementName["VoteCount"] = "VoteCount";

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

@@ -4,18 +4,13 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { extractLink, extractTitle, extractTitleTextColor, extractSummary } from '../common/primitives';
+import { extractTitleTextColor, extractSummary } from '../common/primitives';
 import { extractLozenge } from '../common/lozenge';
 import { extractIcon } from '../common/icon';
-import { extractProvider } from '../common/context/extractProvider';
 import { extractCommentCount, extractProgrammingLanguage, extractSubscriberCount } from '../common/detail';
-import { extractMembers } from '../common/person/extractMembers';
-import { extractPersonAssignedTo } from '../common/person/extractPersonAssignedTo';
-import { extractPersonCreatedBy } from '../common/person/extractPersonCreatedBy';
-import { extractPersonUpdatedBy } from '../common/person/extractPersonUpdatedBy';
+import { extractLink, extractTitle, extractProvider, extractMembers, extractPersonAssignedTo, extractPersonCreatedBy, extractPersonUpdatedBy, extractImage } from '@atlaskit/linking-common/extractors';
 import { extractByline } from '../common/byline/extractByline';
 import { extractTitlePrefix } from '../common/title-prefix/extractTitlePrefix';
-import { extractImage } from '../common/preview/extractImage';
 import { extractActions } from '../common/actions/extractActions';
 import { extractPreviewAction } from '../common/actions/extractPreviewAction';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';

package/dist/esm/extractors/common/actions/extractPreviewAction.js

@@ -6,8 +6,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import { uiRenderSuccessEvent, uiRenderFailedEvent } from '../../../utils/analytics';
 import { extractDownloadUrl } from '../detail';
-import { extractProvider } from '../context';
-import { extractPreview } from '../preview';
+import { extractProvider, extractPreview } from '@atlaskit/linking-common/extractors';
 import { PreviewAction } from '../../../view/BlockCard';
 
 var getMetadataFromJsonLd = function getMetadataFromJsonLd(jsonLd, platform) {

package/dist/esm/extractors/common/byline/extractByline.js

@@ -1,10 +1,7 @@
 import React from 'react';
 import { FormattedRelativeTime } from 'react-intl-next';
 import { selectUnit } from '@formatjs/intl-utils';
-import { extractPersonUpdatedBy } from '../person/extractPersonUpdatedBy';
-import { extractPersonCreatedBy } from '../person/extractPersonCreatedBy';
-import { extractDateCreated } from '../date/extractDateCreated';
-import { extractDateUpdated } from '../date/extractDateUpdated';
+import { extractDateCreated, extractDateUpdated, extractPersonCreatedBy, extractPersonUpdatedBy } from '@atlaskit/linking-common/extractors';
 export var extractByline = function extractByline(jsonLd) {
   var updatedAt = extractDateUpdated(jsonLd);
   var createdAt = extractDateCreated(jsonLd);

package/dist/esm/extractors/common/context/index.js

@@ -1,3 +1 @@
-export { extractContext } from './extractContext';
-export { extractProvider } from './extractProvider';
 export { extractRequestAccessContext } from './extractAccessContext';

package/dist/esm/extractors/common/icon/extractIcon.js

@@ -4,14 +4,13 @@ import CommitIcon from '@atlaskit/icon-object/glyph/commit/16';
 import PullRequestIcon from '@atlaskit/icon-object/glyph/pull-request/16';
 import BranchIcon from '@atlaskit/icon-object/glyph/branch/16';
 import RepoIcon from '@atlaskit/icon-object/glyph/code/16';
+import TaskIcon from '@atlaskit/icon-object/glyph/task/16';
 import { extractorPriorityMap } from './priority';
-import { extractProvider } from '../context/extractProvider';
-import { extractTitle } from '../primitives/extractTitle';
+import { extractProvider, extractUrlFromIconJsonLd, extractTitle } from '@atlaskit/linking-common/extractors';
 import { extractFileFormat } from './extractFileFormat';
 import { extractIconFromDocument } from './extractIconFromDocument';
 import { extractIconFromTask } from './extractIconFromTask';
 import { extractTaskType } from '../lozenge/extractTaskType';
-import { extractUrlFromIconJsonLd } from '../utils';
 export var extractIcon = function extractIcon(jsonLd) {
   var priority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'type';
   var type = jsonLd['@type'];
@@ -46,6 +45,11 @@ var extractIconByType = function extractIconByType(type, opts) {
     case 'atlassian:UndefinedLink':
       return extractIconFromDocument(type, opts);
 
+    case 'atlassian:Goal':
+      return opts.icon || /*#__PURE__*/React.createElement(TaskIcon, {
+        label: opts.title || 'goal'
+      });
+
     case 'atlassian:Project':
       return opts.icon || /*#__PURE__*/React.createElement(ProjectIcon, {
         label: opts.title || 'project',

package/dist/esm/extractors/common/icon/priority.js

@@ -6,6 +6,7 @@ export var extractorPriorityMap = {
   'schema:BlogPosting': 10,
   'schema:SpreadsheetDigitalDocument': 10,
   'schema:PresentationDigitalDocument': 10,
+  'atlassian:Goal': 10,
   'atlassian:Task': 10,
   'atlassian:Project': 10,
   'atlassian:Template': 10,

package/dist/esm/extractors/common/lozenge/extractLozenge.js

@@ -1,7 +1,7 @@
 import { extractState } from './extractState';
 import { extractTag } from './extractTag';
 import { extractTaskStatus } from './extractTaskStatus';
-import { extractType } from '../primitives/extractType';
+import { extractType } from '@atlaskit/linking-common/extractors';
 import { extractTaskType } from './extractTaskType';
 var DOC_TYPES = ['schema:BlogPosting', 'schema:TextDigitalDocument', 'schema:DigitalDocument', 'schema:PresentationDigitalDocument', 'schema:SpreadsheetDigitalDocument'];
 export var extractLozenge = function extractLozenge(jsonLd) {
@@ -22,12 +22,18 @@ export var extractLozenge = function extractLozenge(jsonLd) {
       var jsonLdDocument = jsonLd;
       var lozengeFromState = extractState(jsonLdDocument);
       return lozengeFromState;
-    } else if (type.includes('atlassian:Project')) {
+    } else if (type.includes('atlassian:Goal')) {
       var jsonLdProject = jsonLd;
 
       var _lozengeFromState = extractState(jsonLdProject);
 
       return _lozengeFromState;
+    } else if (type.includes('atlassian:Project')) {
+      var _jsonLdProject = jsonLd;
+
+      var _lozengeFromState2 = extractState(_jsonLdProject);
+
+      return _lozengeFromState2;
     } else if (type.includes('atlassian:UndefinedLink')) {
       return {
         text: 'UNDEFINED',

package/dist/esm/extractors/common/lozenge/extractState.js

@@ -16,14 +16,14 @@ export var extractState = function extractState(jsonLd) {
       if (state.name) {
         return {
           text: state.name,
-          appearance: 'default'
+          appearance: state.appearance || 'default'
         };
       }
     } else if (state['@type'] === 'Object') {
       if (state.name) {
         return {
           text: state.name,
-          appearance: 'default'
+          appearance: state.appearance || 'default'
         };
       }
     }

package/dist/esm/extractors/common/lozenge/extractTaskType.js

@@ -1,4 +1,4 @@
-import { extractUrlFromIconJsonLd } from '../utils';
+import { extractUrlFromIconJsonLd } from '@atlaskit/linking-common/extractors';
 export var extractTaskType = function extractTaskType(jsonLd) {
   // TODO: Remove once Jira migrate to the correct type.
   var taskType = jsonLd['atlassian:taskType'] || jsonLd.taskType;

package/dist/esm/extractors/common/primitives/index.js

@@ -1,4 +1,2 @@
-export { extractLink } from './extractLink';
 export { extractSummary } from './extractSummary';
-export { extractTitle } from './extractTitle';
 export { extractTitleTextColor } from './extractTitleTextColor';

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

@@ -4,9 +4,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { extractLink, extractTitle } from '../common/primitives';
-import { extractProvider } from '../common/context';
-import { extractPreview } from '@atlaskit/linking-common';
+import { extractLink, extractTitle, extractProvider, extractPreview } from '@atlaskit/linking-common/extractors';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';
 
 var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform) {

package/dist/esm/extractors/flexible/collaboratorGroup/index.js

@@ -1,4 +1,4 @@
-import { extractPersonFromJsonLd } from '../../common/utils';
+import { extractPersonFromJsonLd } from '@atlaskit/linking-common/extractors';
 // Temporary Extractor until https://product-fabric.atlassian.net/browse/EDM-2652 is ready
 export var extractPersonsUpdatedBy = function extractPersonsUpdatedBy(jsonLd) {
   var updatedBy = jsonLd['atlassian:updatedBy'];

package/dist/esm/extractors/flexible/extract-preview.js

@@ -1,4 +1,4 @@
-import { extractImage } from '../common/preview';
+import { extractImage } from '@atlaskit/linking-common/extractors';
 import { MediaType } from '../../constants';
 
 var extractPreview = function extractPreview(data) {

package/dist/esm/extractors/flexible/extract-priority.js

@@ -1,5 +1,5 @@
 import { IconType } from '../../constants';
-import { extractUrlFromIconJsonLd } from '../common/utils';
+import { extractUrlFromIconJsonLd } from '@atlaskit/linking-common/extractors';
 var priorityMapper = {
   blocker: IconType.PriorityBlocker,
   critical: IconType.PriorityCritical,

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

@@ -5,7 +5,7 @@ import extractJiraTaskIcon from './extract-jira-task-icon';
 import extractProviderIcon from './extract-provider-icon';
 import extractUrlIcon from './extract-url-icon';
 import { extractTaskType } from '../../common/lozenge';
-import { extractTitle } from '../../common/primitives';
+import { extractTitle } from '@atlaskit/linking-common/extractors';
 import { extractorPriorityMap as priorityMap } from '../../common/icon/priority';
 import { IconType } from '../../../constants';
 
@@ -90,6 +90,12 @@ var extractJsonldDataIcon = function extractJsonldDataIcon(data) {
         label: taskLabel
       };
 
+    case 'atlassian:Goal':
+      return urlIcon || {
+        icon: IconType.Task,
+        label: label || 'Goal'
+      };
+
     case 'atlassian:Project':
       return urlIcon || {
         icon: IconType.Project,

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

@@ -1,7 +1,7 @@
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../../constants';
 import { IconType } from '../../../constants';
 import extractUrlIcon from './extract-url-icon';
-import { extractTitle } from '../../common/primitives';
+import { extractTitle } from '@atlaskit/linking-common/extractors';
 
 var extractProviderIcon = function extractProviderIcon(data) {
   if (!data) {

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

@@ -1,4 +1,4 @@
-import { extractUrlFromIconJsonLd } from '../../common/utils';
+import { extractUrlFromIconJsonLd } from '@atlaskit/linking-common/extractors';
 
 var extractUrlIcon = function extractUrlIcon(icon, label) {
   var url = icon && extractUrlFromIconJsonLd(icon);

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

@@ -1,11 +1,9 @@
-import { extractLink, extractSummary, extractTitle } from '../common/primitives';
+import { extractSummary } from '../common/primitives';
 import { extractLozenge } from '../common/lozenge';
 import { extractLinkIcon } from './icon';
-import { extractCommentCount, extractCreatedBy, extractModifiedBy, extractProgrammingLanguage, extractSubscriberCount, extractViewCount, extractReactCount, extractVoteCount } from './utils';
-import { extractPersonCreatedBy } from '../common/person';
+import { extractCommentCount, extractCreatedBy, extractModifiedBy, extractProgrammingLanguage, extractSubscriberCount, extractViewCount, extractReactCount, extractVoteCount, extractSourceBranch, extractTargetBranch, extractDueOn } from './utils';
 import { extractPersonsUpdatedBy } from './collaboratorGroup';
-import { extractDateUpdated } from '../common/date/extractDateUpdated';
-import { extractDateCreated } from '../common/date/extractDateCreated';
+import { extractPersonCreatedBy, extractLink, extractTitle, extractDateUpdated, extractDateCreated } from '@atlaskit/linking-common/extractors';
 import extractPriority from './extract-priority';
 import extractProviderIcon from './icon/extract-provider-icon';
 import extractPreview from './extract-preview';
@@ -27,19 +25,22 @@ var extractFlexibleUiContext = function extractFlexibleUiContext(response, rende
     voteCount: extractVoteCount(data),
     createdBy: extractCreatedBy(data),
     createdOn: extractDateCreated(data),
+    dueOn: extractDueOn(data),
+    latestCommit: extractLatestCommit(data),
     linkIcon: extractLinkIcon(response, renderers),
     modifiedBy: extractModifiedBy(data),
     modifiedOn: extractDateUpdated(data),
     preview: extractPreview(data),
     priority: extractPriority(data),
+    provider: extractProviderIcon(data),
     programmingLanguage: extractProgrammingLanguage(data),
     snippet: extractSummary(data) || undefined,
     // Explicitly set here to remove an empty string
+    sourceBranch: extractSourceBranch(data),
     state: extractLozenge(data),
     subscriberCount: extractSubscriberCount(data),
+    targetBranch: extractTargetBranch(data),
     title: extractTitle(data) || url,
-    provider: extractProviderIcon(data),
-    latestCommit: extractLatestCommit(data),
     url: url
   };
 };