@atlaskit/link-datasource 2.5.9 → 2.5.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/README.md +1 -1
- package/dist/cjs/ui/common/modal/search-count/index.js +30 -51
- package/dist/cjs/ui/confluence-search-modal/modal/messages.js +0 -5
- package/dist/cjs/ui/jira-issues-modal/basic-filters/types.js +1 -1
- package/dist/cjs/ui/jira-issues-modal/modal/messages.js +0 -5
- package/dist/es2019/ui/common/modal/search-count/index.js +28 -50
- package/dist/es2019/ui/confluence-search-modal/modal/messages.js +0 -5
- package/dist/es2019/ui/jira-issues-modal/basic-filters/types.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/modal/messages.js +0 -5
- package/dist/esm/ui/common/modal/search-count/index.js +27 -48
- package/dist/esm/ui/confluence-search-modal/modal/messages.js +0 -5
- package/dist/esm/ui/jira-issues-modal/basic-filters/types.js +1 -1
- package/dist/esm/ui/jira-issues-modal/modal/messages.js +0 -5
- package/dist/types/ui/common/modal/search-count/index.d.ts +1 -5
- package/dist/types/ui/confluence-search-modal/modal/messages.d.ts +0 -5
- package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +0 -5
- package/dist/types-ts4.5/ui/common/modal/search-count/index.d.ts +1 -5
- package/dist/types-ts4.5/ui/confluence-search-modal/modal/messages.d.ts +0 -5
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +0 -5
- package/package.json +6 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# @atlaskit/link-datasource
|
|
2
2
|
|
|
3
|
+
## 2.5.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#120040](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/120040)
|
|
8
|
+
[`6451e5b79f070`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6451e5b79f070) -
|
|
9
|
+
The change here removes `platform.linking-platform.datasource.total-count-i18n-single-key` that
|
|
10
|
+
controlled single string usage for total count display in the table.
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
3
13
|
## 2.5.9
|
|
4
14
|
|
|
5
15
|
### Patch Changes
|
package/README.md
CHANGED
|
@@ -9,24 +9,18 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
|
9
9
|
var _react = _interopRequireDefault(require("react"));
|
|
10
10
|
var _reactIntlNext = require("react-intl-next");
|
|
11
11
|
var _heading = _interopRequireDefault(require("@atlaskit/heading"));
|
|
12
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
12
|
var _primitives = require("@atlaskit/primitives");
|
|
14
13
|
var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
|
|
15
14
|
var _colors = require("@atlaskit/theme/colors");
|
|
16
|
-
var _messages = require("../../../
|
|
17
|
-
var _messages2 = require("
|
|
18
|
-
var _messages3 = require("../../../table-footer/messages");
|
|
19
|
-
var _messages4 = require("./messages");
|
|
15
|
+
var _messages = require("../../../table-footer/messages");
|
|
16
|
+
var _messages2 = require("./messages");
|
|
20
17
|
var searchCountStyles = (0, _primitives.xcss)({
|
|
21
18
|
flex: 1
|
|
22
19
|
});
|
|
23
|
-
var
|
|
24
|
-
var
|
|
25
|
-
|
|
20
|
+
var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
21
|
+
var url = _ref.url,
|
|
22
|
+
children = _ref.children,
|
|
26
23
|
testId = _ref.testId;
|
|
27
|
-
var capCount = searchCount >= 1000;
|
|
28
|
-
var displayCount = capCount ? 1000 : searchCount;
|
|
29
|
-
var countModifier = capCount ? '+' : '';
|
|
30
24
|
return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
|
|
31
25
|
testId: testId,
|
|
32
26
|
xcss: searchCountStyles,
|
|
@@ -43,55 +37,40 @@ var AssetsItemCount = exports.AssetsItemCount = function AssetsItemCount(_ref) {
|
|
|
43
37
|
}
|
|
44
38
|
}, /*#__PURE__*/_react.default.createElement(_heading.default, {
|
|
45
39
|
level: "h200"
|
|
40
|
+
}, children)));
|
|
41
|
+
};
|
|
42
|
+
var AssetsItemCount = exports.AssetsItemCount = function AssetsItemCount(_ref2) {
|
|
43
|
+
var searchCount = _ref2.searchCount,
|
|
44
|
+
url = _ref2.url,
|
|
45
|
+
testId = _ref2.testId;
|
|
46
|
+
var capCount = searchCount >= 1000;
|
|
47
|
+
var displayCount = capCount ? 1000 : searchCount;
|
|
48
|
+
var countModifier = capCount ? '+' : '';
|
|
49
|
+
return /*#__PURE__*/_react.default.createElement(ItemCountWrapper, {
|
|
50
|
+
testId: testId,
|
|
51
|
+
url: url
|
|
46
52
|
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedNumber, {
|
|
47
53
|
value: displayCount
|
|
48
|
-
}), countModifier, ' ', /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({},
|
|
54
|
+
}), countModifier, ' ', /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.footerMessages.itemText, {
|
|
49
55
|
values: {
|
|
50
56
|
itemCount: searchCount
|
|
51
57
|
}
|
|
52
|
-
})))
|
|
58
|
+
})));
|
|
53
59
|
};
|
|
54
|
-
var TableSearchCount = function TableSearchCount(
|
|
55
|
-
var url =
|
|
56
|
-
searchCount =
|
|
57
|
-
|
|
58
|
-
testId =
|
|
59
|
-
|
|
60
|
-
prefixTextType =
|
|
61
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
60
|
+
var TableSearchCount = function TableSearchCount(_ref3) {
|
|
61
|
+
var url = _ref3.url,
|
|
62
|
+
searchCount = _ref3.searchCount,
|
|
63
|
+
_ref3$testId = _ref3.testId,
|
|
64
|
+
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
65
|
+
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
66
|
+
prefixTextType = _ref3$prefixTextType === void 0 ? 'issue' : _ref3$prefixTextType;
|
|
67
|
+
return /*#__PURE__*/_react.default.createElement(ItemCountWrapper, {
|
|
62
68
|
testId: testId,
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}, /*#__PURE__*/_react.default.createElement(_linkUrl.default, {
|
|
66
|
-
href: url,
|
|
67
|
-
target: "_blank",
|
|
68
|
-
testId: "item-count-url"
|
|
69
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
70
|
-
,
|
|
71
|
-
style: {
|
|
72
|
-
color: "var(--ds-text-accent-gray, ".concat(_colors.N800, ")"),
|
|
73
|
-
textDecoration: !url ? 'none' : ''
|
|
74
|
-
}
|
|
75
|
-
}, /*#__PURE__*/_react.default.createElement(_heading.default, {
|
|
76
|
-
level: "h200"
|
|
77
|
-
}, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.total-count-i18n-single-key') ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages4.searchCountMessages["".concat(prefixTextType, "CountText")], {
|
|
69
|
+
url: url
|
|
70
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages2.searchCountMessages["".concat(prefixTextType, "CountText")], {
|
|
78
71
|
values: {
|
|
79
72
|
searchCount: searchCount
|
|
80
73
|
}
|
|
81
|
-
}))
|
|
82
|
-
value: searchCount
|
|
83
|
-
}), ' ', prefixTextType === 'issue' && /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages2.modalMessages.issueText, {
|
|
84
|
-
values: {
|
|
85
|
-
totalCount: searchCount
|
|
86
|
-
}
|
|
87
|
-
})), prefixTextType === 'result' && /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.confluenceSearchModalMessages.searchCountText, {
|
|
88
|
-
values: {
|
|
89
|
-
totalCount: searchCount
|
|
90
|
-
}
|
|
91
|
-
})), prefixTextType === 'item' && /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages3.footerMessages.itemText, {
|
|
92
|
-
values: {
|
|
93
|
-
itemCount: searchCount
|
|
94
|
-
}
|
|
95
|
-
}))))));
|
|
74
|
+
})));
|
|
96
75
|
};
|
|
97
76
|
var _default = exports.default = TableSearchCount;
|
|
@@ -16,11 +16,6 @@ var confluenceSearchModalMessages = exports.confluenceSearchModalMessages = (0,
|
|
|
16
16
|
description: 'Button text to insert the displayed content',
|
|
17
17
|
defaultMessage: 'Insert results'
|
|
18
18
|
},
|
|
19
|
-
searchCountText: {
|
|
20
|
-
id: 'linkDataSource.confluence-search.configmodal.resultsCountText',
|
|
21
|
-
description: 'Text that appears after search count number.',
|
|
22
|
-
defaultMessage: '{totalCount, plural, one {result} other {results}}'
|
|
23
|
-
},
|
|
24
19
|
insertIssuesTitle: {
|
|
25
20
|
id: 'linkDataSource.confluence-search.configmodal.insertConfluenceTitle',
|
|
26
21
|
description: 'Title for the Confluence Search Datasource Confluence Search config modal',
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.appearanceMap = void 0;
|
|
7
|
-
//
|
|
7
|
+
// These types have been taken from jira-frontend to ensure the colour data return gets mapped correctly for the lozenge
|
|
8
8
|
var appearanceMap = exports.appearanceMap = {
|
|
9
9
|
BLUE_GRAY: 'default',
|
|
10
10
|
MEDIUM_GRAY: 'default',
|
|
@@ -26,11 +26,6 @@ var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
|
|
|
26
26
|
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
27
27
|
defaultMessage: '### Issues'
|
|
28
28
|
},
|
|
29
|
-
issueText: {
|
|
30
|
-
id: 'linkDataSource.jira-issues.configmodal.issue',
|
|
31
|
-
description: 'Text that appears after issue count number.',
|
|
32
|
-
defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
|
|
33
|
-
},
|
|
34
29
|
searchJiraTitleDuplicate: {
|
|
35
30
|
id: 'linkDataSource.jira-issues.searchJiraTitle',
|
|
36
31
|
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
@@ -2,17 +2,35 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { FormattedMessage, FormattedNumber } from 'react-intl-next';
|
|
4
4
|
import Heading from '@atlaskit/heading';
|
|
5
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
6
5
|
import { Flex, xcss } from '@atlaskit/primitives';
|
|
7
6
|
import LinkUrl from '@atlaskit/smart-card/link-url';
|
|
8
7
|
import { N800 } from '@atlaskit/theme/colors';
|
|
9
|
-
import { confluenceSearchModalMessages } from '../../../confluence-search-modal/modal/messages';
|
|
10
|
-
import { modalMessages } from '../../../jira-issues-modal/modal/messages';
|
|
11
8
|
import { footerMessages } from '../../../table-footer/messages';
|
|
12
9
|
import { searchCountMessages } from './messages';
|
|
13
10
|
const searchCountStyles = xcss({
|
|
14
11
|
flex: 1
|
|
15
12
|
});
|
|
13
|
+
const ItemCountWrapper = ({
|
|
14
|
+
url,
|
|
15
|
+
children,
|
|
16
|
+
testId
|
|
17
|
+
}) => /*#__PURE__*/React.createElement(Flex, {
|
|
18
|
+
testId: testId,
|
|
19
|
+
xcss: searchCountStyles,
|
|
20
|
+
alignItems: "center"
|
|
21
|
+
}, /*#__PURE__*/React.createElement(LinkUrl, {
|
|
22
|
+
href: url,
|
|
23
|
+
target: "_blank",
|
|
24
|
+
testId: "item-count-url"
|
|
25
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
26
|
+
,
|
|
27
|
+
style: {
|
|
28
|
+
color: `var(--ds-text-accent-gray, ${N800})`,
|
|
29
|
+
textDecoration: !url ? 'none' : ''
|
|
30
|
+
}
|
|
31
|
+
}, /*#__PURE__*/React.createElement(Heading, {
|
|
32
|
+
level: "h200"
|
|
33
|
+
}, children)));
|
|
16
34
|
export const AssetsItemCount = ({
|
|
17
35
|
searchCount,
|
|
18
36
|
url,
|
|
@@ -21,29 +39,16 @@ export const AssetsItemCount = ({
|
|
|
21
39
|
let capCount = searchCount >= 1000;
|
|
22
40
|
let displayCount = capCount ? 1000 : searchCount;
|
|
23
41
|
let countModifier = capCount ? '+' : '';
|
|
24
|
-
return /*#__PURE__*/React.createElement(
|
|
42
|
+
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
25
43
|
testId: testId,
|
|
26
|
-
|
|
27
|
-
alignItems: "center"
|
|
28
|
-
}, /*#__PURE__*/React.createElement(LinkUrl, {
|
|
29
|
-
href: url,
|
|
30
|
-
target: "_blank",
|
|
31
|
-
testId: "item-count-url"
|
|
32
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
33
|
-
,
|
|
34
|
-
style: {
|
|
35
|
-
color: `var(--ds-text-accent-gray, ${N800})`,
|
|
36
|
-
textDecoration: !url ? 'none' : ''
|
|
37
|
-
}
|
|
38
|
-
}, /*#__PURE__*/React.createElement(Heading, {
|
|
39
|
-
level: "h200"
|
|
44
|
+
url: url
|
|
40
45
|
}, /*#__PURE__*/React.createElement(FormattedNumber, {
|
|
41
46
|
value: displayCount
|
|
42
47
|
}), countModifier, ' ', /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, footerMessages.itemText, {
|
|
43
48
|
values: {
|
|
44
49
|
itemCount: searchCount
|
|
45
50
|
}
|
|
46
|
-
})))
|
|
51
|
+
})));
|
|
47
52
|
};
|
|
48
53
|
const TableSearchCount = ({
|
|
49
54
|
url,
|
|
@@ -51,40 +56,13 @@ const TableSearchCount = ({
|
|
|
51
56
|
testId = 'datasource-table-total-results-count',
|
|
52
57
|
prefixTextType = 'issue'
|
|
53
58
|
}) => {
|
|
54
|
-
return /*#__PURE__*/React.createElement(
|
|
59
|
+
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
55
60
|
testId: testId,
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}, /*#__PURE__*/React.createElement(LinkUrl, {
|
|
59
|
-
href: url,
|
|
60
|
-
target: "_blank",
|
|
61
|
-
testId: "item-count-url"
|
|
62
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
63
|
-
,
|
|
64
|
-
style: {
|
|
65
|
-
color: `var(--ds-text-accent-gray, ${N800})`,
|
|
66
|
-
textDecoration: !url ? 'none' : ''
|
|
67
|
-
}
|
|
68
|
-
}, /*#__PURE__*/React.createElement(Heading, {
|
|
69
|
-
level: "h200"
|
|
70
|
-
}, fg('platform.linking-platform.datasource.total-count-i18n-single-key') ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[`${prefixTextType}CountText`], {
|
|
61
|
+
url: url
|
|
62
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[`${prefixTextType}CountText`], {
|
|
71
63
|
values: {
|
|
72
64
|
searchCount
|
|
73
65
|
}
|
|
74
|
-
}))
|
|
75
|
-
value: searchCount
|
|
76
|
-
}), ' ', prefixTextType === 'issue' && /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.issueText, {
|
|
77
|
-
values: {
|
|
78
|
-
totalCount: searchCount
|
|
79
|
-
}
|
|
80
|
-
})), prefixTextType === 'result' && /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, confluenceSearchModalMessages.searchCountText, {
|
|
81
|
-
values: {
|
|
82
|
-
totalCount: searchCount
|
|
83
|
-
}
|
|
84
|
-
})), prefixTextType === 'item' && /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, footerMessages.itemText, {
|
|
85
|
-
values: {
|
|
86
|
-
itemCount: searchCount
|
|
87
|
-
}
|
|
88
|
-
}))))));
|
|
66
|
+
})));
|
|
89
67
|
};
|
|
90
68
|
export default TableSearchCount;
|
|
@@ -10,11 +10,6 @@ export const confluenceSearchModalMessages = defineMessages({
|
|
|
10
10
|
description: 'Button text to insert the displayed content',
|
|
11
11
|
defaultMessage: 'Insert results'
|
|
12
12
|
},
|
|
13
|
-
searchCountText: {
|
|
14
|
-
id: 'linkDataSource.confluence-search.configmodal.resultsCountText',
|
|
15
|
-
description: 'Text that appears after search count number.',
|
|
16
|
-
defaultMessage: '{totalCount, plural, one {result} other {results}}'
|
|
17
|
-
},
|
|
18
13
|
insertIssuesTitle: {
|
|
19
14
|
id: 'linkDataSource.confluence-search.configmodal.insertConfluenceTitle',
|
|
20
15
|
description: 'Title for the Confluence Search Datasource Confluence Search config modal',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
//
|
|
1
|
+
// These types have been taken from jira-frontend to ensure the colour data return gets mapped correctly for the lozenge
|
|
2
2
|
export const appearanceMap = {
|
|
3
3
|
BLUE_GRAY: 'default',
|
|
4
4
|
MEDIUM_GRAY: 'default',
|
|
@@ -20,11 +20,6 @@ export const modalMessages = defineMessages({
|
|
|
20
20
|
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
21
21
|
defaultMessage: '### Issues'
|
|
22
22
|
},
|
|
23
|
-
issueText: {
|
|
24
|
-
id: 'linkDataSource.jira-issues.configmodal.issue',
|
|
25
|
-
description: 'Text that appears after issue count number.',
|
|
26
|
-
defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
|
|
27
|
-
},
|
|
28
23
|
searchJiraTitleDuplicate: {
|
|
29
24
|
id: 'linkDataSource.jira-issues.searchJiraTitle',
|
|
30
25
|
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
@@ -2,24 +2,18 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { FormattedMessage, FormattedNumber } from 'react-intl-next';
|
|
4
4
|
import Heading from '@atlaskit/heading';
|
|
5
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
6
5
|
import { Flex, xcss } from '@atlaskit/primitives';
|
|
7
6
|
import LinkUrl from '@atlaskit/smart-card/link-url';
|
|
8
7
|
import { N800 } from '@atlaskit/theme/colors';
|
|
9
|
-
import { confluenceSearchModalMessages } from '../../../confluence-search-modal/modal/messages';
|
|
10
|
-
import { modalMessages } from '../../../jira-issues-modal/modal/messages';
|
|
11
8
|
import { footerMessages } from '../../../table-footer/messages';
|
|
12
9
|
import { searchCountMessages } from './messages';
|
|
13
10
|
var searchCountStyles = xcss({
|
|
14
11
|
flex: 1
|
|
15
12
|
});
|
|
16
|
-
|
|
17
|
-
var
|
|
18
|
-
|
|
13
|
+
var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
14
|
+
var url = _ref.url,
|
|
15
|
+
children = _ref.children,
|
|
19
16
|
testId = _ref.testId;
|
|
20
|
-
var capCount = searchCount >= 1000;
|
|
21
|
-
var displayCount = capCount ? 1000 : searchCount;
|
|
22
|
-
var countModifier = capCount ? '+' : '';
|
|
23
17
|
return /*#__PURE__*/React.createElement(Flex, {
|
|
24
18
|
testId: testId,
|
|
25
19
|
xcss: searchCountStyles,
|
|
@@ -36,55 +30,40 @@ export var AssetsItemCount = function AssetsItemCount(_ref) {
|
|
|
36
30
|
}
|
|
37
31
|
}, /*#__PURE__*/React.createElement(Heading, {
|
|
38
32
|
level: "h200"
|
|
33
|
+
}, children)));
|
|
34
|
+
};
|
|
35
|
+
export var AssetsItemCount = function AssetsItemCount(_ref2) {
|
|
36
|
+
var searchCount = _ref2.searchCount,
|
|
37
|
+
url = _ref2.url,
|
|
38
|
+
testId = _ref2.testId;
|
|
39
|
+
var capCount = searchCount >= 1000;
|
|
40
|
+
var displayCount = capCount ? 1000 : searchCount;
|
|
41
|
+
var countModifier = capCount ? '+' : '';
|
|
42
|
+
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
43
|
+
testId: testId,
|
|
44
|
+
url: url
|
|
39
45
|
}, /*#__PURE__*/React.createElement(FormattedNumber, {
|
|
40
46
|
value: displayCount
|
|
41
47
|
}), countModifier, ' ', /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, footerMessages.itemText, {
|
|
42
48
|
values: {
|
|
43
49
|
itemCount: searchCount
|
|
44
50
|
}
|
|
45
|
-
})))
|
|
51
|
+
})));
|
|
46
52
|
};
|
|
47
|
-
var TableSearchCount = function TableSearchCount(
|
|
48
|
-
var url =
|
|
49
|
-
searchCount =
|
|
50
|
-
|
|
51
|
-
testId =
|
|
52
|
-
|
|
53
|
-
prefixTextType =
|
|
54
|
-
return /*#__PURE__*/React.createElement(
|
|
53
|
+
var TableSearchCount = function TableSearchCount(_ref3) {
|
|
54
|
+
var url = _ref3.url,
|
|
55
|
+
searchCount = _ref3.searchCount,
|
|
56
|
+
_ref3$testId = _ref3.testId,
|
|
57
|
+
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
58
|
+
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
59
|
+
prefixTextType = _ref3$prefixTextType === void 0 ? 'issue' : _ref3$prefixTextType;
|
|
60
|
+
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
55
61
|
testId: testId,
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}, /*#__PURE__*/React.createElement(LinkUrl, {
|
|
59
|
-
href: url,
|
|
60
|
-
target: "_blank",
|
|
61
|
-
testId: "item-count-url"
|
|
62
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
63
|
-
,
|
|
64
|
-
style: {
|
|
65
|
-
color: "var(--ds-text-accent-gray, ".concat(N800, ")"),
|
|
66
|
-
textDecoration: !url ? 'none' : ''
|
|
67
|
-
}
|
|
68
|
-
}, /*#__PURE__*/React.createElement(Heading, {
|
|
69
|
-
level: "h200"
|
|
70
|
-
}, fg('platform.linking-platform.datasource.total-count-i18n-single-key') ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages["".concat(prefixTextType, "CountText")], {
|
|
62
|
+
url: url
|
|
63
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages["".concat(prefixTextType, "CountText")], {
|
|
71
64
|
values: {
|
|
72
65
|
searchCount: searchCount
|
|
73
66
|
}
|
|
74
|
-
}))
|
|
75
|
-
value: searchCount
|
|
76
|
-
}), ' ', prefixTextType === 'issue' && /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.issueText, {
|
|
77
|
-
values: {
|
|
78
|
-
totalCount: searchCount
|
|
79
|
-
}
|
|
80
|
-
})), prefixTextType === 'result' && /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, confluenceSearchModalMessages.searchCountText, {
|
|
81
|
-
values: {
|
|
82
|
-
totalCount: searchCount
|
|
83
|
-
}
|
|
84
|
-
})), prefixTextType === 'item' && /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, footerMessages.itemText, {
|
|
85
|
-
values: {
|
|
86
|
-
itemCount: searchCount
|
|
87
|
-
}
|
|
88
|
-
}))))));
|
|
67
|
+
})));
|
|
89
68
|
};
|
|
90
69
|
export default TableSearchCount;
|
|
@@ -10,11 +10,6 @@ export var confluenceSearchModalMessages = defineMessages({
|
|
|
10
10
|
description: 'Button text to insert the displayed content',
|
|
11
11
|
defaultMessage: 'Insert results'
|
|
12
12
|
},
|
|
13
|
-
searchCountText: {
|
|
14
|
-
id: 'linkDataSource.confluence-search.configmodal.resultsCountText',
|
|
15
|
-
description: 'Text that appears after search count number.',
|
|
16
|
-
defaultMessage: '{totalCount, plural, one {result} other {results}}'
|
|
17
|
-
},
|
|
18
13
|
insertIssuesTitle: {
|
|
19
14
|
id: 'linkDataSource.confluence-search.configmodal.insertConfluenceTitle',
|
|
20
15
|
description: 'Title for the Confluence Search Datasource Confluence Search config modal',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
//
|
|
1
|
+
// These types have been taken from jira-frontend to ensure the colour data return gets mapped correctly for the lozenge
|
|
2
2
|
export var appearanceMap = {
|
|
3
3
|
BLUE_GRAY: 'default',
|
|
4
4
|
MEDIUM_GRAY: 'default',
|
|
@@ -20,11 +20,6 @@ export var modalMessages = defineMessages({
|
|
|
20
20
|
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
21
21
|
defaultMessage: '### Issues'
|
|
22
22
|
},
|
|
23
|
-
issueText: {
|
|
24
|
-
id: 'linkDataSource.jira-issues.configmodal.issue',
|
|
25
|
-
description: 'Text that appears after issue count number.',
|
|
26
|
-
defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
|
|
27
|
-
},
|
|
28
23
|
searchJiraTitleDuplicate: {
|
|
29
24
|
id: 'linkDataSource.jira-issues.searchJiraTitle',
|
|
30
25
|
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export declare const AssetsItemCount: ({ searchCount, url, testId, }: {
|
|
3
|
-
searchCount: number;
|
|
4
|
-
url: string | undefined;
|
|
5
|
-
testId: string;
|
|
6
|
-
}) => JSX.Element;
|
|
7
2
|
interface TableSearchCountProps {
|
|
8
3
|
url?: string;
|
|
9
4
|
prefixTextType: 'issue' | 'result' | 'item';
|
|
10
5
|
searchCount: number;
|
|
11
6
|
testId?: string;
|
|
12
7
|
}
|
|
8
|
+
export declare const AssetsItemCount: ({ searchCount, url, testId, }: Pick<TableSearchCountProps, 'testId' | 'url' | 'searchCount'>) => JSX.Element;
|
|
13
9
|
declare const TableSearchCount: ({ url, searchCount, testId, prefixTextType, }: TableSearchCountProps) => JSX.Element;
|
|
14
10
|
export default TableSearchCount;
|
|
@@ -9,11 +9,6 @@ export declare const confluenceSearchModalMessages: {
|
|
|
9
9
|
description: string;
|
|
10
10
|
defaultMessage: string;
|
|
11
11
|
};
|
|
12
|
-
searchCountText: {
|
|
13
|
-
id: string;
|
|
14
|
-
description: string;
|
|
15
|
-
defaultMessage: string;
|
|
16
|
-
};
|
|
17
12
|
insertIssuesTitle: {
|
|
18
13
|
id: string;
|
|
19
14
|
description: string;
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export declare const AssetsItemCount: ({ searchCount, url, testId, }: {
|
|
3
|
-
searchCount: number;
|
|
4
|
-
url: string | undefined;
|
|
5
|
-
testId: string;
|
|
6
|
-
}) => JSX.Element;
|
|
7
2
|
interface TableSearchCountProps {
|
|
8
3
|
url?: string;
|
|
9
4
|
prefixTextType: 'issue' | 'result' | 'item';
|
|
10
5
|
searchCount: number;
|
|
11
6
|
testId?: string;
|
|
12
7
|
}
|
|
8
|
+
export declare const AssetsItemCount: ({ searchCount, url, testId, }: Pick<TableSearchCountProps, 'testId' | 'url' | 'searchCount'>) => JSX.Element;
|
|
13
9
|
declare const TableSearchCount: ({ url, searchCount, testId, prefixTextType, }: TableSearchCountProps) => JSX.Element;
|
|
14
10
|
export default TableSearchCount;
|
|
@@ -9,11 +9,6 @@ export declare const confluenceSearchModalMessages: {
|
|
|
9
9
|
description: string;
|
|
10
10
|
defaultMessage: string;
|
|
11
11
|
};
|
|
12
|
-
searchCountText: {
|
|
13
|
-
id: string;
|
|
14
|
-
description: string;
|
|
15
|
-
defaultMessage: string;
|
|
16
|
-
};
|
|
17
12
|
insertIssuesTitle: {
|
|
18
13
|
id: string;
|
|
19
14
|
description: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/link-datasource",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.10",
|
|
4
4
|
"description": "UI Components to support linking platform dataset feature",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@atlaskit/avatar": "^21.11.0",
|
|
41
41
|
"@atlaskit/avatar-group": "^9.9.0",
|
|
42
42
|
"@atlaskit/badge": "^16.3.0",
|
|
43
|
-
"@atlaskit/button": "^18.
|
|
43
|
+
"@atlaskit/button": "^18.4.0",
|
|
44
44
|
"@atlaskit/datetime-picker": "^13.7.0",
|
|
45
45
|
"@atlaskit/dropdown-menu": "^12.14.0",
|
|
46
46
|
"@atlaskit/editor-prosemirror": "4.0.1",
|
|
@@ -56,9 +56,9 @@
|
|
|
56
56
|
"@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
|
|
57
57
|
"@atlaskit/link-client-extension": "^1.9.0",
|
|
58
58
|
"@atlaskit/linking-common": "^5.7.0",
|
|
59
|
-
"@atlaskit/linking-types": "^8.
|
|
59
|
+
"@atlaskit/linking-types": "^8.11.0",
|
|
60
60
|
"@atlaskit/logo": "^14.1.0",
|
|
61
|
-
"@atlaskit/lozenge": "^11.
|
|
61
|
+
"@atlaskit/lozenge": "^11.9.0",
|
|
62
62
|
"@atlaskit/modal-dialog": "^12.14.0",
|
|
63
63
|
"@atlaskit/outbound-auth-flow-client": "^3.4.5",
|
|
64
64
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
"@atlaskit/primitives": "^11.0.0",
|
|
71
71
|
"@atlaskit/select": "^17.11.0",
|
|
72
72
|
"@atlaskit/smart-card": "^27.9.0",
|
|
73
|
-
"@atlaskit/smart-user-picker": "6.9.
|
|
73
|
+
"@atlaskit/smart-user-picker": "6.9.4",
|
|
74
74
|
"@atlaskit/spinner": "^16.2.0",
|
|
75
75
|
"@atlaskit/tag": "^12.4.0",
|
|
76
76
|
"@atlaskit/textfield": "6.4.2",
|
|
77
77
|
"@atlaskit/theme": "^12.11.0",
|
|
78
|
-
"@atlaskit/tokens": "^1.
|
|
78
|
+
"@atlaskit/tokens": "^1.54.0",
|
|
79
79
|
"@atlaskit/tooltip": "^18.5.0",
|
|
80
80
|
"@atlaskit/ufo": "^0.2.4",
|
|
81
81
|
"@atlaskit/width-detector": "^4.2.0",
|
|
@@ -158,9 +158,6 @@
|
|
|
158
158
|
"platform.linking-platform.datasource-assets_add_version_parameter": {
|
|
159
159
|
"type": "boolean"
|
|
160
160
|
},
|
|
161
|
-
"platform.linking-platform.datasource.total-count-i18n-single-key": {
|
|
162
|
-
"type": "boolean"
|
|
163
|
-
},
|
|
164
161
|
"platform.linking-platform.datasource-assets_update_refresh_button_dt3qk": {
|
|
165
162
|
"type": "boolean"
|
|
166
163
|
},
|