@atlaskit/smart-card 19.1.29 → 19.2.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/smart-card
 
+## 19.2.0
+
+### Minor Changes
+
+- [`cd5e63258cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cd5e63258cd) - Moved extractors to linking-common/extractors
+
+### Patch Changes
+
+- Updated dependencies
+
+## 19.1.31
+
+### Patch Changes
+
+- [`34d17437062`](https://bitbucket.org/atlassian/atlassian-frontend/commits/34d17437062) - Flexible UI: Add DueOn element
+  Hover Preview: Update Atlas metadata
+
+## 19.1.30
+
+### Patch Changes
+
+- [`3a2bc5af606`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3a2bc5af606) - Flexible UI: Add pull request source and target branch element (text)
+  Hover Preview: Update Bitbucket metadata for pull request link
+
 ## 19.1.29
 
 ### Patch Changes

package/dist/cjs/constants.js

@@ -102,7 +102,7 @@ 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)
@@ -134,6 +134,7 @@ exports.ElementName = ElementName;
   ElementName["CommentCount"] = "CommentCount";
   ElementName["CreatedBy"] = "CreatedBy";
   ElementName["CreatedOn"] = "CreatedOn";
+  ElementName["DueOn"] = "DueOn";
   ElementName["LinkIcon"] = "LinkIcon";
   ElementName["ModifiedBy"] = "ModifiedBy";
   ElementName["ModifiedOn"] = "ModifiedOn";
@@ -143,8 +144,10 @@ exports.ElementName = 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/cjs/extractors/block/index.js

@@ -15,24 +15,14 @@ var _lozenge = require("../common/lozenge");
 
 var _icon = require("../common/icon");
 
-var _extractProvider = require("../common/context/extractProvider");
-
 var _detail = require("../common/detail");
 
-var _extractMembers = require("../common/person/extractMembers");
-
-var _extractPersonAssignedTo = require("../common/person/extractPersonAssignedTo");
-
-var _extractPersonCreatedBy = require("../common/person/extractPersonCreatedBy");
-
-var _extractPersonUpdatedBy = require("../common/person/extractPersonUpdatedBy");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _extractByline = require("../common/byline/extractByline");
 
 var _extractTitlePrefix = require("../common/title-prefix/extractTitlePrefix");
 
-var _extractImage = require("../common/preview/extractImage");
-
 var _extractActions = require("../common/actions/extractActions");
 
 var _extractPreviewAction = require("../common/actions/extractPreviewAction");
@@ -87,22 +77,22 @@ exports.extractBlockActions = extractBlockActions;
 
 var extractBlockUsers = function extractBlockUsers(jsonLd) {
   if (jsonLd['@type'] === 'atlassian:Project') {
-    return (0, _extractMembers.extractMembers)(jsonLd);
+    return (0, _extractors.extractMembers)(jsonLd);
   } else if (jsonLd['@type'] === 'atlassian:Task') {
-    var assignedMembers = (0, _extractPersonAssignedTo.extractPersonAssignedTo)(jsonLd);
+    var assignedMembers = (0, _extractors.extractPersonAssignedTo)(jsonLd);
 
     if (assignedMembers) {
       return [assignedMembers];
     }
   } else {
-    var updatedBy = (0, _extractPersonUpdatedBy.extractPersonUpdatedBy)(jsonLd);
+    var updatedBy = (0, _extractors.extractPersonUpdatedBy)(jsonLd);
     var updatedByMembers;
 
     if (updatedBy) {
       updatedByMembers = [updatedBy];
     }
 
-    var createdByMembers = (0, _extractPersonCreatedBy.extractPersonCreatedBy)(jsonLd);
+    var createdByMembers = (0, _extractors.extractPersonCreatedBy)(jsonLd);
     return updatedByMembers || createdByMembers;
   }
 };
@@ -111,15 +101,15 @@ exports.extractBlockUsers = extractBlockUsers;
 
 var extractBlockProps = function extractBlockProps(jsonLd, meta, opts, renderers, platform) {
   var props = {
-    link: (0, _primitives.extractLink)(jsonLd),
-    title: (0, _primitives.extractTitle)(jsonLd),
+    link: (0, _extractors.extractLink)(jsonLd),
+    title: (0, _extractors.extractTitle)(jsonLd),
     titleTextColor: (0, _primitives.extractTitleTextColor)(jsonLd),
     lozenge: (0, _lozenge.extractLozenge)(jsonLd),
     icon: extractBlockIcon(jsonLd),
-    context: (0, _extractProvider.extractProvider)(jsonLd),
+    context: (0, _extractors.extractProvider)(jsonLd),
     details: extractBlockDetails(jsonLd),
     byline: (0, _primitives.extractSummary)(jsonLd) || (0, _extractByline.extractByline)(jsonLd),
-    thumbnail: (0, _extractImage.extractImage)(jsonLd),
+    thumbnail: (0, _extractors.extractImage)(jsonLd),
     users: extractBlockUsers(jsonLd),
     titlePrefix: (0, _extractTitlePrefix.extractTitlePrefix)(jsonLd, renderers, 'block'),
     isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta)

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

@@ -13,9 +13,7 @@ var _analytics = require("../../../utils/analytics");
 
 var _detail = require("../detail");
 
-var _context = require("../context");
-
-var _preview = require("../preview");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _BlockCard = require("../../../view/BlockCard");
 
@@ -25,8 +23,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var getMetadataFromJsonLd = function getMetadataFromJsonLd(jsonLd, platform) {
   var download = (0, _detail.extractDownloadUrl)(jsonLd);
-  var provider = (0, _context.extractProvider)(jsonLd);
-  var preview = (0, _preview.extractPreview)(jsonLd, platform);
+  var provider = (0, _extractors.extractProvider)(jsonLd);
+  var preview = (0, _extractors.extractPreview)(jsonLd, platform);
   return {
     download: download,
     providerName: provider && provider.text,

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

@@ -13,24 +13,18 @@ var _reactIntlNext = require("react-intl-next");
 
 var _intlUtils = require("@formatjs/intl-utils");
 
-var _extractPersonUpdatedBy = require("../person/extractPersonUpdatedBy");
-
-var _extractPersonCreatedBy = require("../person/extractPersonCreatedBy");
-
-var _extractDateCreated = require("../date/extractDateCreated");
-
-var _extractDateUpdated = require("../date/extractDateUpdated");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var extractByline = function extractByline(jsonLd) {
-  var updatedAt = (0, _extractDateUpdated.extractDateUpdated)(jsonLd);
-  var createdAt = (0, _extractDateCreated.extractDateCreated)(jsonLd);
+  var updatedAt = (0, _extractors.extractDateUpdated)(jsonLd);
+  var createdAt = (0, _extractors.extractDateCreated)(jsonLd);
 
   if (updatedAt) {
     var _selectUnit = (0, _intlUtils.selectUnit)(new Date(updatedAt).getTime()),
         value = _selectUnit.value,
         unit = _selectUnit.unit;
 
-    var updatedBy = (0, _extractPersonUpdatedBy.extractPersonUpdatedBy)(jsonLd);
+    var updatedBy = (0, _extractors.extractPersonUpdatedBy)(jsonLd);
     return /*#__PURE__*/_react.default.createElement("span", null, "Updated ", updatedBy && "by ".concat(updatedBy.name), ' ', /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedRelativeTime, {
       value: value,
       unit: unit
@@ -40,7 +34,7 @@ var extractByline = function extractByline(jsonLd) {
         _value = _selectUnit2.value,
         _unit = _selectUnit2.unit;
 
-    var createdBy = (0, _extractPersonCreatedBy.extractPersonCreatedBy)(jsonLd);
+    var createdBy = (0, _extractors.extractPersonCreatedBy)(jsonLd);
     var createdByPerson = extractFirstPerson(createdBy);
     return /*#__PURE__*/_react.default.createElement("span", null, "Created ", createdByPerson && "by ".concat(createdByPerson.name), ' ', /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedRelativeTime, {
       value: _value,

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

@@ -3,18 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "extractContext", {
-  enumerable: true,
-  get: function get() {
-    return _extractContext.extractContext;
-  }
-});
-Object.defineProperty(exports, "extractProvider", {
-  enumerable: true,
-  get: function get() {
-    return _extractProvider.extractProvider;
-  }
-});
 Object.defineProperty(exports, "extractRequestAccessContext", {
   enumerable: true,
   get: function get() {
@@ -22,8 +10,4 @@ Object.defineProperty(exports, "extractRequestAccessContext", {
   }
 });
 
-var _extractContext = require("./extractContext");
-
-var _extractProvider = require("./extractProvider");
-
 var _extractAccessContext = require("./extractAccessContext");

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

@@ -19,11 +19,11 @@ var _3 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/branch/16")
 
 var _4 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/code/16"));
 
-var _priority = require("./priority");
+var _5 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/task/16"));
 
-var _extractProvider = require("../context/extractProvider");
+var _priority = require("./priority");
 
-var _extractTitle = require("../primitives/extractTitle");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _extractFileFormat = require("./extractFileFormat");
 
@@ -33,17 +33,15 @@ var _extractIconFromTask = require("./extractIconFromTask");
 
 var _extractTaskType = require("../lozenge/extractTaskType");
 
-var _utils = require("../utils");
-
 var extractIcon = function extractIcon(jsonLd) {
   var priority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'type';
   var type = jsonLd['@type'];
   var opts = {
-    title: (0, _extractTitle.extractTitle)(jsonLd),
-    provider: (0, _extractProvider.extractProvider)(jsonLd),
+    title: (0, _extractors.extractTitle)(jsonLd),
+    provider: (0, _extractors.extractProvider)(jsonLd),
     fileFormat: (0, _extractFileFormat.extractFileFormat)(jsonLd),
     taskType: (0, _extractTaskType.extractTaskType)(jsonLd),
-    icon: jsonLd.icon && (0, _utils.extractUrlFromIconJsonLd)(jsonLd.icon),
+    icon: jsonLd.icon && (0, _extractors.extractUrlFromIconJsonLd)(jsonLd.icon),
     priority: priority
   };
 
@@ -71,6 +69,11 @@ var extractIconByType = function extractIconByType(type, opts) {
     case 'atlassian:UndefinedLink':
       return (0, _extractIconFromDocument.extractIconFromDocument)(type, opts);
 
+    case 'atlassian:Goal':
+      return opts.icon || /*#__PURE__*/_react.default.createElement(_5.default, {
+        label: opts.title || 'goal'
+      });
+
     case 'atlassian:Project':
       return opts.icon || /*#__PURE__*/_react.default.createElement(_peopleGroup.default, {
         label: opts.title || 'project',

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

@@ -12,6 +12,7 @@ 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/cjs/extractors/common/lozenge/extractLozenge.js

@@ -11,14 +11,14 @@ var _extractTag = require("./extractTag");
 
 var _extractTaskStatus = require("./extractTaskStatus");
 
-var _extractType = require("../primitives/extractType");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _extractTaskType = require("./extractTaskType");
 
 var DOC_TYPES = ['schema:BlogPosting', 'schema:TextDigitalDocument', 'schema:DigitalDocument', 'schema:PresentationDigitalDocument', 'schema:SpreadsheetDigitalDocument'];
 
 var extractLozenge = function extractLozenge(jsonLd) {
-  var type = (0, _extractType.extractType)(jsonLd);
+  var type = (0, _extractors.extractType)(jsonLd);
 
   if (type) {
     if (type.includes('atlassian:SourceCodePullRequest')) {
@@ -35,12 +35,18 @@ var extractLozenge = function extractLozenge(jsonLd) {
       var jsonLdDocument = jsonLd;
       var lozengeFromState = (0, _extractState.extractState)(jsonLdDocument);
       return lozengeFromState;
-    } else if (type.includes('atlassian:Project')) {
+    } else if (type.includes('atlassian:Goal')) {
       var jsonLdProject = jsonLd;
 
       var _lozengeFromState = (0, _extractState.extractState)(jsonLdProject);
 
       return _lozengeFromState;
+    } else if (type.includes('atlassian:Project')) {
+      var _jsonLdProject = jsonLd;
+
+      var _lozengeFromState2 = (0, _extractState.extractState)(_jsonLdProject);
+
+      return _lozengeFromState2;
     } else if (type.includes('atlassian:UndefinedLink')) {
       return {
         text: 'UNDEFINED',

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

@@ -24,14 +24,14 @@ 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/cjs/extractors/common/lozenge/extractTaskType.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extractTaskType = void 0;
 
-var _utils = require("../utils");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var extractTaskType = function extractTaskType(jsonLd) {
   // TODO: Remove once Jira migrate to the correct type.
@@ -24,7 +24,7 @@ var extractTaskType = function extractTaskType(jsonLd) {
       return {
         id: taskType['@id'],
         name: taskType.name,
-        icon: taskType.icon && (0, _utils.extractUrlFromIconJsonLd)(taskType.icon)
+        icon: taskType.icon && (0, _extractors.extractUrlFromIconJsonLd)(taskType.icon)
       };
     }
   }

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

@@ -3,24 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "extractLink", {
-  enumerable: true,
-  get: function get() {
-    return _extractLink.extractLink;
-  }
-});
 Object.defineProperty(exports, "extractSummary", {
   enumerable: true,
   get: function get() {
     return _extractSummary.extractSummary;
   }
 });
-Object.defineProperty(exports, "extractTitle", {
-  enumerable: true,
-  get: function get() {
-    return _extractTitle.extractTitle;
-  }
-});
 Object.defineProperty(exports, "extractTitleTextColor", {
   enumerable: true,
   get: function get() {
@@ -28,10 +16,6 @@ Object.defineProperty(exports, "extractTitleTextColor", {
   }
 });
 
-var _extractLink = require("./extractLink");
-
 var _extractSummary = require("./extractSummary");
 
-var _extractTitle = require("./extractTitle");
-
 var _extractTitleTextColor = require("./extractTitleTextColor");

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

@@ -9,11 +9,7 @@ exports.extractEmbedProps = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _primitives = require("../common/primitives");
-
-var _context = require("../common/context");
-
-var _linkingCommon = require("@atlaskit/linking-common");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _extractIsTrusted = require("../common/meta/extractIsTrusted");
 
@@ -22,7 +18,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) { (0, _defineProperty2.default)(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; }
 
 var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform) {
-  var preview = (0, _linkingCommon.extractPreview)(jsonLd, platform);
+  var preview = (0, _extractors.extractPreview)(jsonLd, platform);
 
   if (preview && preview.src) {
     return _objectSpread(_objectSpread({}, preview), {}, {
@@ -33,9 +29,9 @@ var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform) {
 
 var extractEmbedProps = function extractEmbedProps(jsonLd, meta, platform) {
   return {
-    link: (0, _primitives.extractLink)(jsonLd) || '',
-    title: (0, _primitives.extractTitle)(jsonLd),
-    context: (0, _context.extractProvider)(jsonLd),
+    link: (0, _extractors.extractLink)(jsonLd) || '',
+    title: (0, _extractors.extractTitle)(jsonLd),
+    context: (0, _extractors.extractProvider)(jsonLd),
     preview: extractEmbedPreview(jsonLd, platform),
     isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta)
   };

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

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extractPersonsUpdatedBy = void 0;
 
-var _utils = require("../../common/utils");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 // Temporary Extractor until https://product-fabric.atlassian.net/browse/EDM-2652 is ready
 var extractPersonsUpdatedBy = function extractPersonsUpdatedBy(jsonLd) {
   var updatedBy = jsonLd['atlassian:updatedBy'];
 
   if (updatedBy) {
-    var extractedPersons = (0, _utils.extractPersonFromJsonLd)(updatedBy);
+    var extractedPersons = (0, _extractors.extractPersonFromJsonLd)(updatedBy);
     return extractedPersons ? [extractedPersons] : undefined;
   }
 };

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

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _preview = require("../common/preview");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _constants = require("../../constants");
 
 var extractPreview = function extractPreview(data) {
-  var url = (0, _preview.extractImage)(data);
+  var url = (0, _extractors.extractImage)(data);
   return url ? {
     type: _constants.MediaType.Image,
     url: url

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

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _constants = require("../../constants");
 
-var _utils = require("../common/utils");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var priorityMapper = {
   blocker: _constants.IconType.PriorityBlocker,
@@ -39,7 +39,7 @@ var extractPriority = function extractPriority(data) {
     } else if (priority['@type'] === 'Object') {
       return {
         label: priority.name,
-        url: priority.icon && (0, _utils.extractUrlFromIconJsonLd)(priority.icon)
+        url: priority.icon && (0, _extractors.extractUrlFromIconJsonLd)(priority.icon)
       };
     }
   }

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

@@ -21,7 +21,7 @@ var _extractUrlIcon = _interopRequireDefault(require("./extract-url-icon"));
 
 var _lozenge = require("../../common/lozenge");
 
-var _primitives = require("../../common/primitives");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _priority = require("../../common/icon/priority");
 
@@ -64,7 +64,7 @@ var isNativeProvider = function isNativeProvider(provider) {
 
 var extractJsonldDataIcon = function extractJsonldDataIcon(data) {
   var generator = data.generator;
-  var label = (0, _primitives.extractTitle)(data);
+  var label = (0, _extractors.extractTitle)(data);
   var type = extractType(data);
   var urlIcon = (0, _extractUrlIcon.default)(data.icon, label);
   var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
@@ -108,6 +108,12 @@ var extractJsonldDataIcon = function extractJsonldDataIcon(data) {
         label: taskLabel
       };
 
+    case 'atlassian:Goal':
+      return urlIcon || {
+        icon: _constants2.IconType.Task,
+        label: label || 'Goal'
+      };
+
     case 'atlassian:Project':
       return urlIcon || {
         icon: _constants2.IconType.Project,

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

@@ -13,7 +13,7 @@ var _constants2 = require("../../../constants");
 
 var _extractUrlIcon = _interopRequireDefault(require("./extract-url-icon"));
 
-var _primitives = require("../../common/primitives");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var extractProviderIcon = function extractProviderIcon(data) {
   if (!data) {
@@ -23,7 +23,7 @@ var extractProviderIcon = function extractProviderIcon(data) {
   var generator = data.generator;
   var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
   var icon = generator === null || generator === void 0 ? void 0 : generator.icon;
-  var label = (generator === null || generator === void 0 ? void 0 : generator.name) || (0, _primitives.extractTitle)(data);
+  var label = (generator === null || generator === void 0 ? void 0 : generator.name) || (0, _extractors.extractTitle)(data);
 
   if (provider === _constants.CONFLUENCE_GENERATOR_ID) {
     return {

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = require("../../common/utils");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var extractUrlIcon = function extractUrlIcon(icon, label) {
-  var url = icon && (0, _utils.extractUrlFromIconJsonLd)(icon);
+  var url = icon && (0, _extractors.extractUrlFromIconJsonLd)(icon);
   return url ? {
     label: label,
     url: url

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

@@ -15,13 +15,9 @@ var _icon = require("./icon");
 
 var _utils = require("./utils");
 
-var _person = require("../common/person");
-
 var _collaboratorGroup = require("./collaboratorGroup");
 
-var _extractDateUpdated = require("../common/date/extractDateUpdated");
-
-var _extractDateCreated = require("../common/date/extractDateCreated");
+var _extractors = require("@atlaskit/linking-common/extractors");
 
 var _extractPriority = _interopRequireDefault(require("./extract-priority"));
 
@@ -37,29 +33,32 @@ var extractFlexibleUiContext = function extractFlexibleUiContext(response, rende
   }
 
   var data = response.data;
-  var url = (0, _primitives.extractLink)(data);
+  var url = (0, _extractors.extractLink)(data);
   return {
-    authorGroup: (0, _person.extractPersonCreatedBy)(data),
+    authorGroup: (0, _extractors.extractPersonCreatedBy)(data),
     collaboratorGroup: (0, _collaboratorGroup.extractPersonsUpdatedBy)(data),
     commentCount: (0, _utils.extractCommentCount)(data),
     viewCount: (0, _utils.extractViewCount)(data),
     reactCount: (0, _utils.extractReactCount)(data),
     voteCount: (0, _utils.extractVoteCount)(data),
     createdBy: (0, _utils.extractCreatedBy)(data),
-    createdOn: (0, _extractDateCreated.extractDateCreated)(data),
+    createdOn: (0, _extractors.extractDateCreated)(data),
+    dueOn: (0, _utils.extractDueOn)(data),
+    latestCommit: (0, _latestCommit.extractLatestCommit)(data),
     linkIcon: (0, _icon.extractLinkIcon)(response, renderers),
     modifiedBy: (0, _utils.extractModifiedBy)(data),
-    modifiedOn: (0, _extractDateUpdated.extractDateUpdated)(data),
+    modifiedOn: (0, _extractors.extractDateUpdated)(data),
     preview: (0, _extractPreview.default)(data),
     priority: (0, _extractPriority.default)(data),
+    provider: (0, _extractProviderIcon.default)(data),
     programmingLanguage: (0, _utils.extractProgrammingLanguage)(data),
     snippet: (0, _primitives.extractSummary)(data) || undefined,
     // Explicitly set here to remove an empty string
+    sourceBranch: (0, _utils.extractSourceBranch)(data),
     state: (0, _lozenge.extractLozenge)(data),
     subscriberCount: (0, _utils.extractSubscriberCount)(data),
-    title: (0, _primitives.extractTitle)(data) || url,
-    provider: (0, _extractProviderIcon.default)(data),
-    latestCommit: (0, _latestCommit.extractLatestCommit)(data),
+    targetBranch: (0, _utils.extractTargetBranch)(data),
+    title: (0, _extractors.extractTitle)(data) || url,
     url: url
   };
 };