@atlaskit/link-datasource 0.24.4 → 0.25.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/link-datasource
 
+## 0.25.1
+
+### Patch Changes
+
+- [`64bdd3a389b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/64bdd3a389b) - Style changes and translation updates. Also remove IntlProvider from prode code.
+
+## 0.25.0
+
+### Minor Changes
+
+- [`f427908df3d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f427908df3d) - change the datasource response type to include the meta data section and the data response will wrap in the data section
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.24.4
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -73,7 +73,7 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
               return column.key === col.key;
             });
           };
-          allColumns = result.schema.properties;
+          allColumns = result.data.schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat((0, _toConsumableArray2.default)(columns), (0, _toConsumableArray2.default)(newColumns)));
         case 9:
@@ -106,7 +106,8 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldRequestFirstPage,
       datasourceDataRequest,
       _yield$getDatasourceD,
-      data,
+      _yield$getDatasourceD2,
+      items,
       nextPageCursor,
       _totalCount,
       schema,
@@ -135,17 +136,18 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
           return getDatasourceData(datasourceId, datasourceDataRequest);
         case 9:
           _yield$getDatasourceD = _context2.sent;
-          data = _yield$getDatasourceD.data;
-          nextPageCursor = _yield$getDatasourceD.nextPageCursor;
-          _totalCount = _yield$getDatasourceD.totalCount;
-          schema = _yield$getDatasourceD.schema;
+          _yield$getDatasourceD2 = _yield$getDatasourceD.data;
+          items = _yield$getDatasourceD2.items;
+          nextPageCursor = _yield$getDatasourceD2.nextPageCursor;
+          _totalCount = _yield$getDatasourceD2.totalCount;
+          schema = _yield$getDatasourceD2.schema;
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
             if (shouldRequestFirstPage) {
-              return data;
+              return items;
             }
-            return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(data));
+            return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(items));
           });
           setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
@@ -155,17 +157,17 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if (isSchemaFromData && schema) {
             applySchemaProperties(schema.properties);
           }
-          _context2.next = 26;
+          _context2.next = 27;
           break;
-        case 23:
-          _context2.prev = 23;
+        case 24:
+          _context2.prev = 24;
           _context2.t0 = _context2["catch"](6);
           setStatus('rejected');
-        case 26:
+        case 27:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 23]]);
+    }, _callee2, null, [[6, 24]]);
   })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
   var reset = (0, _react.useCallback)(function () {
     setStatus('empty');

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -16,10 +16,7 @@ var _tableFooter = require("../table-footer");
 /** @jsx jsx */
 
 var TableViewWrapperStyles = (0, _react2.css)({
-  display: 'flex',
-  flexDirection: 'column',
-  width: '100%',
-  height: '100%',
+  display: 'grid',
   position: 'relative',
   padding: "var(--ds-space-200, 16px)",
   paddingBottom: 0,

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

@@ -262,9 +262,7 @@ var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     }
     return issueLikeDataTableView;
   }, [status, columns.length, resolvedWithNoResults, jqlUrl, retrieveUrlForSmartCardRender, responseItems.length, issueLikeDataTableView]);
-  return (0, _react2.jsx)(_reactIntlNext.IntlProvider, {
-    locale: "en"
-  }, (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_modalDialog.default, {
+  return (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_modalDialog.default, {
     testId: 'jira-jql-datasource-modal',
     onClose: onCancel,
     width: "x-large",
@@ -302,11 +300,11 @@ var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     css: issueCountStyles
   }, (0, _react2.jsx)(_reactIntlNext.FormattedNumber, {
     value: totalCount
-  }), ' ', (0, _react2.jsx)(_reactIntlNext.FormattedPlural, {
-    one: (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.singularIssue),
-    other: (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.pluralIssues),
-    value: totalCount
-  })), (0, _react2.jsx)(_standardButton.default, {
+  }), ' ', (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.modalMessages.issueText, {
+    values: {
+      totalCount: totalCount
+    }
+  }))), (0, _react2.jsx)(_standardButton.default, {
     appearance: "default",
     onClick: onCancel
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.cancelButtonText)), (0, _react2.jsx)(_standardButton.default, {
@@ -314,6 +312,6 @@ var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     onClick: onInsertPressed,
     isDisabled: isDisabled,
     testId: 'jira-jql-datasource-modal--insert-button'
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesButtonText))))));
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesButtonText)))));
 };
 exports.JiraIssuesConfigModal = JiraIssuesConfigModal;

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

@@ -41,15 +41,10 @@ var modalMessages = (0, _reactIntlNext.defineMessages)({
     description: 'Placeholder text that will be placed next to a count of jira issues',
     defaultMessage: '### Issues'
   },
-  singularIssue: {
-    id: 'linkDataSource.jira-issues.configmodal.singular.issue',
-    description: 'Text that appears after single issue count number.',
-    defaultMessage: 'issue'
-  },
-  pluralIssues: {
-    id: 'linkDataSource.jira-issues.configmodal.plural.issues',
-    description: 'Text that appears after plural issue count number.',
-    defaultMessage: 'issues'
+  issueText: {
+    id: 'linkDataSource.jira-issues.configmodal.issue',
+    description: 'Text that appears after issue count number.',
+    defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
   }
 });
 exports.modalMessages = modalMessages;

package/dist/cjs/ui/table-footer/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TableFooter = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("react");
@@ -48,11 +49,11 @@ var TableFooter = function TableFooter(_ref) {
     level: "h400"
   }, (0, _react2.jsx)(_reactIntlNext.FormattedNumber, {
     value: issueCount
-  }), ' ', (0, _react2.jsx)(_reactIntlNext.FormattedPlural, {
-    one: (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.footerMessages.singularIssue),
-    other: (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.footerMessages.pluralIssues),
-    value: issueCount
-  }))), (0, _react2.jsx)(SyncWrapper, null, onRefresh && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(SyncTextWrapper, {
+  }), ' ', (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.footerMessages.issueText, {
+    values: {
+      issueCount: issueCount
+    }
+  })))), (0, _react2.jsx)(SyncWrapper, null, onRefresh && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.footerMessages.loadingText) : (0, _react2.jsx)(_syncInfo.SyncInfo, {
     lastSyncTime: lastSyncTime

package/dist/cjs/ui/table-footer/messages.js

@@ -6,15 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.footerMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var footerMessages = (0, _reactIntlNext.defineMessages)({
-  singularIssue: {
+  issueText: {
     id: 'linkDataSource.table-footer.issue',
-    description: 'Text that appears after single issue count number.',
-    defaultMessage: 'issue'
-  },
-  pluralIssues: {
-    id: 'linkDataSource.table-footer.issues',
-    description: 'Text that appears after plural issue count number.',
-    defaultMessage: 'issues'
+    description: 'Text that appears after issue count number.',
+    defaultMessage: '{issueCount, plural, one {issue} other {issues}}'
   },
   loadingText: {
     id: 'linkDataSource.table-footer.loading',

package/dist/cjs/version.json

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

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -25,7 +25,7 @@ export const useDatasourceTableState = ({
       parameters
     });
     const isColumnNotPresentInCurrentColumnsList = col => !columns.find(column => column.key === col.key);
-    const allColumns = result.schema.properties;
+    const allColumns = result.data.schema.properties;
     const newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
     newColumns.length > 0 && setColumns([...columns, ...newColumns]);
   }, [columns, datasourceId, getDatasourceDetails, parameters]);
@@ -62,18 +62,20 @@ export const useDatasourceTableState = ({
     setStatus('loading');
     try {
       const {
-        data,
-        nextPageCursor,
-        totalCount,
-        schema
+        data: {
+          items,
+          nextPageCursor,
+          totalCount,
+          schema
+        }
       } = await getDatasourceData(datasourceId, datasourceDataRequest);
       setTotalCount(totalCount);
       setNextCursor(nextPageCursor);
       setResponseItems(currentResponseItems => {
         if (shouldRequestFirstPage) {
-          return data;
+          return items;
         }
-        return [...currentResponseItems, ...data];
+        return [...currentResponseItems, ...items];
       });
       setStatus('resolved');
       setHasNextPage(Boolean(nextPageCursor));

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -8,10 +8,7 @@ import { NoResults } from '../common/error-state/no-results';
 import { IssueLikeDataTableView } from '../issue-like-table';
 import { TableFooter } from '../table-footer';
 const TableViewWrapperStyles = css({
-  display: 'flex',
-  flexDirection: 'column',
-  width: '100%',
-  height: '100%',
+  display: 'grid',
   position: 'relative',
   padding: "var(--ds-space-200, 16px)",
   paddingBottom: 0,

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
-import { FormattedMessage, FormattedNumber, FormattedPlural, IntlProvider, useIntl } from 'react-intl-next';
+import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/standard-button';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { B400, N0, N800 } from '@atlaskit/theme/colors';
@@ -209,9 +209,7 @@ export const JiraIssuesConfigModal = props => {
     }
     return issueLikeDataTableView;
   }, [status, columns.length, resolvedWithNoResults, jqlUrl, retrieveUrlForSmartCardRender, responseItems.length, issueLikeDataTableView]);
-  return jsx(IntlProvider, {
-    locale: "en"
-  }, jsx(ModalTransition, null, jsx(Modal, {
+  return jsx(ModalTransition, null, jsx(Modal, {
     testId: 'jira-jql-datasource-modal',
     onClose: onCancel,
     width: "x-large",
@@ -249,11 +247,11 @@ export const JiraIssuesConfigModal = props => {
     css: issueCountStyles
   }, jsx(FormattedNumber, {
     value: totalCount
-  }), ' ', jsx(FormattedPlural, {
-    one: jsx(FormattedMessage, modalMessages.singularIssue),
-    other: jsx(FormattedMessage, modalMessages.pluralIssues),
-    value: totalCount
-  })), jsx(Button, {
+  }), ' ', jsx(FormattedMessage, _extends({}, modalMessages.issueText, {
+    values: {
+      totalCount
+    }
+  }))), jsx(Button, {
     appearance: "default",
     onClick: onCancel
   }, jsx(FormattedMessage, modalMessages.cancelButtonText)), jsx(Button, {
@@ -261,5 +259,5 @@ export const JiraIssuesConfigModal = props => {
     onClick: onInsertPressed,
     isDisabled: isDisabled,
     testId: 'jira-jql-datasource-modal--insert-button'
-  }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
+  }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText)))));
 };

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

@@ -35,14 +35,9 @@ export const modalMessages = defineMessages({
     description: 'Placeholder text that will be placed next to a count of jira issues',
     defaultMessage: '### Issues'
   },
-  singularIssue: {
-    id: 'linkDataSource.jira-issues.configmodal.singular.issue',
-    description: 'Text that appears after single issue count number.',
-    defaultMessage: 'issue'
-  },
-  pluralIssues: {
-    id: 'linkDataSource.jira-issues.configmodal.plural.issues',
-    description: 'Text that appears after plural issue count number.',
-    defaultMessage: 'issues'
+  issueText: {
+    id: 'linkDataSource.jira-issues.configmodal.issue',
+    description: 'Text that appears after issue count number.',
+    defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
   }
 });

package/dist/es2019/ui/table-footer/index.js

@@ -1,8 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import { Fragment, useEffect, useState } from 'react';
 import { jsx } from '@emotion/react';
 import styled from '@emotion/styled';
-import { FormattedMessage, FormattedNumber, FormattedPlural, useIntl } from 'react-intl-next';
+import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import Heading from '@atlaskit/heading';
 import RefreshIcon from '@atlaskit/icon/glyph/refresh';
@@ -59,11 +60,11 @@ export const TableFooter = ({
     level: "h400"
   }, jsx(FormattedNumber, {
     value: issueCount
-  }), ' ', jsx(FormattedPlural, {
-    one: jsx(FormattedMessage, footerMessages.singularIssue),
-    other: jsx(FormattedMessage, footerMessages.pluralIssues),
-    value: issueCount
-  }))), jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
+  }), ' ', jsx(FormattedMessage, _extends({}, footerMessages.issueText, {
+    values: {
+      issueCount
+    }
+  })))), jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? jsx(FormattedMessage, footerMessages.loadingText) : jsx(SyncInfo, {
     lastSyncTime: lastSyncTime

package/dist/es2019/ui/table-footer/messages.js

@@ -1,14 +1,9 @@
 import { defineMessages } from 'react-intl-next';
 export const footerMessages = defineMessages({
-  singularIssue: {
+  issueText: {
     id: 'linkDataSource.table-footer.issue',
-    description: 'Text that appears after single issue count number.',
-    defaultMessage: 'issue'
-  },
-  pluralIssues: {
-    id: 'linkDataSource.table-footer.issues',
-    description: 'Text that appears after plural issue count number.',
-    defaultMessage: 'issues'
+    description: 'Text that appears after issue count number.',
+    defaultMessage: '{issueCount, plural, one {issue} other {issues}}'
   },
   loadingText: {
     id: 'linkDataSource.table-footer.loading',

package/dist/es2019/version.json

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

package/dist/esm/hooks/useDatasourceTableState.js

@@ -66,7 +66,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
               return column.key === col.key;
             });
           };
-          allColumns = result.schema.properties;
+          allColumns = result.data.schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat(_toConsumableArray(columns), _toConsumableArray(newColumns)));
         case 9:
@@ -99,7 +99,8 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldRequestFirstPage,
       datasourceDataRequest,
       _yield$getDatasourceD,
-      data,
+      _yield$getDatasourceD2,
+      items,
       nextPageCursor,
       _totalCount,
       schema,
@@ -128,17 +129,18 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           return getDatasourceData(datasourceId, datasourceDataRequest);
         case 9:
           _yield$getDatasourceD = _context2.sent;
-          data = _yield$getDatasourceD.data;
-          nextPageCursor = _yield$getDatasourceD.nextPageCursor;
-          _totalCount = _yield$getDatasourceD.totalCount;
-          schema = _yield$getDatasourceD.schema;
+          _yield$getDatasourceD2 = _yield$getDatasourceD.data;
+          items = _yield$getDatasourceD2.items;
+          nextPageCursor = _yield$getDatasourceD2.nextPageCursor;
+          _totalCount = _yield$getDatasourceD2.totalCount;
+          schema = _yield$getDatasourceD2.schema;
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
             if (shouldRequestFirstPage) {
-              return data;
+              return items;
             }
-            return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(data));
+            return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(items));
           });
           setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
@@ -148,17 +150,17 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if (isSchemaFromData && schema) {
             applySchemaProperties(schema.properties);
           }
-          _context2.next = 26;
+          _context2.next = 27;
           break;
-        case 23:
-          _context2.prev = 23;
+        case 24:
+          _context2.prev = 24;
           _context2.t0 = _context2["catch"](6);
           setStatus('rejected');
-        case 26:
+        case 27:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 23]]);
+    }, _callee2, null, [[6, 24]]);
   })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
   var reset = useCallback(function () {
     setStatus('empty');

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -8,10 +8,7 @@ import { NoResults } from '../common/error-state/no-results';
 import { IssueLikeDataTableView } from '../issue-like-table';
 import { TableFooter } from '../table-footer';
 var TableViewWrapperStyles = css({
-  display: 'flex',
-  flexDirection: 'column',
-  width: '100%',
-  height: '100%',
+  display: 'grid',
   position: 'relative',
   padding: "var(--ds-space-200, 16px)",
   paddingBottom: 0,

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

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
-import { FormattedMessage, FormattedNumber, FormattedPlural, IntlProvider, useIntl } from 'react-intl-next';
+import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/standard-button';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { B400, N0, N800 } from '@atlaskit/theme/colors';
@@ -251,9 +251,7 @@ export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     }
     return issueLikeDataTableView;
   }, [status, columns.length, resolvedWithNoResults, jqlUrl, retrieveUrlForSmartCardRender, responseItems.length, issueLikeDataTableView]);
-  return jsx(IntlProvider, {
-    locale: "en"
-  }, jsx(ModalTransition, null, jsx(Modal, {
+  return jsx(ModalTransition, null, jsx(Modal, {
     testId: 'jira-jql-datasource-modal',
     onClose: onCancel,
     width: "x-large",
@@ -291,11 +289,11 @@ export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     css: issueCountStyles
   }, jsx(FormattedNumber, {
     value: totalCount
-  }), ' ', jsx(FormattedPlural, {
-    one: jsx(FormattedMessage, modalMessages.singularIssue),
-    other: jsx(FormattedMessage, modalMessages.pluralIssues),
-    value: totalCount
-  })), jsx(Button, {
+  }), ' ', jsx(FormattedMessage, _extends({}, modalMessages.issueText, {
+    values: {
+      totalCount: totalCount
+    }
+  }))), jsx(Button, {
     appearance: "default",
     onClick: onCancel
   }, jsx(FormattedMessage, modalMessages.cancelButtonText)), jsx(Button, {
@@ -303,5 +301,5 @@ export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     onClick: onInsertPressed,
     isDisabled: isDisabled,
     testId: 'jira-jql-datasource-modal--insert-button'
-  }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
+  }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText)))));
 };

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

@@ -35,14 +35,9 @@ export var modalMessages = defineMessages({
     description: 'Placeholder text that will be placed next to a count of jira issues',
     defaultMessage: '### Issues'
   },
-  singularIssue: {
-    id: 'linkDataSource.jira-issues.configmodal.singular.issue',
-    description: 'Text that appears after single issue count number.',
-    defaultMessage: 'issue'
-  },
-  pluralIssues: {
-    id: 'linkDataSource.jira-issues.configmodal.plural.issues',
-    description: 'Text that appears after plural issue count number.',
-    defaultMessage: 'issues'
+  issueText: {
+    id: 'linkDataSource.jira-issues.configmodal.issue',
+    description: 'Text that appears after issue count number.',
+    defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
   }
 });

package/dist/esm/ui/table-footer/index.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
@@ -5,7 +6,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 import { Fragment, useEffect, useState } from 'react';
 import { jsx } from '@emotion/react';
 import styled from '@emotion/styled';
-import { FormattedMessage, FormattedNumber, FormattedPlural, useIntl } from 'react-intl-next';
+import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import Heading from '@atlaskit/heading';
 import RefreshIcon from '@atlaskit/icon/glyph/refresh';
@@ -41,11 +42,11 @@ export var TableFooter = function TableFooter(_ref) {
     level: "h400"
   }, jsx(FormattedNumber, {
     value: issueCount
-  }), ' ', jsx(FormattedPlural, {
-    one: jsx(FormattedMessage, footerMessages.singularIssue),
-    other: jsx(FormattedMessage, footerMessages.pluralIssues),
-    value: issueCount
-  }))), jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
+  }), ' ', jsx(FormattedMessage, _extends({}, footerMessages.issueText, {
+    values: {
+      issueCount: issueCount
+    }
+  })))), jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? jsx(FormattedMessage, footerMessages.loadingText) : jsx(SyncInfo, {
     lastSyncTime: lastSyncTime

package/dist/esm/ui/table-footer/messages.js

@@ -1,14 +1,9 @@
 import { defineMessages } from 'react-intl-next';
 export var footerMessages = defineMessages({
-  singularIssue: {
+  issueText: {
     id: 'linkDataSource.table-footer.issue',
-    description: 'Text that appears after single issue count number.',
-    defaultMessage: 'issue'
-  },
-  pluralIssues: {
-    id: 'linkDataSource.table-footer.issues',
-    description: 'Text that appears after plural issue count number.',
-    defaultMessage: 'issues'
+    description: 'Text that appears after issue count number.',
+    defaultMessage: '{issueCount, plural, one {issue} other {issues}}'
   },
   loadingText: {
     id: 'linkDataSource.table-footer.loading',

package/dist/esm/version.json

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

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

@@ -34,12 +34,7 @@ export declare const modalMessages: {
         description: string;
         defaultMessage: string;
     };
-    singularIssue: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    pluralIssues: {
+    issueText: {
         id: string;
         description: string;
         defaultMessage: string;

package/dist/types/ui/table-footer/messages.d.ts

@@ -1,10 +1,5 @@
 export declare const footerMessages: {
-    singularIssue: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    pluralIssues: {
+    issueText: {
         id: string;
         description: string;
         defaultMessage: string;

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

@@ -34,12 +34,7 @@ export declare const modalMessages: {
         description: string;
         defaultMessage: string;
     };
-    singularIssue: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    pluralIssues: {
+    issueText: {
         id: string;
         description: string;
         defaultMessage: string;

package/dist/types-ts4.5/ui/table-footer/messages.d.ts

@@ -1,10 +1,5 @@
 export declare const footerMessages: {
-    singularIssue: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    pluralIssues: {
+    issueText: {
         id: string;
         description: string;
         defaultMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "0.24.4",
+  "version": "0.25.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -34,9 +34,9 @@
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/image": "^1.1.0",
-    "@atlaskit/link-client-extension": "^1.2.1",
+    "@atlaskit/link-client-extension": "^1.3.0",
     "@atlaskit/linking-common": "^3.0.0",
-    "@atlaskit/linking-types": "^6.0.0",
+    "@atlaskit/linking-types": "^7.0.0",
     "@atlaskit/lozenge": "^11.4.0",
     "@atlaskit/modal-dialog": "^12.6.0",
     "@atlaskit/pragmatic-drag-and-drop": "^0.19.0",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@atlaskit/link-provider": "^1.6.0",
-    "@atlaskit/link-test-helpers": "^4.0.0",
+    "@atlaskit/link-test-helpers": "^4.1.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",