@atlaskit/link-datasource 0.16.1 → 0.17.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 0.17.1
+
+### Patch Changes
+
+- [`4c56014f328`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4c56014f328) - Updated components to use the new `DatasourceDataResponseItem` format
+- Updated dependencies
+
+## 0.17.0
+
+### Minor Changes
+
+- [`85866be02b9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/85866be02b9) - Add new exported member `JIRA_LIST_OF_LINKS_DATASOURCE_ID`; Also fix bug where next cursor is not reset when new search query starts and fix up format of the body that we send to /details endpoint
+
 ## 0.16.1
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -50,7 +50,9 @@ var useDatasourceTableState = function useDatasourceTableState(datasourceId, par
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return getDatasourceDetails(datasourceId, parameters);
+            return getDatasourceDetails(datasourceId, {
+              parameters: parameters
+            });
           case 2:
             result = _context.sent;
             setColumns(result.schema.properties);
@@ -111,6 +113,7 @@ var useDatasourceTableState = function useDatasourceTableState(datasourceId, par
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
+    setNextCursor(undefined);
     setTotalIssueCount(undefined);
   }, []);
   return {

package/dist/cjs/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "DatasourceTableView", {
     return _datasourceTableView.DatasourceTableView;
   }
 });
+Object.defineProperty(exports, "JIRA_LIST_OF_LINKS_DATASOURCE_ID", {
+  enumerable: true,
+  get: function get() {
+    return _jiraIssuesModal.JIRA_LIST_OF_LINKS_DATASOURCE_ID;
+  }
+});
 Object.defineProperty(exports, "JiraIssuesConfigModal", {
   enumerable: true,
   get: function get() {

package/dist/cjs/ui/issue-like-table/index.js

@@ -91,7 +91,6 @@ function getColumnWidth(key, type) {
   }
 }
 var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
-  var _orderedColumns$find;
   var testId = _ref2.testId,
     onNextPage = _ref2.onNextPage,
     items = _ref2.items,
@@ -134,9 +133,7 @@ var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
   // If data comes first, then columns and then visibleColumnKeys it blows up,
   // or some other combination.
 
-  var identityColumnKey = (_orderedColumns$find = orderedColumns.find(function (column) {
-    return column.isIdentity;
-  })) === null || _orderedColumns$find === void 0 ? void 0 : _orderedColumns$find.key;
+  var identityColumnKey = 'id';
   var loadingRow = (0, _react.useMemo)(function () {
     return {
       key: 'loading',
@@ -238,11 +235,12 @@ var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
   var tableRows = (0, _react.useMemo)(function () {
     return items.map(function (newRowData, rowIndex) {
       return {
-        key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].value || rowIndex),
+        key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].data || rowIndex),
         cells: visibleSortedColumns.map(function (_ref9) {
+          var _newRowData$key;
           var key = _ref9.key,
             type = _ref9.type;
-          var value = newRowData[key];
+          var value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
           var values = Array.isArray(value) ? value : [value];
           var content = values.map(function (value) {
             return renderItem({

package/dist/cjs/ui/issue-like-table/render-type/boolean/index.js

@@ -1,17 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.BOOLEAN_TYPE_TEST_ID = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _text = _interopRequireDefault(require("../text"));
 var _messages = require("./messages");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var BOOLEAN_TYPE_TEST_ID = 'link-datasource-render-type--boolean';
 exports.BOOLEAN_TYPE_TEST_ID = BOOLEAN_TYPE_TEST_ID;
 var BooleanRenderType = function BooleanRenderType(_ref) {
@@ -19,19 +16,13 @@ var BooleanRenderType = function BooleanRenderType(_ref) {
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? BOOLEAN_TYPE_TEST_ID : _ref$testId;
   var intl = (0, _reactIntlNext.useIntl)();
-  var booleanValue = value === null || value === void 0 ? void 0 : value.value;
-  var TRUTHY_TEXT = intl.formatMessage(_messages.booleanTypeMessages.booleanTruthyValue);
-  var FALSY_TEXT = intl.formatMessage(_messages.booleanTypeMessages.booleanFalsyValue);
-  var displayTextObject = (0, _react.useMemo)(function () {
-    return {
-      value: booleanValue ? TRUTHY_TEXT : FALSY_TEXT
-    };
-  }, [booleanValue, TRUTHY_TEXT, FALSY_TEXT]);
-  if (typeof booleanValue !== 'boolean') {
+  if (typeof value !== 'boolean') {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }
+  var TRUTHY_TEXT = intl.formatMessage(_messages.booleanTypeMessages.booleanTruthyValue);
+  var FALSY_TEXT = intl.formatMessage(_messages.booleanTypeMessages.booleanFalsyValue);
   return /*#__PURE__*/_react.default.createElement(_text.default, {
-    text: displayTextObject,
+    text: value ? TRUTHY_TEXT : FALSY_TEXT,
     testId: testId
   });
 };

package/dist/cjs/ui/issue-like-table/render-type/date-time/index.js

@@ -28,10 +28,9 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
     testId = _ref$testId === void 0 ? DATETIME_TYPE_TEST_ID : _ref$testId,
     _ref$display = _ref.display,
     display = _ref$display === void 0 ? 'datetime' : _ref$display;
-  var dateString = value === null || value === void 0 ? void 0 : value.value;
-  var date = new Date(dateString);
+  var date = new Date(value);
   var intl = (0, _reactIntlNext.useIntl)();
-  if (!dateString || isNaN(date.getTime())) {
+  if (!value || isNaN(date.getTime())) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }
   var options = {

package/dist/cjs/ui/issue-like-table/render-type/index.js

@@ -47,7 +47,7 @@ var fallbackRenderType = function fallbackRenderType(item) {
       });
     case 'tag':
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
-        text: item.value
+        tag: item.value
       });
     case 'time':
       return /*#__PURE__*/_react.default.createElement(_dateTime.default, {

package/dist/cjs/ui/issue-like-table/render-type/link/index.js

@@ -21,26 +21,27 @@ var linkStyles = {
   key: _objectSpread(_objectSpread({}, (0, _typography.h300)()), {}, {
     color: "var(--ds-text-subtlest, ".concat(_colors.N300, ")"),
     fontWeight: 600
-  })
+  }),
+  default: {}
 };
 var LINK_TYPE_TEST_ID = 'link-datasource-render-type--link';
 exports.LINK_TYPE_TEST_ID = LINK_TYPE_TEST_ID;
 var LinkRenderType = function LinkRenderType(_ref) {
-  var linkType = _ref.linkType,
+  var style = _ref.style,
     url = _ref.url,
     text = _ref.text,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? LINK_TYPE_TEST_ID : _ref$testId;
-  var style = (0, _react.useMemo)(function () {
-    return linkType && linkStyles[linkType] || {};
-  }, [linkType]);
+  var linkStyle = (0, _react.useMemo)(function () {
+    return (style === null || style === void 0 ? void 0 : style.appearance) && linkStyles[style.appearance] || {};
+  }, [style]);
   var anchor = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react.default.createElement(_linkUrl.default, {
       href: url,
-      style: style,
+      style: linkStyle,
       "data-testid": testId
     }, text || url);
-  }, [style, url, text, testId]);
+  }, [linkStyle, url, text, testId]);
   var SmartCard = function SmartCard() {
     return /*#__PURE__*/_react.default.createElement(_reactErrorBoundary.ErrorBoundary, {
       fallback: anchor

package/dist/cjs/ui/issue-like-table/render-type/number/index.js

@@ -12,11 +12,10 @@ var NumberRenderType = function NumberRenderType(_ref) {
   var number = _ref.number,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? NUMBER_TYPE_TEST_ID : _ref$testId;
-  var numberValue = number === null || number === void 0 ? void 0 : number.value;
-  if (typeof numberValue !== 'number') {
+  if (typeof number !== 'number') {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }
-  var formattedNumber = Number.isInteger(numberValue) ? numberValue : "".concat(numberValue.toFixed(2));
+  var formattedNumber = Number.isInteger(number) ? number : "".concat(number.toFixed(2));
   return /*#__PURE__*/_react.default.createElement("span", {
     "data-testid": testId
   }, formattedNumber);

package/dist/cjs/ui/issue-like-table/render-type/status/index.js

@@ -11,17 +11,16 @@ var STATUS_TYPE_TEST_ID = 'link-datasource-render-type--status';
 exports.STATUS_TYPE_TEST_ID = STATUS_TYPE_TEST_ID;
 var StatusRenderType = function StatusRenderType(_ref) {
   var text = _ref.text,
-    status = _ref.status,
+    style = _ref.style,
     _ref$testId = _ref.testId,
-    testId = _ref$testId === void 0 ? STATUS_TYPE_TEST_ID : _ref$testId,
-    style = _ref.style;
-  if (!text) {
+    testId = _ref$testId === void 0 ? STATUS_TYPE_TEST_ID : _ref$testId;
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }
   return /*#__PURE__*/_react.default.createElement(_lozenge.default, {
-    appearance: status,
-    testId: testId,
-    style: style
+    appearance: style === null || style === void 0 ? void 0 : style.appearance,
+    isBold: style === null || style === void 0 ? void 0 : style.isBold,
+    testId: testId
   }, text);
 };
 var _default = StatusRenderType;

package/dist/cjs/ui/issue-like-table/render-type/tag/index.js

@@ -10,15 +10,15 @@ var _tag = require("@atlaskit/tag");
 var TAG_TYPE_TEST_ID = 'link-datasource-render-type--tag';
 exports.TAG_TYPE_TEST_ID = TAG_TYPE_TEST_ID;
 var TagRenderType = function TagRenderType(_ref) {
-  var text = _ref.text,
+  var tag = _ref.tag,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? TAG_TYPE_TEST_ID : _ref$testId;
-  var tag = text === null || text === void 0 ? void 0 : text.value;
-  if (!tag) {
+  var text = tag === null || tag === void 0 ? void 0 : tag.text;
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }
   return /*#__PURE__*/_react.default.createElement(_tag.SimpleTag, {
-    text: tag,
+    text: text,
     testId: testId,
     appearance: 'default',
     color: 'standard'

package/dist/cjs/ui/issue-like-table/render-type/text/index.js

@@ -12,13 +12,12 @@ var TextRenderType = function TextRenderType(_ref) {
   var text = _ref.text,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? TEXT_TYPE_TEST_ID : _ref$testId;
-  var textValue = text === null || text === void 0 ? void 0 : text.value;
-  if (!textValue) {
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }
   return /*#__PURE__*/_react.default.createElement("span", {
     "data-testid": testId
-  }, textValue);
+  }, text);
 };
 var _default = TextRenderType;
 exports.default = _default;

package/dist/cjs/ui/jira-issues-modal/index.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraIssuesConfigModal = void 0;
+exports.JiraIssuesConfigModal = exports.JIRA_LIST_OF_LINKS_DATASOURCE_ID = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -43,6 +43,8 @@ var placeholderSmartLinkStyles = (0, _react2.css)({
   color: "var(--ds-text-brand, ".concat(_colors.B400, ")"),
   padding: '0px 2px'
 });
+var JIRA_LIST_OF_LINKS_DATASOURCE_ID = 'd8b75300-dfda-4519-b6cd-e49abbd50401';
+exports.JIRA_LIST_OF_LINKS_DATASOURCE_ID = JIRA_LIST_OF_LINKS_DATASOURCE_ID;
 var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -125,11 +127,11 @@ var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     }
   }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
-    var _data$key;
+    var _data$key, _data$key$data;
     var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
       data = _responseItems[0];
     // agrement with BE that we will use `key` for rendering smartlink
-    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : _data$key.url;
+    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
   }, [responseItems]);
   var onInsertPressed = (0, _react.useCallback)(function () {
     if (!isParametersSet || !jql || !selectedJiraSite) {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "0.16.1",
+	"version": "0.17.1",
 	"sideEffects": false
 }

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -13,7 +13,9 @@ export const useDatasourceTableState = (datasourceId, parameters, fields) => {
     getDatasourceDetails
   } = useDatasourceClientExtension();
   const loadDatasourceDetails = useCallback(async parameters => {
-    const result = await getDatasourceDetails(datasourceId, parameters);
+    const result = await getDatasourceDetails(datasourceId, {
+      parameters
+    });
     setColumns(result.schema.properties);
     setDefaultVisibleColumnKeys(result.schema.defaultProperties);
   }, [datasourceId, getDatasourceDetails]);
@@ -47,6 +49,7 @@ export const useDatasourceTableState = (datasourceId, parameters, fields) => {
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
+    setNextCursor(undefined);
     setTotalIssueCount(undefined);
   }, []);
   return {

package/dist/es2019/index.js

@@ -1,2 +1,3 @@
 export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
-export { DatasourceTableView } from './ui/datasourceTableView';
+export { DatasourceTableView } from './ui/datasourceTableView';
+export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';

package/dist/es2019/ui/issue-like-table/index.js

@@ -93,7 +93,6 @@ export const IssueLikeDataTableView = ({
   status,
   hasNextPage
 }) => {
-  var _orderedColumns$find;
   const tableId = useMemo(() => Symbol('unique-id'), []);
   const [lastRowElement, setLastRowElement] = useState(null);
   const [isDragPreview, setIsDragPreview] = useState(false);
@@ -108,7 +107,7 @@ export const IssueLikeDataTableView = ({
   // If data comes first, then columns and then visibleColumnKeys it blows up,
   // or some other combination.
 
-  const identityColumnKey = (_orderedColumns$find = orderedColumns.find(column => column.isIdentity)) === null || _orderedColumns$find === void 0 ? void 0 : _orderedColumns$find.key;
+  const identityColumnKey = 'id';
   const loadingRow = useMemo(() => ({
     key: 'loading',
     cells: visibleSortedColumns.map(({
@@ -210,12 +209,13 @@ export const IssueLikeDataTableView = ({
     }));
   }, [visibleColumnKeys, onVisibleColumnKeysChange, tableId]);
   const tableRows = useMemo(() => items.map((newRowData, rowIndex) => ({
-    key: `${identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].value || rowIndex}`,
+    key: `${identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].data || rowIndex}`,
     cells: visibleSortedColumns.map(({
       key,
       type
     }) => {
-      const value = newRowData[key];
+      var _newRowData$key;
+      const value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
       const values = Array.isArray(value) ? value : [value];
       const content = values.map(value => renderItem({
         type,

package/dist/es2019/ui/issue-like-table/render-type/boolean/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useIntl } from 'react-intl-next';
 import TextRenderType from '../text';
 import { booleanTypeMessages } from './messages';
@@ -8,17 +8,13 @@ const BooleanRenderType = ({
   testId = BOOLEAN_TYPE_TEST_ID
 }) => {
   const intl = useIntl();
-  const booleanValue = value === null || value === void 0 ? void 0 : value.value;
-  const TRUTHY_TEXT = intl.formatMessage(booleanTypeMessages.booleanTruthyValue);
-  const FALSY_TEXT = intl.formatMessage(booleanTypeMessages.booleanFalsyValue);
-  const displayTextObject = useMemo(() => ({
-    value: booleanValue ? TRUTHY_TEXT : FALSY_TEXT
-  }), [booleanValue, TRUTHY_TEXT, FALSY_TEXT]);
-  if (typeof booleanValue !== 'boolean') {
+  if (typeof value !== 'boolean') {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
+  const TRUTHY_TEXT = intl.formatMessage(booleanTypeMessages.booleanTruthyValue);
+  const FALSY_TEXT = intl.formatMessage(booleanTypeMessages.booleanFalsyValue);
   return /*#__PURE__*/React.createElement(TextRenderType, {
-    text: displayTextObject,
+    text: value ? TRUTHY_TEXT : FALSY_TEXT,
     testId: testId
   });
 };

package/dist/es2019/ui/issue-like-table/render-type/date-time/index.js

@@ -16,10 +16,9 @@ const DateTimeRenderType = ({
   testId = DATETIME_TYPE_TEST_ID,
   display = 'datetime'
 }) => {
-  const dateString = value === null || value === void 0 ? void 0 : value.value;
-  const date = new Date(dateString);
+  const date = new Date(value);
   const intl = useIntl();
-  if (!dateString || isNaN(date.getTime())) {
+  if (!value || isNaN(date.getTime())) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   const options = {

package/dist/es2019/ui/issue-like-table/render-type/index.js

@@ -40,7 +40,7 @@ export const fallbackRenderType = item => {
       });
     case 'tag':
       return /*#__PURE__*/React.createElement(TagRenderType, {
-        text: item.value
+        tag: item.value
       });
     case 'time':
       return /*#__PURE__*/React.createElement(DateTimeRenderType, {

package/dist/es2019/ui/issue-like-table/render-type/link/index.js

@@ -9,23 +9,24 @@ const linkStyles = {
     ...h300(),
     color: `var(--ds-text-subtlest, ${N300})`,
     fontWeight: 600
-  }
+  },
+  default: {}
 };
 export const LINK_TYPE_TEST_ID = 'link-datasource-render-type--link';
 const LinkRenderType = ({
-  linkType,
+  style,
   url,
   text,
   testId = LINK_TYPE_TEST_ID
 }) => {
-  const style = useMemo(() => {
-    return linkType && linkStyles[linkType] || {};
-  }, [linkType]);
+  const linkStyle = useMemo(() => {
+    return (style === null || style === void 0 ? void 0 : style.appearance) && linkStyles[style.appearance] || {};
+  }, [style]);
   const anchor = useMemo(() => /*#__PURE__*/React.createElement(LinkUrl, {
     href: url,
-    style: style,
+    style: linkStyle,
     "data-testid": testId
-  }, text || url), [style, url, text, testId]);
+  }, text || url), [linkStyle, url, text, testId]);
   const SmartCard = () => /*#__PURE__*/React.createElement(ErrorBoundary, {
     fallback: anchor
   }, /*#__PURE__*/React.createElement(Card, {

package/dist/es2019/ui/issue-like-table/render-type/number/index.js

@@ -4,11 +4,10 @@ const NumberRenderType = ({
   number,
   testId = NUMBER_TYPE_TEST_ID
 }) => {
-  const numberValue = number === null || number === void 0 ? void 0 : number.value;
-  if (typeof numberValue !== 'number') {
+  if (typeof number !== 'number') {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
-  const formattedNumber = Number.isInteger(numberValue) ? numberValue : `${numberValue.toFixed(2)}`;
+  const formattedNumber = Number.isInteger(number) ? number : `${number.toFixed(2)}`;
   return /*#__PURE__*/React.createElement("span", {
     "data-testid": testId
   }, formattedNumber);

package/dist/es2019/ui/issue-like-table/render-type/status/index.js

@@ -3,17 +3,16 @@ import Lozenge from '@atlaskit/lozenge';
 export const STATUS_TYPE_TEST_ID = 'link-datasource-render-type--status';
 const StatusRenderType = ({
   text,
-  status,
-  testId = STATUS_TYPE_TEST_ID,
-  style
+  style,
+  testId = STATUS_TYPE_TEST_ID
 }) => {
-  if (!text) {
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement(Lozenge, {
-    appearance: status,
-    testId: testId,
-    style: style
+    appearance: style === null || style === void 0 ? void 0 : style.appearance,
+    isBold: style === null || style === void 0 ? void 0 : style.isBold,
+    testId: testId
   }, text);
 };
 export default StatusRenderType;

package/dist/es2019/ui/issue-like-table/render-type/tag/index.js

@@ -2,15 +2,15 @@ import React from 'react';
 import { SimpleTag as Tag } from '@atlaskit/tag';
 export const TAG_TYPE_TEST_ID = 'link-datasource-render-type--tag';
 const TagRenderType = ({
-  text,
+  tag,
   testId = TAG_TYPE_TEST_ID
 }) => {
-  const tag = text === null || text === void 0 ? void 0 : text.value;
-  if (!tag) {
+  const text = tag === null || tag === void 0 ? void 0 : tag.text;
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement(Tag, {
-    text: tag,
+    text: text,
     testId: testId,
     appearance: 'default',
     color: 'standard'

package/dist/es2019/ui/issue-like-table/render-type/text/index.js

@@ -4,12 +4,11 @@ const TextRenderType = ({
   text,
   testId = TEXT_TYPE_TEST_ID
 }) => {
-  const textValue = text === null || text === void 0 ? void 0 : text.value;
-  if (!textValue) {
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement("span", {
     "data-testid": testId
-  }, textValue);
+  }, text);
 };
 export default TextRenderType;

package/dist/es2019/ui/jira-issues-modal/index.js

@@ -29,6 +29,7 @@ const placeholderSmartLinkStyles = css({
   color: `var(--ds-text-brand, ${B400})`,
   padding: '0px 2px'
 });
+export const JIRA_LIST_OF_LINKS_DATASOURCE_ID = 'd8b75300-dfda-4519-b6cd-e49abbd50401';
 export const JiraIssuesConfigModal = props => {
   const [availableSites, setAvailableSites] = useState([]);
   const [currentViewMode, setCurrentViewMode] = useState('issue');
@@ -89,10 +90,10 @@ export const JiraIssuesConfigModal = props => {
     }
   }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
   const retrieveUrlForSmartCardRender = useCallback(() => {
-    var _data$key;
+    var _data$key, _data$key$data;
     const [data] = responseItems;
     // agrement with BE that we will use `key` for rendering smartlink
-    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : _data$key.url;
+    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
   }, [responseItems]);
   const onInsertPressed = useCallback(() => {
     if (!isParametersSet || !jql || !selectedJiraSite) {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "0.16.1",
+	"version": "0.17.1",
 	"sideEffects": false
 }

package/dist/esm/hooks/useDatasourceTableState.js

@@ -43,7 +43,9 @@ export var useDatasourceTableState = function useDatasourceTableState(datasource
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return getDatasourceDetails(datasourceId, parameters);
+            return getDatasourceDetails(datasourceId, {
+              parameters: parameters
+            });
           case 2:
             result = _context.sent;
             setColumns(result.schema.properties);
@@ -104,6 +106,7 @@ export var useDatasourceTableState = function useDatasourceTableState(datasource
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
+    setNextCursor(undefined);
     setTotalIssueCount(undefined);
   }, []);
   return {

package/dist/esm/index.js

@@ -1,2 +1,3 @@
 export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
-export { DatasourceTableView } from './ui/datasourceTableView';
+export { DatasourceTableView } from './ui/datasourceTableView';
+export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';

package/dist/esm/ui/issue-like-table/index.js

@@ -85,7 +85,6 @@ function getColumnWidth(key, type) {
   }
 }
 export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
-  var _orderedColumns$find;
   var testId = _ref2.testId,
     onNextPage = _ref2.onNextPage,
     items = _ref2.items,
@@ -128,9 +127,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
   // If data comes first, then columns and then visibleColumnKeys it blows up,
   // or some other combination.
 
-  var identityColumnKey = (_orderedColumns$find = orderedColumns.find(function (column) {
-    return column.isIdentity;
-  })) === null || _orderedColumns$find === void 0 ? void 0 : _orderedColumns$find.key;
+  var identityColumnKey = 'id';
   var loadingRow = useMemo(function () {
     return {
       key: 'loading',
@@ -232,11 +229,12 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
   var tableRows = useMemo(function () {
     return items.map(function (newRowData, rowIndex) {
       return {
-        key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].value || rowIndex),
+        key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].data || rowIndex),
         cells: visibleSortedColumns.map(function (_ref9) {
+          var _newRowData$key;
           var key = _ref9.key,
             type = _ref9.type;
-          var value = newRowData[key];
+          var value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
           var values = Array.isArray(value) ? value : [value];
           var content = values.map(function (value) {
             return renderItem({

package/dist/esm/ui/issue-like-table/render-type/boolean/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useIntl } from 'react-intl-next';
 import TextRenderType from '../text';
 import { booleanTypeMessages } from './messages';
@@ -8,19 +8,13 @@ var BooleanRenderType = function BooleanRenderType(_ref) {
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? BOOLEAN_TYPE_TEST_ID : _ref$testId;
   var intl = useIntl();
-  var booleanValue = value === null || value === void 0 ? void 0 : value.value;
-  var TRUTHY_TEXT = intl.formatMessage(booleanTypeMessages.booleanTruthyValue);
-  var FALSY_TEXT = intl.formatMessage(booleanTypeMessages.booleanFalsyValue);
-  var displayTextObject = useMemo(function () {
-    return {
-      value: booleanValue ? TRUTHY_TEXT : FALSY_TEXT
-    };
-  }, [booleanValue, TRUTHY_TEXT, FALSY_TEXT]);
-  if (typeof booleanValue !== 'boolean') {
+  if (typeof value !== 'boolean') {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
+  var TRUTHY_TEXT = intl.formatMessage(booleanTypeMessages.booleanTruthyValue);
+  var FALSY_TEXT = intl.formatMessage(booleanTypeMessages.booleanFalsyValue);
   return /*#__PURE__*/React.createElement(TextRenderType, {
-    text: displayTextObject,
+    text: value ? TRUTHY_TEXT : FALSY_TEXT,
     testId: testId
   });
 };

package/dist/esm/ui/issue-like-table/render-type/date-time/index.js

@@ -20,10 +20,9 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
     testId = _ref$testId === void 0 ? DATETIME_TYPE_TEST_ID : _ref$testId,
     _ref$display = _ref.display,
     display = _ref$display === void 0 ? 'datetime' : _ref$display;
-  var dateString = value === null || value === void 0 ? void 0 : value.value;
-  var date = new Date(dateString);
+  var date = new Date(value);
   var intl = useIntl();
-  if (!dateString || isNaN(date.getTime())) {
+  if (!value || isNaN(date.getTime())) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   var options = {

package/dist/esm/ui/issue-like-table/render-type/index.js

@@ -40,7 +40,7 @@ export var fallbackRenderType = function fallbackRenderType(item) {
       });
     case 'tag':
       return /*#__PURE__*/React.createElement(TagRenderType, {
-        text: item.value
+        tag: item.value
       });
     case 'time':
       return /*#__PURE__*/React.createElement(DateTimeRenderType, {

package/dist/esm/ui/issue-like-table/render-type/link/index.js

@@ -11,25 +11,26 @@ var linkStyles = {
   key: _objectSpread(_objectSpread({}, h300()), {}, {
     color: "var(--ds-text-subtlest, ".concat(N300, ")"),
     fontWeight: 600
-  })
+  }),
+  default: {}
 };
 export var LINK_TYPE_TEST_ID = 'link-datasource-render-type--link';
 var LinkRenderType = function LinkRenderType(_ref) {
-  var linkType = _ref.linkType,
+  var style = _ref.style,
     url = _ref.url,
     text = _ref.text,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? LINK_TYPE_TEST_ID : _ref$testId;
-  var style = useMemo(function () {
-    return linkType && linkStyles[linkType] || {};
-  }, [linkType]);
+  var linkStyle = useMemo(function () {
+    return (style === null || style === void 0 ? void 0 : style.appearance) && linkStyles[style.appearance] || {};
+  }, [style]);
   var anchor = useMemo(function () {
     return /*#__PURE__*/React.createElement(LinkUrl, {
       href: url,
-      style: style,
+      style: linkStyle,
       "data-testid": testId
     }, text || url);
-  }, [style, url, text, testId]);
+  }, [linkStyle, url, text, testId]);
   var SmartCard = function SmartCard() {
     return /*#__PURE__*/React.createElement(ErrorBoundary, {
       fallback: anchor

package/dist/esm/ui/issue-like-table/render-type/number/index.js

@@ -4,11 +4,10 @@ var NumberRenderType = function NumberRenderType(_ref) {
   var number = _ref.number,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? NUMBER_TYPE_TEST_ID : _ref$testId;
-  var numberValue = number === null || number === void 0 ? void 0 : number.value;
-  if (typeof numberValue !== 'number') {
+  if (typeof number !== 'number') {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
-  var formattedNumber = Number.isInteger(numberValue) ? numberValue : "".concat(numberValue.toFixed(2));
+  var formattedNumber = Number.isInteger(number) ? number : "".concat(number.toFixed(2));
   return /*#__PURE__*/React.createElement("span", {
     "data-testid": testId
   }, formattedNumber);

package/dist/esm/ui/issue-like-table/render-type/status/index.js

@@ -3,17 +3,16 @@ import Lozenge from '@atlaskit/lozenge';
 export var STATUS_TYPE_TEST_ID = 'link-datasource-render-type--status';
 var StatusRenderType = function StatusRenderType(_ref) {
   var text = _ref.text,
-    status = _ref.status,
+    style = _ref.style,
     _ref$testId = _ref.testId,
-    testId = _ref$testId === void 0 ? STATUS_TYPE_TEST_ID : _ref$testId,
-    style = _ref.style;
-  if (!text) {
+    testId = _ref$testId === void 0 ? STATUS_TYPE_TEST_ID : _ref$testId;
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement(Lozenge, {
-    appearance: status,
-    testId: testId,
-    style: style
+    appearance: style === null || style === void 0 ? void 0 : style.appearance,
+    isBold: style === null || style === void 0 ? void 0 : style.isBold,
+    testId: testId
   }, text);
 };
 export default StatusRenderType;

package/dist/esm/ui/issue-like-table/render-type/tag/index.js

@@ -2,15 +2,15 @@ import React from 'react';
 import { SimpleTag as Tag } from '@atlaskit/tag';
 export var TAG_TYPE_TEST_ID = 'link-datasource-render-type--tag';
 var TagRenderType = function TagRenderType(_ref) {
-  var text = _ref.text,
+  var tag = _ref.tag,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? TAG_TYPE_TEST_ID : _ref$testId;
-  var tag = text === null || text === void 0 ? void 0 : text.value;
-  if (!tag) {
+  var text = tag === null || tag === void 0 ? void 0 : tag.text;
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement(Tag, {
-    text: tag,
+    text: text,
     testId: testId,
     appearance: 'default',
     color: 'standard'

package/dist/esm/ui/issue-like-table/render-type/text/index.js

@@ -4,12 +4,11 @@ var TextRenderType = function TextRenderType(_ref) {
   var text = _ref.text,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? TEXT_TYPE_TEST_ID : _ref$testId;
-  var textValue = text === null || text === void 0 ? void 0 : text.value;
-  if (!textValue) {
+  if (!(text && typeof text === 'string')) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement("span", {
     "data-testid": testId
-  }, textValue);
+  }, text);
 };
 export default TextRenderType;

package/dist/esm/ui/jira-issues-modal/index.js

@@ -32,6 +32,7 @@ var placeholderSmartLinkStyles = css({
   color: "var(--ds-text-brand, ".concat(B400, ")"),
   padding: '0px 2px'
 });
+export var JIRA_LIST_OF_LINKS_DATASOURCE_ID = 'd8b75300-dfda-4519-b6cd-e49abbd50401';
 export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -114,11 +115,11 @@ export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     }
   }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
   var retrieveUrlForSmartCardRender = useCallback(function () {
-    var _data$key;
+    var _data$key, _data$key$data;
     var _responseItems = _slicedToArray(responseItems, 1),
       data = _responseItems[0];
     // agrement with BE that we will use `key` for rendering smartlink
-    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : _data$key.url;
+    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
   }, [responseItems]);
   var onInsertPressed = useCallback(function () {
     if (!isParametersSet || !jql || !selectedJiraSite) {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "0.16.1",
+	"version": "0.17.1",
 	"sideEffects": false
 }

package/dist/types/index.d.ts

@@ -1,2 +1,3 @@
 export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
 export { DatasourceTableView } from './ui/datasourceTableView';
+export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';

package/dist/types/ui/issue-like-table/render-type/link/index.d.ts

@@ -4,5 +4,5 @@ interface LinkProps extends Link {
     testId?: string;
 }
 export declare const LINK_TYPE_TEST_ID = "link-datasource-render-type--link";
-declare const _default: React.MemoExoticComponent<({ linkType, url, text, testId, }: LinkProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ style, url, text, testId, }: LinkProps) => JSX.Element>;
 export default _default;

package/dist/types/ui/issue-like-table/render-type/status/index.d.ts

@@ -4,5 +4,5 @@ interface StatusProps extends Status {
     testId?: string;
 }
 export declare const STATUS_TYPE_TEST_ID = "link-datasource-render-type--status";
-declare const StatusRenderType: ({ text, status, testId, style, }: StatusProps) => JSX.Element;
+declare const StatusRenderType: ({ text, style, testId, }: StatusProps) => JSX.Element;
 export default StatusRenderType;

package/dist/types/ui/issue-like-table/render-type/tag/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { TagType } from '@atlaskit/linking-types';
 interface TagProps {
-    text: TagType['value'];
+    tag: TagType['value'];
     testId?: string;
 }
 export declare const TAG_TYPE_TEST_ID = "link-datasource-render-type--tag";
-declare const TagRenderType: ({ text, testId }: TagProps) => JSX.Element;
+declare const TagRenderType: ({ tag, testId }: TagProps) => JSX.Element;
 export default TagRenderType;

package/dist/types/ui/jira-issues-modal/index.d.ts

@@ -1,6 +1,7 @@
 import { jsx } from '@emotion/react';
 import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
 import { JiraIssueDatasourceParameters } from './types';
+export declare const JIRA_LIST_OF_LINKS_DATASOURCE_ID = "d8b75300-dfda-4519-b6cd-e49abbd50401";
 export interface JiraIssuesConfigModalProps {
     datasourceId: string;
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;

package/dist/types-ts4.5/index.d.ts

@@ -1,2 +1,3 @@
 export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
 export { DatasourceTableView } from './ui/datasourceTableView';
+export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';

package/dist/types-ts4.5/ui/issue-like-table/render-type/link/index.d.ts

@@ -4,5 +4,5 @@ interface LinkProps extends Link {
     testId?: string;
 }
 export declare const LINK_TYPE_TEST_ID = "link-datasource-render-type--link";
-declare const _default: React.MemoExoticComponent<({ linkType, url, text, testId, }: LinkProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ style, url, text, testId, }: LinkProps) => JSX.Element>;
 export default _default;

package/dist/types-ts4.5/ui/issue-like-table/render-type/status/index.d.ts

@@ -4,5 +4,5 @@ interface StatusProps extends Status {
     testId?: string;
 }
 export declare const STATUS_TYPE_TEST_ID = "link-datasource-render-type--status";
-declare const StatusRenderType: ({ text, status, testId, style, }: StatusProps) => JSX.Element;
+declare const StatusRenderType: ({ text, style, testId, }: StatusProps) => JSX.Element;
 export default StatusRenderType;

package/dist/types-ts4.5/ui/issue-like-table/render-type/tag/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { TagType } from '@atlaskit/linking-types';
 interface TagProps {
-    text: TagType['value'];
+    tag: TagType['value'];
     testId?: string;
 }
 export declare const TAG_TYPE_TEST_ID = "link-datasource-render-type--tag";
-declare const TagRenderType: ({ text, testId }: TagProps) => JSX.Element;
+declare const TagRenderType: ({ tag, testId }: TagProps) => JSX.Element;
 export default TagRenderType;

package/dist/types-ts4.5/ui/jira-issues-modal/index.d.ts

@@ -1,6 +1,7 @@
 import { jsx } from '@emotion/react';
 import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
 import { JiraIssueDatasourceParameters } from './types';
+export declare const JIRA_LIST_OF_LINKS_DATASOURCE_ID = "d8b75300-dfda-4519-b6cd-e49abbd50401";
 export interface JiraIssuesConfigModalProps {
     datasourceId: string;
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "0.16.1",
+  "version": "0.17.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
     "@atlaskit/image": "^1.1.0",
     "@atlaskit/link-client-extension": "^1.1.0",
     "@atlaskit/linking-common": "^2.12.0",
-    "@atlaskit/linking-types": "^2.0.0",
+    "@atlaskit/linking-types": "^3.0.0",
     "@atlaskit/lozenge": "^11.4.0",
     "@atlaskit/modal-dialog": "^12.5.0",
     "@atlaskit/pragmatic-drag-and-drop": "^0.18.0",
@@ -47,7 +47,7 @@
     "@atlaskit/smart-card": "^26.3.0",
     "@atlaskit/spinner": "^15.5.0",
     "@atlaskit/tag": "^11.5.0",
-    "@atlaskit/textfield": "5.4.2",
+    "@atlaskit/textfield": "5.4.3",
     "@atlaskit/theme": "^12.5.0",
     "@atlaskit/tokens": "^1.4.0",
     "@atlassianlabs/jql-editor": "^1.2.0",
@@ -66,7 +66,7 @@
     "@atlaskit/code": "^14.6.0",
     "@atlaskit/docs": "*",
     "@atlaskit/link-provider": "^1.6.0",
-    "@atlaskit/link-test-helpers": "^3.0.0",
+    "@atlaskit/link-test-helpers": "^4.0.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",

package/report.api.md

@@ -41,6 +41,10 @@ interface DatasourceTableViewProps {
   visibleColumnKeys?: string[];
 }
 
+// @public (undocumented)
+export const JIRA_LIST_OF_LINKS_DATASOURCE_ID =
+  'd8b75300-dfda-4519-b6cd-e49abbd50401';
+
 // @public (undocumented)
 type JiraIssueDatasourceParameters = {
   cloudId: string;

package/tmp/api-report-tmp.d.ts

@@ -25,6 +25,9 @@ interface DatasourceTableViewProps {
     visibleColumnKeys?: string[];
 }
 
+// @public (undocumented)
+export const JIRA_LIST_OF_LINKS_DATASOURCE_ID = "d8b75300-dfda-4519-b6cd-e49abbd50401";
+
 // @public (undocumented)
 type JiraIssueDatasourceParameters = {
     cloudId: string;