@atlaskit/link-datasource 3.16.2 → 3.18.0
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 +24 -0
- package/dist/cjs/ui/common/initial-state-view/messages.js +10 -0
- package/dist/cjs/ui/common/modal/basic-search-input/index.js +2 -1
- package/dist/cjs/ui/common/modal/basic-search-input/messages.js +10 -0
- package/dist/cjs/ui/common/modal/search-count/index.js +4 -1
- package/dist/cjs/ui/common/modal/search-count/messages.js +5 -0
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +17 -5
- package/dist/cjs/ui/jira-issues-modal/modal/messages.js +25 -0
- package/dist/cjs/ui/table-footer/powered-by-jsm-assets/index.js +1 -0
- package/dist/es2019/ui/common/initial-state-view/messages.js +10 -0
- package/dist/es2019/ui/common/modal/basic-search-input/index.js +2 -1
- package/dist/es2019/ui/common/modal/basic-search-input/messages.js +10 -0
- package/dist/es2019/ui/common/modal/search-count/index.js +4 -1
- package/dist/es2019/ui/common/modal/search-count/messages.js +5 -0
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +17 -5
- package/dist/es2019/ui/jira-issues-modal/modal/messages.js +25 -0
- package/dist/es2019/ui/table-footer/powered-by-jsm-assets/index.js +1 -0
- package/dist/esm/ui/common/initial-state-view/messages.js +10 -0
- package/dist/esm/ui/common/modal/basic-search-input/index.js +2 -1
- package/dist/esm/ui/common/modal/basic-search-input/messages.js +10 -0
- package/dist/esm/ui/common/modal/search-count/index.js +4 -1
- package/dist/esm/ui/common/modal/search-count/messages.js +5 -0
- package/dist/esm/ui/jira-issues-modal/modal/index.js +17 -5
- package/dist/esm/ui/jira-issues-modal/modal/messages.js +25 -0
- package/dist/esm/ui/table-footer/powered-by-jsm-assets/index.js +1 -0
- package/dist/types/analytics/wrappers/render-failed/datasourceRenderFailedAnalyticsWrapper.d.ts +1 -1
- package/dist/types/ui/common/initial-state-view/messages.d.ts +10 -0
- package/dist/types/ui/common/modal/basic-search-input/messages.d.ts +10 -0
- package/dist/types/ui/common/modal/search-count/messages.d.ts +5 -0
- package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts +1 -1
- package/dist/types/ui/issue-like-table/truncate-text-tag/index.d.ts +3 -1
- package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +25 -0
- package/dist/types-ts4.5/analytics/wrappers/render-failed/datasourceRenderFailedAnalyticsWrapper.d.ts +1 -1
- package/dist/types-ts4.5/ui/common/initial-state-view/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/common/modal/basic-search-input/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/common/modal/search-count/messages.d.ts +5 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts +1 -1
- package/dist/types-ts4.5/ui/issue-like-table/truncate-text-tag/index.d.ts +3 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +25 -0
- package/package.json +50 -47
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# @atlaskit/link-datasource
|
|
2
2
|
|
|
3
|
+
## 3.18.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#105866](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105866)
|
|
8
|
+
[`14e4e9c1a2ae3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/14e4e9c1a2ae3) -
|
|
9
|
+
[ux] Rebranded the term Issue to Work item as part of issue terminology refresh
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 3.17.0
|
|
16
|
+
|
|
17
|
+
### Minor Changes
|
|
18
|
+
|
|
19
|
+
- [#109060](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109060)
|
|
20
|
+
[`4660ec858a305`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4660ec858a305) -
|
|
21
|
+
Update `React` from v16 to v18
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- Updated dependencies
|
|
26
|
+
|
|
3
27
|
## 3.16.2
|
|
4
28
|
|
|
5
29
|
### Patch Changes
|
|
@@ -37,5 +37,15 @@ var initialStateViewMessages = exports.initialStateViewMessages = (0, _reactIntl
|
|
|
37
37
|
id: 'linkDataSource.modal-initial-state.learnMoreLink',
|
|
38
38
|
description: 'The link that displays under the search description to help people know more about JQL',
|
|
39
39
|
defaultMessage: 'Learn how to search with JQL'
|
|
40
|
+
},
|
|
41
|
+
searchDescriptionForJQLSearchIssueTermRefresh: {
|
|
42
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-jql-issue-term-refresh',
|
|
43
|
+
description: 'The initial modal search state helper message displayed under the search title when JQL search mode is selected',
|
|
44
|
+
defaultMessage: "Use JQL (Jira Query Language) to search for work items."
|
|
45
|
+
},
|
|
46
|
+
searchDescriptionForBasicSearchIssueTermRefresh: {
|
|
47
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-basic-issue-term-refresh',
|
|
48
|
+
description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
|
|
49
|
+
defaultMessage: "Search by keyword for work items to insert."
|
|
40
50
|
}
|
|
41
51
|
});
|
|
@@ -9,6 +9,7 @@ var _react = require("@emotion/react");
|
|
|
9
9
|
var _reactIntlNext = require("react-intl-next");
|
|
10
10
|
var _button = require("@atlaskit/button");
|
|
11
11
|
var _searchEditorSearch = _interopRequireDefault(require("@atlaskit/icon/core/migration/search--editor-search"));
|
|
12
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
12
13
|
var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
|
|
13
14
|
var _analytics = require("../../../../analytics");
|
|
14
15
|
var _messages = require("./messages");
|
|
@@ -58,7 +59,7 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
|
|
|
58
59
|
appearance: "primary",
|
|
59
60
|
css: searchButtonStyles,
|
|
60
61
|
iconBefore: (0, _react.jsx)(_searchEditorSearch.default, {
|
|
61
|
-
label: formatMessage(_messages.basicSearchInputMessages.basicTextSearchLabel),
|
|
62
|
+
label: formatMessage((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages.basicSearchInputMessages.basicTextSearchLabelIssueTermRefresh : _messages.basicSearchInputMessages.basicTextSearchLabel),
|
|
62
63
|
LEGACY_size: "medium",
|
|
63
64
|
color: "currentColor",
|
|
64
65
|
spacing: "spacious"
|
|
@@ -15,5 +15,15 @@ var basicSearchInputMessages = exports.basicSearchInputMessages = (0, _reactIntl
|
|
|
15
15
|
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder',
|
|
16
16
|
description: 'Placeholder text for the search input box',
|
|
17
17
|
defaultMessage: 'Search for issues by keyword'
|
|
18
|
+
},
|
|
19
|
+
basicTextSearchLabelDuplicateIssueTermRefresh: {
|
|
20
|
+
id: 'linkDataSource.configmodal.basicTextSearchPlaceholder-issue-term-refresh',
|
|
21
|
+
description: 'Placeholder text for the search input box',
|
|
22
|
+
defaultMessage: "Search for work items by keyword"
|
|
23
|
+
},
|
|
24
|
+
basicTextSearchLabelIssueTermRefresh: {
|
|
25
|
+
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder-issue-term-refresh',
|
|
26
|
+
description: 'Placeholder text for the search input box',
|
|
27
|
+
defaultMessage: "Search for work items by keyword"
|
|
18
28
|
}
|
|
19
29
|
});
|
|
@@ -9,6 +9,7 @@ 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");
|
|
12
13
|
var _primitives = require("@atlaskit/primitives");
|
|
13
14
|
var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
|
|
14
15
|
var _colors = require("@atlaskit/theme/colors");
|
|
@@ -64,10 +65,12 @@ var TableSearchCount = function TableSearchCount(_ref3) {
|
|
|
64
65
|
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
65
66
|
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
66
67
|
prefixTextType = _ref3$prefixTextType === void 0 ? 'issue' : _ref3$prefixTextType;
|
|
68
|
+
var isIssue = prefixTextType === 'issue';
|
|
69
|
+
var messageKey = isIssue && (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : "".concat(prefixTextType, "CountText");
|
|
67
70
|
return /*#__PURE__*/_react.default.createElement(ItemCountWrapper, {
|
|
68
71
|
testId: testId,
|
|
69
72
|
url: url
|
|
70
|
-
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages2.searchCountMessages[
|
|
73
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages2.searchCountMessages[messageKey], {
|
|
71
74
|
values: {
|
|
72
75
|
searchCount: searchCount
|
|
73
76
|
}
|
|
@@ -20,5 +20,10 @@ var searchCountMessages = exports.searchCountMessages = (0, _reactIntlNext.defin
|
|
|
20
20
|
id: 'linkDataSource.search.configmodal.itemCountText',
|
|
21
21
|
description: 'Text that indicates the number of items in the search result.',
|
|
22
22
|
defaultMessage: '{searchCount, plural, one {# item} other {# items}}'
|
|
23
|
+
},
|
|
24
|
+
issueCountTextIssueTermRefresh: {
|
|
25
|
+
id: "linkDataSource.search.configmodal.issueCountText-issue-term-refresh",
|
|
26
|
+
description: 'Text that indicates the number of jira issues in the search result.',
|
|
27
|
+
defaultMessage: "{searchCount, plural, one {# work item} other {# work items}}"
|
|
23
28
|
}
|
|
24
29
|
});
|
|
@@ -13,6 +13,7 @@ var _react2 = require("@emotion/react");
|
|
|
13
13
|
var _reactIntlNext = require("react-intl-next");
|
|
14
14
|
var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
|
|
15
15
|
var _modalDialog = require("@atlaskit/modal-dialog");
|
|
16
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
17
|
var _analytics = require("../../../analytics");
|
|
17
18
|
var _constants = require("../../../analytics/constants");
|
|
18
19
|
var _types = require("../../../analytics/types");
|
|
@@ -252,7 +253,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
252
253
|
});
|
|
253
254
|
} else if (status === 'empty' || !jql || !selectedJiraSiteUrl) {
|
|
254
255
|
return (0, _react2.jsx)(_countViewSmartLink.SmartCardPlaceholder, {
|
|
255
|
-
placeholderText: _messages3.modalMessages.issuesCountSmartCardPlaceholderText
|
|
256
|
+
placeholderText: (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.issuesCountSmartCardPlaceholderTextIssueTermRefresh : _messages3.modalMessages.issuesCountSmartCardPlaceholderText
|
|
256
257
|
});
|
|
257
258
|
} else {
|
|
258
259
|
var url;
|
|
@@ -268,6 +269,12 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
268
269
|
}, [jql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, responseItems, retrieveUrlForSmartCardRender]);
|
|
269
270
|
var renderIssuesModeContent = (0, _react.useCallback)(function () {
|
|
270
271
|
var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
|
|
272
|
+
var getDescriptionMessage = function getDescriptionMessage() {
|
|
273
|
+
if ((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh')) {
|
|
274
|
+
return currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : _messages2.initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
|
|
275
|
+
}
|
|
276
|
+
return currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearch : _messages2.initialStateViewMessages.searchDescriptionForBasicSearch;
|
|
277
|
+
};
|
|
271
278
|
if (status === 'rejected' && jqlUrl) {
|
|
272
279
|
return (0, _react2.jsx)(_modalLoadingError.ModalLoadingError, {
|
|
273
280
|
errorMessage: jqlUrl ? (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages3.modalMessages.checkConnectionWithSource, {
|
|
@@ -294,8 +301,8 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
294
301
|
testId: "jira-datasource-modal--empty-state"
|
|
295
302
|
}) : (0, _react2.jsx)(_initialStateView.InitialStateView, {
|
|
296
303
|
icon: (0, _react2.jsx)(_jiraIssuesInitialStateSvg.JiraInitialStateSVG, null),
|
|
297
|
-
title: _messages3.modalMessages.searchJiraTitle,
|
|
298
|
-
description:
|
|
304
|
+
title: (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.searchJiraTitleIssueTermRefresh : _messages3.modalMessages.searchJiraTitle,
|
|
305
|
+
description: getDescriptionMessage(),
|
|
299
306
|
learnMoreLink: currentSearchMethod === 'jql' ? {
|
|
300
307
|
href: jqlSupportDocumentLink,
|
|
301
308
|
text: _messages2.initialStateViewMessages.learnMoreLink
|
|
@@ -308,7 +315,12 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
308
315
|
testId: "jira-datasource-table"
|
|
309
316
|
}));
|
|
310
317
|
}, [columns.length, currentSearchMethod, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
|
|
311
|
-
var siteSelectorLabel =
|
|
318
|
+
var siteSelectorLabel = (0, _react.useMemo)(function () {
|
|
319
|
+
if ((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh')) {
|
|
320
|
+
return availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySitesIssueTermRefresh : _messages3.modalMessages.insertIssuesTitleIssueTermRefresh;
|
|
321
|
+
}
|
|
322
|
+
return availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySites : _messages3.modalMessages.insertIssuesTitle;
|
|
323
|
+
}, [availableSites]);
|
|
312
324
|
var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
|
|
313
325
|
return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
|
|
314
326
|
searchCount: searchCount.current,
|
|
@@ -374,7 +386,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
374
386
|
testId: "jira-datasource-modal--insert-button",
|
|
375
387
|
url: urlToInsert,
|
|
376
388
|
getAnalyticsPayload: getInsertButtonAnalyticsPayload
|
|
377
|
-
}, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonText))))));
|
|
389
|
+
}, (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonTextIssueTermRefresh) : (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonText))))));
|
|
378
390
|
};
|
|
379
391
|
var ConnectedJiraIssueConfigModal = (0, _createDatasourceModal.createDatasourceModal)({
|
|
380
392
|
isValidParameters: isValidParameters,
|
|
@@ -96,5 +96,30 @@ var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
|
|
|
96
96
|
id: 'linkDataSource.jira-issues.checkConnectionWithSource',
|
|
97
97
|
description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
|
|
98
98
|
defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
|
|
99
|
+
},
|
|
100
|
+
insertIssuesButtonTextIssueTermRefresh: {
|
|
101
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
|
|
102
|
+
description: 'Button text to insert the displayed content',
|
|
103
|
+
defaultMessage: 'Insert work items'
|
|
104
|
+
},
|
|
105
|
+
insertIssuesTitleIssueTermRefresh: {
|
|
106
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitle-issue-term-refresh',
|
|
107
|
+
description: 'Title for the Jira Issues Datasource config modal',
|
|
108
|
+
defaultMessage: 'Insert Jira work items'
|
|
109
|
+
},
|
|
110
|
+
insertIssuesTitleManySitesIssueTermRefresh: {
|
|
111
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites-issue-term-refresh',
|
|
112
|
+
description: 'Title for the Jira Issues modal when a user has to select a site to inserting issues from',
|
|
113
|
+
defaultMessage: 'Insert Jira work items from'
|
|
114
|
+
},
|
|
115
|
+
issuesCountSmartCardPlaceholderTextIssueTermRefresh: {
|
|
116
|
+
id: 'linkDataSource.jira-issues.configmodal.placeholder.issues-issue-term-refresh',
|
|
117
|
+
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
118
|
+
defaultMessage: '### work items'
|
|
119
|
+
},
|
|
120
|
+
searchJiraTitleIssueTermRefresh: {
|
|
121
|
+
id: 'linkDataSource.modal-initial-state.searchTitle-issue-term-refresh',
|
|
122
|
+
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
123
|
+
defaultMessage: 'Search for Jira work items'
|
|
99
124
|
}
|
|
100
125
|
});
|
|
@@ -10,6 +10,7 @@ var _logo = require("@atlaskit/logo");
|
|
|
10
10
|
var _primitives = require("@atlaskit/primitives");
|
|
11
11
|
var _analytics = require("../../../analytics");
|
|
12
12
|
var jsmTextStyles = (0, _primitives.xcss)({
|
|
13
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
13
14
|
fontSize: 'small',
|
|
14
15
|
color: 'color.text.subtle',
|
|
15
16
|
marginLeft: 'space.075',
|
|
@@ -31,5 +31,15 @@ export const initialStateViewMessages = defineMessages({
|
|
|
31
31
|
id: 'linkDataSource.modal-initial-state.learnMoreLink',
|
|
32
32
|
description: 'The link that displays under the search description to help people know more about JQL',
|
|
33
33
|
defaultMessage: 'Learn how to search with JQL'
|
|
34
|
+
},
|
|
35
|
+
searchDescriptionForJQLSearchIssueTermRefresh: {
|
|
36
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-jql-issue-term-refresh',
|
|
37
|
+
description: 'The initial modal search state helper message displayed under the search title when JQL search mode is selected',
|
|
38
|
+
defaultMessage: "Use JQL (Jira Query Language) to search for work items."
|
|
39
|
+
},
|
|
40
|
+
searchDescriptionForBasicSearchIssueTermRefresh: {
|
|
41
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-basic-issue-term-refresh',
|
|
42
|
+
description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
|
|
43
|
+
defaultMessage: "Search by keyword for work items to insert."
|
|
34
44
|
}
|
|
35
45
|
});
|
|
@@ -8,6 +8,7 @@ import { css, jsx } from '@emotion/react';
|
|
|
8
8
|
import { useIntl } from 'react-intl-next';
|
|
9
9
|
import { LoadingButton } from '@atlaskit/button';
|
|
10
10
|
import SearchIcon from '@atlaskit/icon/core/migration/search--editor-search';
|
|
11
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
12
|
import Textfield from '@atlaskit/textfield';
|
|
12
13
|
import { useDatasourceAnalyticsEvents } from '../../../../analytics';
|
|
13
14
|
import { basicSearchInputMessages } from './messages';
|
|
@@ -53,7 +54,7 @@ export const BasicSearchInput = ({
|
|
|
53
54
|
appearance: "primary",
|
|
54
55
|
css: searchButtonStyles,
|
|
55
56
|
iconBefore: jsx(SearchIcon, {
|
|
56
|
-
label: formatMessage(basicSearchInputMessages.basicTextSearchLabel),
|
|
57
|
+
label: formatMessage(fg('confluence-issue-terminology-refresh') ? basicSearchInputMessages.basicTextSearchLabelIssueTermRefresh : basicSearchInputMessages.basicTextSearchLabel),
|
|
57
58
|
LEGACY_size: "medium",
|
|
58
59
|
color: "currentColor",
|
|
59
60
|
spacing: "spacious"
|
|
@@ -9,5 +9,15 @@ export const basicSearchInputMessages = defineMessages({
|
|
|
9
9
|
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder',
|
|
10
10
|
description: 'Placeholder text for the search input box',
|
|
11
11
|
defaultMessage: 'Search for issues by keyword'
|
|
12
|
+
},
|
|
13
|
+
basicTextSearchLabelDuplicateIssueTermRefresh: {
|
|
14
|
+
id: 'linkDataSource.configmodal.basicTextSearchPlaceholder-issue-term-refresh',
|
|
15
|
+
description: 'Placeholder text for the search input box',
|
|
16
|
+
defaultMessage: "Search for work items by keyword"
|
|
17
|
+
},
|
|
18
|
+
basicTextSearchLabelIssueTermRefresh: {
|
|
19
|
+
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder-issue-term-refresh',
|
|
20
|
+
description: 'Placeholder text for the search input box',
|
|
21
|
+
defaultMessage: "Search for work items by keyword"
|
|
12
22
|
}
|
|
13
23
|
});
|
|
@@ -2,6 +2,7 @@ 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';
|
|
5
6
|
import { Flex, xcss } from '@atlaskit/primitives';
|
|
6
7
|
import LinkUrl from '@atlaskit/smart-card/link-url';
|
|
7
8
|
import { N800 } from '@atlaskit/theme/colors';
|
|
@@ -56,10 +57,12 @@ const TableSearchCount = ({
|
|
|
56
57
|
testId = 'datasource-table-total-results-count',
|
|
57
58
|
prefixTextType = 'issue'
|
|
58
59
|
}) => {
|
|
60
|
+
const isIssue = prefixTextType === 'issue';
|
|
61
|
+
const messageKey = isIssue && fg('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : `${prefixTextType}CountText`;
|
|
59
62
|
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
60
63
|
testId: testId,
|
|
61
64
|
url: url
|
|
62
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[
|
|
65
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[messageKey], {
|
|
63
66
|
values: {
|
|
64
67
|
searchCount
|
|
65
68
|
}
|
|
@@ -14,5 +14,10 @@ export const searchCountMessages = defineMessages({
|
|
|
14
14
|
id: 'linkDataSource.search.configmodal.itemCountText',
|
|
15
15
|
description: 'Text that indicates the number of items in the search result.',
|
|
16
16
|
defaultMessage: '{searchCount, plural, one {# item} other {# items}}'
|
|
17
|
+
},
|
|
18
|
+
issueCountTextIssueTermRefresh: {
|
|
19
|
+
id: "linkDataSource.search.configmodal.issueCountText-issue-term-refresh",
|
|
20
|
+
description: 'Text that indicates the number of jira issues in the search result.',
|
|
21
|
+
defaultMessage: "{searchCount, plural, one {# work item} other {# work items}}"
|
|
17
22
|
}
|
|
18
23
|
});
|
|
@@ -12,6 +12,7 @@ import { jsx } from '@emotion/react';
|
|
|
12
12
|
import { FormattedMessage } from 'react-intl-next';
|
|
13
13
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
14
14
|
import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
|
|
15
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
16
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
16
17
|
import { EVENT_CHANNEL } from '../../../analytics/constants';
|
|
17
18
|
import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
|
|
@@ -241,7 +242,7 @@ const PlainJiraIssuesConfigModal = props => {
|
|
|
241
242
|
});
|
|
242
243
|
} else if (status === 'empty' || !jql || !selectedJiraSiteUrl) {
|
|
243
244
|
return jsx(SmartCardPlaceholder, {
|
|
244
|
-
placeholderText: modalMessages.issuesCountSmartCardPlaceholderText
|
|
245
|
+
placeholderText: fg('confluence-issue-terminology-refresh') ? modalMessages.issuesCountSmartCardPlaceholderTextIssueTermRefresh : modalMessages.issuesCountSmartCardPlaceholderText
|
|
245
246
|
});
|
|
246
247
|
} else {
|
|
247
248
|
let url;
|
|
@@ -257,6 +258,12 @@ const PlainJiraIssuesConfigModal = props => {
|
|
|
257
258
|
}, [jql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, responseItems, retrieveUrlForSmartCardRender]);
|
|
258
259
|
const renderIssuesModeContent = useCallback(() => {
|
|
259
260
|
const selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
|
|
261
|
+
const getDescriptionMessage = () => {
|
|
262
|
+
if (fg('confluence-issue-terminology-refresh')) {
|
|
263
|
+
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
|
|
264
|
+
}
|
|
265
|
+
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch;
|
|
266
|
+
};
|
|
260
267
|
if (status === 'rejected' && jqlUrl) {
|
|
261
268
|
return jsx(ModalLoadingError, {
|
|
262
269
|
errorMessage: jqlUrl ? jsx(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSource, {
|
|
@@ -281,8 +288,8 @@ const PlainJiraIssuesConfigModal = props => {
|
|
|
281
288
|
testId: `jira-datasource-modal--empty-state`
|
|
282
289
|
}) : jsx(InitialStateView, {
|
|
283
290
|
icon: jsx(JiraInitialStateSVG, null),
|
|
284
|
-
title: modalMessages.searchJiraTitle,
|
|
285
|
-
description:
|
|
291
|
+
title: fg('confluence-issue-terminology-refresh') ? modalMessages.searchJiraTitleIssueTermRefresh : modalMessages.searchJiraTitle,
|
|
292
|
+
description: getDescriptionMessage(),
|
|
286
293
|
learnMoreLink: currentSearchMethod === 'jql' ? {
|
|
287
294
|
href: jqlSupportDocumentLink,
|
|
288
295
|
text: initialStateViewMessages.learnMoreLink
|
|
@@ -295,7 +302,12 @@ const PlainJiraIssuesConfigModal = props => {
|
|
|
295
302
|
testId: "jira-datasource-table"
|
|
296
303
|
}));
|
|
297
304
|
}, [columns.length, currentSearchMethod, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
|
|
298
|
-
const siteSelectorLabel =
|
|
305
|
+
const siteSelectorLabel = useMemo(() => {
|
|
306
|
+
if (fg('confluence-issue-terminology-refresh')) {
|
|
307
|
+
return availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySitesIssueTermRefresh : modalMessages.insertIssuesTitleIssueTermRefresh;
|
|
308
|
+
}
|
|
309
|
+
return availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySites : modalMessages.insertIssuesTitle;
|
|
310
|
+
}, [availableSites]);
|
|
299
311
|
const getCancelButtonAnalyticsPayload = useCallback(() => {
|
|
300
312
|
return {
|
|
301
313
|
...analyticsPayload,
|
|
@@ -367,7 +379,7 @@ const PlainJiraIssuesConfigModal = props => {
|
|
|
367
379
|
testId: "jira-datasource-modal--insert-button",
|
|
368
380
|
url: urlToInsert,
|
|
369
381
|
getAnalyticsPayload: getInsertButtonAnalyticsPayload
|
|
370
|
-
}, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
382
|
+
}, fg('confluence-issue-terminology-refresh') ? jsx(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
371
383
|
};
|
|
372
384
|
const ConnectedJiraIssueConfigModal = createDatasourceModal({
|
|
373
385
|
isValidParameters,
|
|
@@ -90,5 +90,30 @@ export const modalMessages = defineMessages({
|
|
|
90
90
|
id: 'linkDataSource.jira-issues.checkConnectionWithSource',
|
|
91
91
|
description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
|
|
92
92
|
defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
|
|
93
|
+
},
|
|
94
|
+
insertIssuesButtonTextIssueTermRefresh: {
|
|
95
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
|
|
96
|
+
description: 'Button text to insert the displayed content',
|
|
97
|
+
defaultMessage: 'Insert work items'
|
|
98
|
+
},
|
|
99
|
+
insertIssuesTitleIssueTermRefresh: {
|
|
100
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitle-issue-term-refresh',
|
|
101
|
+
description: 'Title for the Jira Issues Datasource config modal',
|
|
102
|
+
defaultMessage: 'Insert Jira work items'
|
|
103
|
+
},
|
|
104
|
+
insertIssuesTitleManySitesIssueTermRefresh: {
|
|
105
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites-issue-term-refresh',
|
|
106
|
+
description: 'Title for the Jira Issues modal when a user has to select a site to inserting issues from',
|
|
107
|
+
defaultMessage: 'Insert Jira work items from'
|
|
108
|
+
},
|
|
109
|
+
issuesCountSmartCardPlaceholderTextIssueTermRefresh: {
|
|
110
|
+
id: 'linkDataSource.jira-issues.configmodal.placeholder.issues-issue-term-refresh',
|
|
111
|
+
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
112
|
+
defaultMessage: '### work items'
|
|
113
|
+
},
|
|
114
|
+
searchJiraTitleIssueTermRefresh: {
|
|
115
|
+
id: 'linkDataSource.modal-initial-state.searchTitle-issue-term-refresh',
|
|
116
|
+
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
117
|
+
defaultMessage: 'Search for Jira work items'
|
|
93
118
|
}
|
|
94
119
|
});
|
|
@@ -3,6 +3,7 @@ import { JiraServiceManagementIcon } from '@atlaskit/logo';
|
|
|
3
3
|
import { Box, xcss } from '@atlaskit/primitives';
|
|
4
4
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
5
5
|
const jsmTextStyles = xcss({
|
|
6
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
6
7
|
fontSize: 'small',
|
|
7
8
|
color: 'color.text.subtle',
|
|
8
9
|
marginLeft: 'space.075',
|
|
@@ -31,5 +31,15 @@ export var initialStateViewMessages = defineMessages({
|
|
|
31
31
|
id: 'linkDataSource.modal-initial-state.learnMoreLink',
|
|
32
32
|
description: 'The link that displays under the search description to help people know more about JQL',
|
|
33
33
|
defaultMessage: 'Learn how to search with JQL'
|
|
34
|
+
},
|
|
35
|
+
searchDescriptionForJQLSearchIssueTermRefresh: {
|
|
36
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-jql-issue-term-refresh',
|
|
37
|
+
description: 'The initial modal search state helper message displayed under the search title when JQL search mode is selected',
|
|
38
|
+
defaultMessage: "Use JQL (Jira Query Language) to search for work items."
|
|
39
|
+
},
|
|
40
|
+
searchDescriptionForBasicSearchIssueTermRefresh: {
|
|
41
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-basic-issue-term-refresh',
|
|
42
|
+
description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
|
|
43
|
+
defaultMessage: "Search by keyword for work items to insert."
|
|
34
44
|
}
|
|
35
45
|
});
|
|
@@ -8,6 +8,7 @@ import { css, jsx } from '@emotion/react';
|
|
|
8
8
|
import { useIntl } from 'react-intl-next';
|
|
9
9
|
import { LoadingButton } from '@atlaskit/button';
|
|
10
10
|
import SearchIcon from '@atlaskit/icon/core/migration/search--editor-search';
|
|
11
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
12
|
import Textfield from '@atlaskit/textfield';
|
|
12
13
|
import { useDatasourceAnalyticsEvents } from '../../../../analytics';
|
|
13
14
|
import { basicSearchInputMessages } from './messages';
|
|
@@ -50,7 +51,7 @@ export var BasicSearchInput = function BasicSearchInput(_ref) {
|
|
|
50
51
|
appearance: "primary",
|
|
51
52
|
css: searchButtonStyles,
|
|
52
53
|
iconBefore: jsx(SearchIcon, {
|
|
53
|
-
label: formatMessage(basicSearchInputMessages.basicTextSearchLabel),
|
|
54
|
+
label: formatMessage(fg('confluence-issue-terminology-refresh') ? basicSearchInputMessages.basicTextSearchLabelIssueTermRefresh : basicSearchInputMessages.basicTextSearchLabel),
|
|
54
55
|
LEGACY_size: "medium",
|
|
55
56
|
color: "currentColor",
|
|
56
57
|
spacing: "spacious"
|
|
@@ -9,5 +9,15 @@ export var basicSearchInputMessages = defineMessages({
|
|
|
9
9
|
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder',
|
|
10
10
|
description: 'Placeholder text for the search input box',
|
|
11
11
|
defaultMessage: 'Search for issues by keyword'
|
|
12
|
+
},
|
|
13
|
+
basicTextSearchLabelDuplicateIssueTermRefresh: {
|
|
14
|
+
id: 'linkDataSource.configmodal.basicTextSearchPlaceholder-issue-term-refresh',
|
|
15
|
+
description: 'Placeholder text for the search input box',
|
|
16
|
+
defaultMessage: "Search for work items by keyword"
|
|
17
|
+
},
|
|
18
|
+
basicTextSearchLabelIssueTermRefresh: {
|
|
19
|
+
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder-issue-term-refresh',
|
|
20
|
+
description: 'Placeholder text for the search input box',
|
|
21
|
+
defaultMessage: "Search for work items by keyword"
|
|
12
22
|
}
|
|
13
23
|
});
|
|
@@ -2,6 +2,7 @@ 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';
|
|
5
6
|
import { Flex, xcss } from '@atlaskit/primitives';
|
|
6
7
|
import LinkUrl from '@atlaskit/smart-card/link-url';
|
|
7
8
|
import { N800 } from '@atlaskit/theme/colors';
|
|
@@ -57,10 +58,12 @@ var TableSearchCount = function TableSearchCount(_ref3) {
|
|
|
57
58
|
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
58
59
|
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
59
60
|
prefixTextType = _ref3$prefixTextType === void 0 ? 'issue' : _ref3$prefixTextType;
|
|
61
|
+
var isIssue = prefixTextType === 'issue';
|
|
62
|
+
var messageKey = isIssue && fg('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : "".concat(prefixTextType, "CountText");
|
|
60
63
|
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
61
64
|
testId: testId,
|
|
62
65
|
url: url
|
|
63
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[
|
|
66
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[messageKey], {
|
|
64
67
|
values: {
|
|
65
68
|
searchCount: searchCount
|
|
66
69
|
}
|
|
@@ -14,5 +14,10 @@ export var searchCountMessages = defineMessages({
|
|
|
14
14
|
id: 'linkDataSource.search.configmodal.itemCountText',
|
|
15
15
|
description: 'Text that indicates the number of items in the search result.',
|
|
16
16
|
defaultMessage: '{searchCount, plural, one {# item} other {# items}}'
|
|
17
|
+
},
|
|
18
|
+
issueCountTextIssueTermRefresh: {
|
|
19
|
+
id: "linkDataSource.search.configmodal.issueCountText-issue-term-refresh",
|
|
20
|
+
description: 'Text that indicates the number of jira issues in the search result.',
|
|
21
|
+
defaultMessage: "{searchCount, plural, one {# work item} other {# work items}}"
|
|
17
22
|
}
|
|
18
23
|
});
|
|
@@ -16,6 +16,7 @@ import { jsx } from '@emotion/react';
|
|
|
16
16
|
import { FormattedMessage } from 'react-intl-next';
|
|
17
17
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
18
18
|
import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
|
|
19
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
19
20
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
20
21
|
import { EVENT_CHANNEL } from '../../../analytics/constants';
|
|
21
22
|
import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
|
|
@@ -250,7 +251,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
250
251
|
});
|
|
251
252
|
} else if (status === 'empty' || !jql || !selectedJiraSiteUrl) {
|
|
252
253
|
return jsx(SmartCardPlaceholder, {
|
|
253
|
-
placeholderText: modalMessages.issuesCountSmartCardPlaceholderText
|
|
254
|
+
placeholderText: fg('confluence-issue-terminology-refresh') ? modalMessages.issuesCountSmartCardPlaceholderTextIssueTermRefresh : modalMessages.issuesCountSmartCardPlaceholderText
|
|
254
255
|
});
|
|
255
256
|
} else {
|
|
256
257
|
var url;
|
|
@@ -266,6 +267,12 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
266
267
|
}, [jql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, responseItems, retrieveUrlForSmartCardRender]);
|
|
267
268
|
var renderIssuesModeContent = useCallback(function () {
|
|
268
269
|
var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
|
|
270
|
+
var getDescriptionMessage = function getDescriptionMessage() {
|
|
271
|
+
if (fg('confluence-issue-terminology-refresh')) {
|
|
272
|
+
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
|
|
273
|
+
}
|
|
274
|
+
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch;
|
|
275
|
+
};
|
|
269
276
|
if (status === 'rejected' && jqlUrl) {
|
|
270
277
|
return jsx(ModalLoadingError, {
|
|
271
278
|
errorMessage: jqlUrl ? jsx(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSource, {
|
|
@@ -292,8 +299,8 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
292
299
|
testId: "jira-datasource-modal--empty-state"
|
|
293
300
|
}) : jsx(InitialStateView, {
|
|
294
301
|
icon: jsx(JiraInitialStateSVG, null),
|
|
295
|
-
title: modalMessages.searchJiraTitle,
|
|
296
|
-
description:
|
|
302
|
+
title: fg('confluence-issue-terminology-refresh') ? modalMessages.searchJiraTitleIssueTermRefresh : modalMessages.searchJiraTitle,
|
|
303
|
+
description: getDescriptionMessage(),
|
|
297
304
|
learnMoreLink: currentSearchMethod === 'jql' ? {
|
|
298
305
|
href: jqlSupportDocumentLink,
|
|
299
306
|
text: initialStateViewMessages.learnMoreLink
|
|
@@ -306,7 +313,12 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
306
313
|
testId: "jira-datasource-table"
|
|
307
314
|
}));
|
|
308
315
|
}, [columns.length, currentSearchMethod, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
|
|
309
|
-
var siteSelectorLabel =
|
|
316
|
+
var siteSelectorLabel = useMemo(function () {
|
|
317
|
+
if (fg('confluence-issue-terminology-refresh')) {
|
|
318
|
+
return availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySitesIssueTermRefresh : modalMessages.insertIssuesTitleIssueTermRefresh;
|
|
319
|
+
}
|
|
320
|
+
return availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySites : modalMessages.insertIssuesTitle;
|
|
321
|
+
}, [availableSites]);
|
|
310
322
|
var getCancelButtonAnalyticsPayload = useCallback(function () {
|
|
311
323
|
return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
|
|
312
324
|
searchCount: searchCount.current,
|
|
@@ -372,7 +384,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
372
384
|
testId: "jira-datasource-modal--insert-button",
|
|
373
385
|
url: urlToInsert,
|
|
374
386
|
getAnalyticsPayload: getInsertButtonAnalyticsPayload
|
|
375
|
-
}, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
387
|
+
}, fg('confluence-issue-terminology-refresh') ? jsx(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
376
388
|
};
|
|
377
389
|
var ConnectedJiraIssueConfigModal = createDatasourceModal({
|
|
378
390
|
isValidParameters: isValidParameters,
|
|
@@ -90,5 +90,30 @@ export var modalMessages = defineMessages({
|
|
|
90
90
|
id: 'linkDataSource.jira-issues.checkConnectionWithSource',
|
|
91
91
|
description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
|
|
92
92
|
defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
|
|
93
|
+
},
|
|
94
|
+
insertIssuesButtonTextIssueTermRefresh: {
|
|
95
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
|
|
96
|
+
description: 'Button text to insert the displayed content',
|
|
97
|
+
defaultMessage: 'Insert work items'
|
|
98
|
+
},
|
|
99
|
+
insertIssuesTitleIssueTermRefresh: {
|
|
100
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitle-issue-term-refresh',
|
|
101
|
+
description: 'Title for the Jira Issues Datasource config modal',
|
|
102
|
+
defaultMessage: 'Insert Jira work items'
|
|
103
|
+
},
|
|
104
|
+
insertIssuesTitleManySitesIssueTermRefresh: {
|
|
105
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites-issue-term-refresh',
|
|
106
|
+
description: 'Title for the Jira Issues modal when a user has to select a site to inserting issues from',
|
|
107
|
+
defaultMessage: 'Insert Jira work items from'
|
|
108
|
+
},
|
|
109
|
+
issuesCountSmartCardPlaceholderTextIssueTermRefresh: {
|
|
110
|
+
id: 'linkDataSource.jira-issues.configmodal.placeholder.issues-issue-term-refresh',
|
|
111
|
+
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
112
|
+
defaultMessage: '### work items'
|
|
113
|
+
},
|
|
114
|
+
searchJiraTitleIssueTermRefresh: {
|
|
115
|
+
id: 'linkDataSource.modal-initial-state.searchTitle-issue-term-refresh',
|
|
116
|
+
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
117
|
+
defaultMessage: 'Search for Jira work items'
|
|
93
118
|
}
|
|
94
119
|
});
|
|
@@ -3,6 +3,7 @@ import { JiraServiceManagementIcon } from '@atlaskit/logo';
|
|
|
3
3
|
import { Box, xcss } from '@atlaskit/primitives';
|
|
4
4
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
5
5
|
var jsmTextStyles = xcss({
|
|
6
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
6
7
|
fontSize: 'small',
|
|
7
8
|
color: 'color.text.subtle',
|
|
8
9
|
marginLeft: 'space.075',
|
package/dist/types/analytics/wrappers/render-failed/datasourceRenderFailedAnalyticsWrapper.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
declare const DatasourceRenderFailedAnalyticsWrapper: import("react").ForwardRefExoticComponent<
|
|
2
|
+
declare const DatasourceRenderFailedAnalyticsWrapper: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<any>>;
|
|
3
3
|
export default DatasourceRenderFailedAnalyticsWrapper;
|
|
@@ -29,4 +29,14 @@ export declare const initialStateViewMessages: {
|
|
|
29
29
|
description: string;
|
|
30
30
|
defaultMessage: string;
|
|
31
31
|
};
|
|
32
|
+
searchDescriptionForJQLSearchIssueTermRefresh: {
|
|
33
|
+
id: string;
|
|
34
|
+
description: string;
|
|
35
|
+
defaultMessage: string;
|
|
36
|
+
};
|
|
37
|
+
searchDescriptionForBasicSearchIssueTermRefresh: {
|
|
38
|
+
id: string;
|
|
39
|
+
description: string;
|
|
40
|
+
defaultMessage: string;
|
|
41
|
+
};
|
|
32
42
|
};
|
|
@@ -9,4 +9,14 @@ export declare const basicSearchInputMessages: {
|
|
|
9
9
|
description: string;
|
|
10
10
|
defaultMessage: string;
|
|
11
11
|
};
|
|
12
|
+
basicTextSearchLabelDuplicateIssueTermRefresh: {
|
|
13
|
+
id: string;
|
|
14
|
+
description: string;
|
|
15
|
+
defaultMessage: string;
|
|
16
|
+
};
|
|
17
|
+
basicTextSearchLabelIssueTermRefresh: {
|
|
18
|
+
id: string;
|
|
19
|
+
description: string;
|
|
20
|
+
defaultMessage: string;
|
|
21
|
+
};
|
|
12
22
|
};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { PopupComponentProps } from '@atlaskit/popup';
|
|
3
|
-
export declare const PopupComponent: React.ForwardRefExoticComponent<
|
|
3
|
+
export declare const PopupComponent: React.ForwardRefExoticComponent<Omit<PopupComponentProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
|
|
@@ -3,4 +3,6 @@
|
|
|
3
3
|
* @jsx jsx
|
|
4
4
|
*/
|
|
5
5
|
import React from 'react';
|
|
6
|
-
export declare const TruncateTextTag: React.ForwardRefExoticComponent<
|
|
6
|
+
export declare const TruncateTextTag: React.ForwardRefExoticComponent<{
|
|
7
|
+
children?: React.ReactNode;
|
|
8
|
+
} & React.RefAttributes<HTMLElement>>;
|
|
@@ -84,4 +84,29 @@ export declare const modalMessages: {
|
|
|
84
84
|
description: string;
|
|
85
85
|
defaultMessage: string;
|
|
86
86
|
};
|
|
87
|
+
insertIssuesButtonTextIssueTermRefresh: {
|
|
88
|
+
id: string;
|
|
89
|
+
description: string;
|
|
90
|
+
defaultMessage: string;
|
|
91
|
+
};
|
|
92
|
+
insertIssuesTitleIssueTermRefresh: {
|
|
93
|
+
id: string;
|
|
94
|
+
description: string;
|
|
95
|
+
defaultMessage: string;
|
|
96
|
+
};
|
|
97
|
+
insertIssuesTitleManySitesIssueTermRefresh: {
|
|
98
|
+
id: string;
|
|
99
|
+
description: string;
|
|
100
|
+
defaultMessage: string;
|
|
101
|
+
};
|
|
102
|
+
issuesCountSmartCardPlaceholderTextIssueTermRefresh: {
|
|
103
|
+
id: string;
|
|
104
|
+
description: string;
|
|
105
|
+
defaultMessage: string;
|
|
106
|
+
};
|
|
107
|
+
searchJiraTitleIssueTermRefresh: {
|
|
108
|
+
id: string;
|
|
109
|
+
description: string;
|
|
110
|
+
defaultMessage: string;
|
|
111
|
+
};
|
|
87
112
|
};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
declare const DatasourceRenderFailedAnalyticsWrapper: import("react").ForwardRefExoticComponent<
|
|
2
|
+
declare const DatasourceRenderFailedAnalyticsWrapper: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<any>>;
|
|
3
3
|
export default DatasourceRenderFailedAnalyticsWrapper;
|
|
@@ -29,4 +29,14 @@ export declare const initialStateViewMessages: {
|
|
|
29
29
|
description: string;
|
|
30
30
|
defaultMessage: string;
|
|
31
31
|
};
|
|
32
|
+
searchDescriptionForJQLSearchIssueTermRefresh: {
|
|
33
|
+
id: string;
|
|
34
|
+
description: string;
|
|
35
|
+
defaultMessage: string;
|
|
36
|
+
};
|
|
37
|
+
searchDescriptionForBasicSearchIssueTermRefresh: {
|
|
38
|
+
id: string;
|
|
39
|
+
description: string;
|
|
40
|
+
defaultMessage: string;
|
|
41
|
+
};
|
|
32
42
|
};
|
|
@@ -9,4 +9,14 @@ export declare const basicSearchInputMessages: {
|
|
|
9
9
|
description: string;
|
|
10
10
|
defaultMessage: string;
|
|
11
11
|
};
|
|
12
|
+
basicTextSearchLabelDuplicateIssueTermRefresh: {
|
|
13
|
+
id: string;
|
|
14
|
+
description: string;
|
|
15
|
+
defaultMessage: string;
|
|
16
|
+
};
|
|
17
|
+
basicTextSearchLabelIssueTermRefresh: {
|
|
18
|
+
id: string;
|
|
19
|
+
description: string;
|
|
20
|
+
defaultMessage: string;
|
|
21
|
+
};
|
|
12
22
|
};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { PopupComponentProps } from '@atlaskit/popup';
|
|
3
|
-
export declare const PopupComponent: React.ForwardRefExoticComponent<
|
|
3
|
+
export declare const PopupComponent: React.ForwardRefExoticComponent<Omit<PopupComponentProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
|
|
@@ -3,4 +3,6 @@
|
|
|
3
3
|
* @jsx jsx
|
|
4
4
|
*/
|
|
5
5
|
import React from 'react';
|
|
6
|
-
export declare const TruncateTextTag: React.ForwardRefExoticComponent<
|
|
6
|
+
export declare const TruncateTextTag: React.ForwardRefExoticComponent<{
|
|
7
|
+
children?: React.ReactNode;
|
|
8
|
+
} & React.RefAttributes<HTMLElement>>;
|
|
@@ -84,4 +84,29 @@ export declare const modalMessages: {
|
|
|
84
84
|
description: string;
|
|
85
85
|
defaultMessage: string;
|
|
86
86
|
};
|
|
87
|
+
insertIssuesButtonTextIssueTermRefresh: {
|
|
88
|
+
id: string;
|
|
89
|
+
description: string;
|
|
90
|
+
defaultMessage: string;
|
|
91
|
+
};
|
|
92
|
+
insertIssuesTitleIssueTermRefresh: {
|
|
93
|
+
id: string;
|
|
94
|
+
description: string;
|
|
95
|
+
defaultMessage: string;
|
|
96
|
+
};
|
|
97
|
+
insertIssuesTitleManySitesIssueTermRefresh: {
|
|
98
|
+
id: string;
|
|
99
|
+
description: string;
|
|
100
|
+
defaultMessage: string;
|
|
101
|
+
};
|
|
102
|
+
issuesCountSmartCardPlaceholderTextIssueTermRefresh: {
|
|
103
|
+
id: string;
|
|
104
|
+
description: string;
|
|
105
|
+
defaultMessage: string;
|
|
106
|
+
};
|
|
107
|
+
searchJiraTitleIssueTermRefresh: {
|
|
108
|
+
id: string;
|
|
109
|
+
description: string;
|
|
110
|
+
defaultMessage: string;
|
|
111
|
+
};
|
|
87
112
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/link-datasource",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.18.0",
|
|
4
4
|
"description": "UI Components to support linking platform dataset feature",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -28,61 +28,61 @@
|
|
|
28
28
|
"website": {
|
|
29
29
|
"name": "Link Datasource"
|
|
30
30
|
},
|
|
31
|
-
"runReact18":
|
|
31
|
+
"runReact18": false
|
|
32
32
|
},
|
|
33
33
|
"scripts": {
|
|
34
34
|
"analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@atlaskit/adf-schema": "^46.1.0",
|
|
38
|
-
"@atlaskit/analytics-next": "^10.
|
|
39
|
-
"@atlaskit/atlassian-context": "^0.0
|
|
40
|
-
"@atlaskit/avatar": "^21.
|
|
41
|
-
"@atlaskit/avatar-group": "^11.
|
|
42
|
-
"@atlaskit/badge": "^17.
|
|
43
|
-
"@atlaskit/button": "^20.
|
|
44
|
-
"@atlaskit/datetime-picker": "^15.
|
|
45
|
-
"@atlaskit/dropdown-menu": "^12.
|
|
38
|
+
"@atlaskit/analytics-next": "^10.3.0",
|
|
39
|
+
"@atlaskit/atlassian-context": "^0.1.0",
|
|
40
|
+
"@atlaskit/avatar": "^21.18.0",
|
|
41
|
+
"@atlaskit/avatar-group": "^11.1.0",
|
|
42
|
+
"@atlaskit/badge": "^17.1.0",
|
|
43
|
+
"@atlaskit/button": "^20.4.0",
|
|
44
|
+
"@atlaskit/datetime-picker": "^15.12.0",
|
|
45
|
+
"@atlaskit/dropdown-menu": "^12.26.0",
|
|
46
46
|
"@atlaskit/editor-prosemirror": "6.2.1",
|
|
47
|
-
"@atlaskit/empty-state": "^8.
|
|
48
|
-
"@atlaskit/flag": "^15.
|
|
49
|
-
"@atlaskit/form": "^11.
|
|
50
|
-
"@atlaskit/heading": "^4.
|
|
51
|
-
"@atlaskit/icon": "^23.
|
|
52
|
-
"@atlaskit/icon-object": "^6.
|
|
53
|
-
"@atlaskit/image": "^1.
|
|
54
|
-
"@atlaskit/inline-edit": "^14.
|
|
55
|
-
"@atlaskit/intl-messages-provider": "^1.
|
|
47
|
+
"@atlaskit/empty-state": "^8.2.0",
|
|
48
|
+
"@atlaskit/flag": "^15.9.0",
|
|
49
|
+
"@atlaskit/form": "^11.1.0",
|
|
50
|
+
"@atlaskit/heading": "^4.1.0",
|
|
51
|
+
"@atlaskit/icon": "^23.5.0",
|
|
52
|
+
"@atlaskit/icon-object": "^6.10.0",
|
|
53
|
+
"@atlaskit/image": "^1.4.0",
|
|
54
|
+
"@atlaskit/inline-edit": "^14.2.0",
|
|
55
|
+
"@atlaskit/intl-messages-provider": "^1.1.0",
|
|
56
56
|
"@atlaskit/jql-ast": "^3.3.0",
|
|
57
|
-
"@atlaskit/jql-editor": "^4.
|
|
58
|
-
"@atlaskit/jql-editor-autocomplete-rest": "^2.
|
|
59
|
-
"@atlaskit/layering": "^1.
|
|
60
|
-
"@atlaskit/link-client-extension": "^3.
|
|
61
|
-
"@atlaskit/linking-common": "^6.
|
|
62
|
-
"@atlaskit/linking-types": "^9.
|
|
63
|
-
"@atlaskit/logo": "^15.
|
|
64
|
-
"@atlaskit/lozenge": "^11.
|
|
65
|
-
"@atlaskit/modal-dialog": "^12.
|
|
57
|
+
"@atlaskit/jql-editor": "^4.14.0",
|
|
58
|
+
"@atlaskit/jql-editor-autocomplete-rest": "^2.2.0",
|
|
59
|
+
"@atlaskit/layering": "^1.1.0",
|
|
60
|
+
"@atlaskit/link-client-extension": "^3.1.0",
|
|
61
|
+
"@atlaskit/linking-common": "^6.2.0",
|
|
62
|
+
"@atlaskit/linking-types": "^9.6.0",
|
|
63
|
+
"@atlaskit/logo": "^15.2.0",
|
|
64
|
+
"@atlaskit/lozenge": "^11.13.0",
|
|
65
|
+
"@atlaskit/modal-dialog": "^12.20.0",
|
|
66
66
|
"@atlaskit/outbound-auth-flow-client": "^3.4.5",
|
|
67
67
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
68
|
-
"@atlaskit/popup": "^1.
|
|
69
|
-
"@atlaskit/pragmatic-drag-and-drop": "^1.
|
|
68
|
+
"@atlaskit/popup": "^1.31.0",
|
|
69
|
+
"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
|
|
70
70
|
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
|
|
71
71
|
"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
|
|
72
|
-
"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.
|
|
73
|
-
"@atlaskit/primitives": "^13.
|
|
74
|
-
"@atlaskit/react-select": "^1.
|
|
75
|
-
"@atlaskit/select": "^18.
|
|
76
|
-
"@atlaskit/smart-card": "^34.
|
|
77
|
-
"@atlaskit/smart-user-picker": "
|
|
78
|
-
"@atlaskit/spinner": "^17.
|
|
79
|
-
"@atlaskit/tag": "^12.
|
|
80
|
-
"@atlaskit/textfield": "6.
|
|
81
|
-
"@atlaskit/theme": "^14.
|
|
82
|
-
"@atlaskit/tokens": "^3.
|
|
83
|
-
"@atlaskit/tooltip": "^19.
|
|
72
|
+
"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.2.0",
|
|
73
|
+
"@atlaskit/primitives": "^13.4.0",
|
|
74
|
+
"@atlaskit/react-select": "^1.7.0",
|
|
75
|
+
"@atlaskit/select": "^18.10.0",
|
|
76
|
+
"@atlaskit/smart-card": "^34.10.0",
|
|
77
|
+
"@atlaskit/smart-user-picker": "7.0.0",
|
|
78
|
+
"@atlaskit/spinner": "^17.1.0",
|
|
79
|
+
"@atlaskit/tag": "^12.7.0",
|
|
80
|
+
"@atlaskit/textfield": "6.8.0",
|
|
81
|
+
"@atlaskit/theme": "^14.1.0",
|
|
82
|
+
"@atlaskit/tokens": "^3.3.0",
|
|
83
|
+
"@atlaskit/tooltip": "^19.1.0",
|
|
84
84
|
"@atlaskit/ufo": "^0.3.0",
|
|
85
|
-
"@atlaskit/width-detector": "^4.
|
|
85
|
+
"@atlaskit/width-detector": "^4.4.0",
|
|
86
86
|
"@babel/runtime": "^7.0.0",
|
|
87
87
|
"@emotion/react": "^11.7.1",
|
|
88
88
|
"@emotion/styled": "^11.0.0",
|
|
@@ -101,14 +101,14 @@
|
|
|
101
101
|
"devDependencies": {
|
|
102
102
|
"@af/integration-testing": "*",
|
|
103
103
|
"@af/visual-regression": "*",
|
|
104
|
-
"@atlaskit/link-provider": "^1.
|
|
105
|
-
"@atlaskit/link-test-helpers": "^7.
|
|
104
|
+
"@atlaskit/link-provider": "^1.19.0",
|
|
105
|
+
"@atlaskit/link-test-helpers": "^7.6.0",
|
|
106
106
|
"@atlaskit/ssr": "*",
|
|
107
107
|
"@atlaskit/visual-regression": "*",
|
|
108
|
-
"@atlassian/feature-flags-test-utils": "^0.
|
|
108
|
+
"@atlassian/feature-flags-test-utils": "^0.3.0",
|
|
109
109
|
"@faker-js/faker": "^7.5.0",
|
|
110
110
|
"@testing-library/dom": "^10.1.0",
|
|
111
|
-
"@testing-library/react": "^
|
|
111
|
+
"@testing-library/react": "^13.4.0",
|
|
112
112
|
"@testing-library/react-hooks": "^8.0.1",
|
|
113
113
|
"@testing-library/user-event": "^14.4.3",
|
|
114
114
|
"@types/debounce-promise": "^3.1.2",
|
|
@@ -173,6 +173,9 @@
|
|
|
173
173
|
},
|
|
174
174
|
"fix_a11y_violations_in_link_datasource": {
|
|
175
175
|
"type": "boolean"
|
|
176
|
+
},
|
|
177
|
+
"confluence-issue-terminology-refresh": {
|
|
178
|
+
"type": "boolean"
|
|
176
179
|
}
|
|
177
180
|
}
|
|
178
181
|
}
|