@atlaskit/link-datasource 4.4.0 → 4.5.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 +12 -0
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/index.compiled.css +10 -0
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +14 -5
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js +12 -2
- package/dist/cjs/ui/common/error-state/access-required.compiled.css +3 -0
- package/dist/cjs/ui/common/error-state/access-required.js +5 -3
- package/dist/cjs/ui/common/error-state/messages.js +23 -3
- package/dist/cjs/ui/common/error-state/modal-loading-error.compiled.css +8 -1
- package/dist/cjs/ui/common/error-state/modal-loading-error.js +24 -7
- package/dist/cjs/ui/common/error-state/no-results.compiled.css +8 -1
- package/dist/cjs/ui/common/error-state/no-results.js +157 -6
- package/dist/cjs/ui/common/initial-state-view/index.compiled.css +7 -2
- package/dist/cjs/ui/common/initial-state-view/index.js +11 -4
- package/dist/cjs/ui/common/initial-state-view/messages.js +11 -1
- package/dist/cjs/ui/common/modal/content-container/index.compiled.css +1 -0
- package/dist/cjs/ui/common/modal/content-container/index.js +4 -2
- package/dist/cjs/ui/confluence-search-modal/modal/index.js +20 -1
- package/dist/cjs/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +27 -2
- package/dist/cjs/ui/jira-issues-modal/modal/messages.js +10 -0
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.compiled.css +10 -0
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +13 -5
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js +12 -2
- package/dist/es2019/ui/common/error-state/access-required.compiled.css +3 -0
- package/dist/es2019/ui/common/error-state/access-required.js +5 -3
- package/dist/es2019/ui/common/error-state/messages.js +23 -3
- package/dist/es2019/ui/common/error-state/modal-loading-error.compiled.css +8 -1
- package/dist/es2019/ui/common/error-state/modal-loading-error.js +23 -7
- package/dist/es2019/ui/common/error-state/no-results.compiled.css +8 -1
- package/dist/es2019/ui/common/error-state/no-results.js +157 -6
- package/dist/es2019/ui/common/initial-state-view/index.compiled.css +4 -0
- package/dist/es2019/ui/common/initial-state-view/index.js +11 -4
- package/dist/es2019/ui/common/initial-state-view/messages.js +11 -1
- package/dist/es2019/ui/common/modal/content-container/index.compiled.css +1 -0
- package/dist/es2019/ui/common/modal/content-container/index.js +4 -2
- package/dist/es2019/ui/confluence-search-modal/modal/index.js +16 -1
- package/dist/es2019/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +23 -2
- package/dist/es2019/ui/jira-issues-modal/modal/messages.js +10 -0
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/index.compiled.css +10 -0
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +13 -5
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js +12 -2
- package/dist/esm/ui/common/error-state/access-required.compiled.css +3 -0
- package/dist/esm/ui/common/error-state/access-required.js +5 -3
- package/dist/esm/ui/common/error-state/messages.js +23 -3
- package/dist/esm/ui/common/error-state/modal-loading-error.compiled.css +8 -1
- package/dist/esm/ui/common/error-state/modal-loading-error.js +23 -7
- package/dist/esm/ui/common/error-state/no-results.compiled.css +8 -1
- package/dist/esm/ui/common/error-state/no-results.js +157 -6
- package/dist/esm/ui/common/initial-state-view/index.compiled.css +7 -2
- package/dist/esm/ui/common/initial-state-view/index.js +11 -4
- package/dist/esm/ui/common/initial-state-view/messages.js +11 -1
- package/dist/esm/ui/common/modal/content-container/index.compiled.css +1 -0
- package/dist/esm/ui/common/modal/content-container/index.js +4 -2
- package/dist/esm/ui/confluence-search-modal/modal/index.js +20 -1
- package/dist/esm/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/esm/ui/jira-issues-modal/modal/index.js +27 -2
- package/dist/esm/ui/jira-issues-modal/modal/messages.js +10 -0
- package/dist/types/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.d.ts +10 -0
- package/dist/types/ui/common/error-state/messages.d.ts +20 -0
- package/dist/types/ui/common/error-state/modal-loading-error.d.ts +6 -1
- package/dist/types/ui/common/initial-state-view/messages.d.ts +10 -0
- package/dist/types/ui/confluence-search-modal/modal/messages.d.ts +5 -0
- package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/common/error-state/messages.d.ts +20 -0
- package/dist/types-ts4.5/ui/common/error-state/modal-loading-error.d.ts +6 -1
- package/dist/types-ts4.5/ui/common/initial-state-view/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/modal/messages.d.ts +5 -0
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +10 -0
- package/package.json +1 -1
|
@@ -33,10 +33,15 @@ var initialStateViewMessages = exports.initialStateViewMessages = (0, _reactIntl
|
|
|
33
33
|
description: 'The initial modal search state helper message displayed under the search title when JQL search mode is selected',
|
|
34
34
|
defaultMessage: 'Use JQL (Jira Query Language) to search for issues.'
|
|
35
35
|
},
|
|
36
|
+
learnMoreLinkOld: {
|
|
37
|
+
id: 'linkDataSource.modal-initial-state.learnMoreLinkOld',
|
|
38
|
+
description: 'The link that displays under the search description to help people know more about JQL',
|
|
39
|
+
defaultMessage: 'Learn how to search with JQL'
|
|
40
|
+
},
|
|
36
41
|
learnMoreLink: {
|
|
37
42
|
id: 'linkDataSource.modal-initial-state.learnMoreLink',
|
|
38
43
|
description: 'The link that displays under the search description to help people know more about JQL',
|
|
39
|
-
defaultMessage: '
|
|
44
|
+
defaultMessage: 'Find out more about searching with JQL'
|
|
40
45
|
},
|
|
41
46
|
searchDescriptionForJQLSearchIssueTermRefresh: {
|
|
42
47
|
id: 'linkDataSource.modal-initial-state.searchDescription-jql-issue-term-refresh',
|
|
@@ -47,5 +52,10 @@ var initialStateViewMessages = exports.initialStateViewMessages = (0, _reactIntl
|
|
|
47
52
|
id: 'linkDataSource.modal-initial-state.searchDescription-basic-issue-term-refresh',
|
|
48
53
|
description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
|
|
49
54
|
defaultMessage: 'Search by keyword for work items to insert.'
|
|
55
|
+
},
|
|
56
|
+
searchDescriptionForBasicSearchVisualRefreshSllv: {
|
|
57
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-basic.visualRefreshSllv',
|
|
58
|
+
description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
|
|
59
|
+
defaultMessage: 'Start typing or use JQL to search.'
|
|
50
60
|
}
|
|
51
61
|
});
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
._1s7z1x13{border-right:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}
|
|
4
4
|
._n7zl1x13{border-bottom:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}
|
|
5
5
|
._n7zl8e97{border-bottom:var(--ds-border-width-outline,2px) solid var(--ds-border,#dfe1e6)}
|
|
6
|
+
._n7zlglyw{border-bottom:none}
|
|
6
7
|
._x3do1x13{border-top:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
|
|
7
8
|
._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
|
|
8
9
|
._18m91wug{overflow-y:auto}
|
|
@@ -10,16 +10,18 @@ require("./index.compiled.css");
|
|
|
10
10
|
var _runtime = require("@compiled/react/runtime");
|
|
11
11
|
var _react = _interopRequireDefault(require("react"));
|
|
12
12
|
var _css = require("@atlaskit/css");
|
|
13
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
14
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
14
15
|
var _colors = require("@atlaskit/theme/colors");
|
|
15
16
|
var styles = {
|
|
16
17
|
tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13lipd34 _qrwqpd34",
|
|
17
|
-
contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00"
|
|
18
|
+
contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00",
|
|
19
|
+
contentContainerRemoveBorderStyles: "_n7zlglyw"
|
|
18
20
|
};
|
|
19
21
|
var ContentContainer = exports.ContentContainer = function ContentContainer(_ref) {
|
|
20
22
|
var children = _ref.children,
|
|
21
23
|
withTableBorder = _ref.withTableBorder;
|
|
22
24
|
return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
23
|
-
xcss: (0, _css.cx)(styles.contentContainerStyles, withTableBorder && styles.tableContainerStyles)
|
|
25
|
+
xcss: (0, _css.cx)(styles.contentContainerStyles, withTableBorder && styles.tableContainerStyles, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') && styles.contentContainerRemoveBorderStyles)
|
|
24
26
|
}, children);
|
|
25
27
|
};
|
|
@@ -14,6 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
14
14
|
var _react = _interopRequireWildcard(require("react"));
|
|
15
15
|
var _reactIntlNext = require("react-intl-next");
|
|
16
16
|
var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
|
|
17
|
+
var _link = _interopRequireDefault(require("@atlaskit/link"));
|
|
17
18
|
var _modalDialog = require("@atlaskit/modal-dialog");
|
|
18
19
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
19
20
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
@@ -222,6 +223,24 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
|
|
|
222
223
|
}, [currentViewMode, fireInlineViewedEvent, fireTableViewedEvent, status]);
|
|
223
224
|
var renderTableModalContent = (0, _react.useCallback)(function () {
|
|
224
225
|
if (status === 'rejected') {
|
|
226
|
+
if (selectedConfluenceSite && (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv')) {
|
|
227
|
+
return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, {
|
|
228
|
+
errorMessage: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.confluenceSearchModalMessages.checkConnectionWithSource, {
|
|
229
|
+
values: {
|
|
230
|
+
a: function a(urlText) {
|
|
231
|
+
return /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
232
|
+
href: selectedConfluenceSite.url
|
|
233
|
+
}, urlText);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
})),
|
|
237
|
+
onRefresh: function onRefresh() {
|
|
238
|
+
return reset({
|
|
239
|
+
shouldForceRequest: true
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
});
|
|
243
|
+
}
|
|
225
244
|
return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, null);
|
|
226
245
|
} else if (status === 'unauthorized') {
|
|
227
246
|
return /*#__PURE__*/_react.default.createElement(_accessRequired.AccessRequired, {
|
|
@@ -250,7 +269,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
|
|
|
250
269
|
}, /*#__PURE__*/_react.default.createElement(_datasourcesTableInModalPreview.default, {
|
|
251
270
|
testId: "confluence-search-datasource-table"
|
|
252
271
|
}));
|
|
253
|
-
}, [status, resolvedWithNoResults, columns.length, selectedConfluenceSiteUrl, urlBeingEdited, hasConfluenceSearchParams, formatMessage]);
|
|
272
|
+
}, [status, resolvedWithNoResults, columns.length, selectedConfluenceSiteUrl, urlBeingEdited, hasConfluenceSearchParams, formatMessage, reset, selectedConfluenceSite]);
|
|
254
273
|
var renderInlineLinkModalContent = (0, _react.useCallback)(function () {
|
|
255
274
|
if (status === 'unauthorized') {
|
|
256
275
|
return /*#__PURE__*/_react.default.createElement(_accessRequired.AccessRequired, {
|
|
@@ -50,5 +50,10 @@ var confluenceSearchModalMessages = exports.confluenceSearchModalMessages = (0,
|
|
|
50
50
|
id: 'linkDataSource.confluence-search.configmodal.placeholder.issues',
|
|
51
51
|
description: 'Placeholder text that will be placed next to a count of confluence search results',
|
|
52
52
|
defaultMessage: '### Results'
|
|
53
|
+
},
|
|
54
|
+
checkConnectionWithSource: {
|
|
55
|
+
id: 'linkDataSource.confluence-search.checkConnectionWithSource',
|
|
56
|
+
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',
|
|
57
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this project in Confluence</a> to review.'
|
|
53
58
|
}
|
|
54
59
|
});
|
|
@@ -12,6 +12,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
var _reactIntlNext = require("react-intl-next");
|
|
14
14
|
var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
|
|
15
|
+
var _link = _interopRequireDefault(require("@atlaskit/link"));
|
|
15
16
|
var _modalDialog = require("@atlaskit/modal-dialog");
|
|
16
17
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
17
18
|
var _analytics = require("../../../analytics");
|
|
@@ -279,12 +280,33 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
279
280
|
var renderIssuesModeContent = (0, _react.useCallback)(function () {
|
|
280
281
|
var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
|
|
281
282
|
var getDescriptionMessage = function getDescriptionMessage() {
|
|
283
|
+
if (currentSearchMethod === 'basic' && (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv')) {
|
|
284
|
+
return _messages2.initialStateViewMessages.searchDescriptionForBasicSearchVisualRefreshSllv;
|
|
285
|
+
}
|
|
282
286
|
if ((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh')) {
|
|
283
287
|
return currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : _messages2.initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
|
|
284
288
|
}
|
|
285
289
|
return currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearch : _messages2.initialStateViewMessages.searchDescriptionForBasicSearch;
|
|
286
290
|
};
|
|
287
291
|
if (status === 'rejected' && jqlUrl) {
|
|
292
|
+
if ((0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv')) {
|
|
293
|
+
return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, {
|
|
294
|
+
errorMessage: jqlUrl ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages3.modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
|
|
295
|
+
values: {
|
|
296
|
+
a: function a(urlText) {
|
|
297
|
+
return /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
298
|
+
href: jqlUrl
|
|
299
|
+
}, urlText);
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
})) : undefined,
|
|
303
|
+
onRefresh: function onRefresh() {
|
|
304
|
+
return reset({
|
|
305
|
+
shouldForceRequest: true
|
|
306
|
+
});
|
|
307
|
+
}
|
|
308
|
+
});
|
|
309
|
+
}
|
|
288
310
|
return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, {
|
|
289
311
|
errorMessage: jqlUrl ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages3.modalMessages.checkConnectionWithSource, {
|
|
290
312
|
values: {
|
|
@@ -316,6 +338,9 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
316
338
|
title: (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? _messages3.modalMessages.searchJiraTitleIssueTermRefresh : _messages3.modalMessages.searchJiraTitle,
|
|
317
339
|
description: getDescriptionMessage(),
|
|
318
340
|
learnMoreLink: currentSearchMethod === 'jql' ? {
|
|
341
|
+
href: jqlSupportDocumentLink,
|
|
342
|
+
text: _messages2.initialStateViewMessages.learnMoreLinkOld
|
|
343
|
+
} : (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? {
|
|
319
344
|
href: jqlSupportDocumentLink,
|
|
320
345
|
text: _messages2.initialStateViewMessages.learnMoreLink
|
|
321
346
|
} : undefined
|
|
@@ -326,7 +351,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
326
351
|
}, /*#__PURE__*/_react.default.createElement(_datasourcesTableInModalPreview.default, {
|
|
327
352
|
testId: "jira-datasource-table"
|
|
328
353
|
}));
|
|
329
|
-
}, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
|
|
354
|
+
}, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, reset]);
|
|
330
355
|
var siteSelectorLabel = (0, _react.useMemo)(function () {
|
|
331
356
|
if ((0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh')) {
|
|
332
357
|
return availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySitesIssueTermRefresh : _messages3.modalMessages.insertIssuesTitleIssueTermRefresh;
|
|
@@ -398,7 +423,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
398
423
|
testId: "jira-datasource-modal--insert-button",
|
|
399
424
|
url: urlToInsert,
|
|
400
425
|
getAnalyticsPayload: getInsertButtonAnalyticsPayload
|
|
401
|
-
}, (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonText))))));
|
|
426
|
+
}, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonTextIssueTermSllv) : (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonText))))));
|
|
402
427
|
};
|
|
403
428
|
var ConnectedJiraIssueConfigModal = (0, _createDatasourceModal.createDatasourceModal)({
|
|
404
429
|
isValidParameters: isValidParameters,
|
|
@@ -97,11 +97,21 @@ var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
|
|
|
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
99
|
},
|
|
100
|
+
checkConnectionWithSourceVisualRefreshSllv: {
|
|
101
|
+
id: 'linkDataSource.jira-issues.checkConnectionWithSource.visual-refresh-sllv',
|
|
102
|
+
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',
|
|
103
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this project in Jira</a> to review.'
|
|
104
|
+
},
|
|
100
105
|
insertIssuesButtonTextIssueTermRefresh: {
|
|
101
106
|
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
|
|
102
107
|
description: 'Button text to insert the displayed content',
|
|
103
108
|
defaultMessage: 'Insert work items'
|
|
104
109
|
},
|
|
110
|
+
insertIssuesButtonTextIssueTermSllv: {
|
|
111
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-sllv',
|
|
112
|
+
description: 'Button text to insert the displayed content',
|
|
113
|
+
defaultMessage: 'Insert results'
|
|
114
|
+
},
|
|
105
115
|
insertIssuesTitleIssueTermRefresh: {
|
|
106
116
|
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitle-issue-term-refresh',
|
|
107
117
|
description: 'Title for the Jira Issues Datasource config modal',
|
|
@@ -1,8 +1,18 @@
|
|
|
1
|
+
._11c8lodh{font:var(--ds-font-heading-medium,normal 500 20px/24px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
1
2
|
._11c8nbxd{font:var(--ds-font-heading-small,normal 600 1pc/20px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
3
|
+
._19bvoahv{padding-left:var(--ds-space-600,3pc)}
|
|
2
4
|
._1bah1h6o{justify-content:center}
|
|
3
5
|
._1e0c1txw{display:flex}
|
|
4
6
|
._1wpz1h6o{align-self:center}
|
|
5
7
|
._4t3i1osq{height:100%}
|
|
8
|
+
._ca0q1ejb{padding-top:var(--ds-space-300,24px)}
|
|
9
|
+
._ca0qoahv{padding-top:var(--ds-space-600,3pc)}
|
|
6
10
|
._ca0qpxbi{padding-top:var(--ds-space-200,1pc)}
|
|
11
|
+
._n3tdoahv{padding-bottom:var(--ds-space-600,3pc)}
|
|
12
|
+
._n3tdpxbi{padding-bottom:var(--ds-space-200,1pc)}
|
|
7
13
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
14
|
+
._p12f1kdj{max-width:25pc}
|
|
15
|
+
._syaz1fxt{color:var(--ds-text,#172b4d)}
|
|
16
|
+
._syaz1gjq{color:var(--ds-text-subtle,#44546f)}
|
|
17
|
+
._u5f3oahv{padding-right:var(--ds-space-600,3pc)}
|
|
8
18
|
._y3gn1h6o{text-align:center}
|
|
@@ -3,14 +3,18 @@ import "./index.compiled.css";
|
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
5
|
import { useIntl } from 'react-intl-next';
|
|
6
|
+
import Link from '@atlaskit/link';
|
|
6
7
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
8
|
import { fontFallback } from '@atlaskit/theme/typography';
|
|
8
9
|
import { RichIconSearch } from '../../../../../common/ui/rich-icon/search';
|
|
9
10
|
import { CrystalBallSVGOld } from './assets/crystal-ball-svg-old';
|
|
10
11
|
import { initialStateViewMessages } from './messages';
|
|
11
12
|
const initialStateViewContainerStyles = null;
|
|
13
|
+
const svgAndTextsWrapperStylesOld = null;
|
|
12
14
|
const svgAndTextsWrapperStyles = null;
|
|
15
|
+
const searchTitleStylesOld = null;
|
|
13
16
|
const searchTitleStyles = null;
|
|
17
|
+
const mainTextStyles = null;
|
|
14
18
|
const AQLSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-assets-query-language-aql/';
|
|
15
19
|
export const InitialStateView = () => {
|
|
16
20
|
const {
|
|
@@ -20,14 +24,18 @@ export const InitialStateView = () => {
|
|
|
20
24
|
"data-testid": "assets-aql-datasource-modal--initial-state-view",
|
|
21
25
|
className: ax(["_1e0c1txw _1bah1h6o _4t3i1osq"])
|
|
22
26
|
}, /*#__PURE__*/React.createElement("div", {
|
|
23
|
-
className: ax(["_y3gn1h6o _1wpz1h6o"])
|
|
27
|
+
className: ax([fg('platform-linking-visual-refresh-sllv') ? "_y3gn1h6o _1wpz1h6o _ca0qoahv _n3tdoahv _19bvoahv _u5f3oahv _p12f1kdj" : "_y3gn1h6o _1wpz1h6o"])
|
|
24
28
|
}, fg('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(RichIconSearch, {
|
|
25
29
|
size: "xlarge",
|
|
26
|
-
alt: formatMessage(initialStateViewMessages.searchTitle)
|
|
30
|
+
alt: formatMessage(fg('platform-linking-visual-refresh-sllv') ? initialStateViewMessages.searchTitle : initialStateViewMessages.searchTitleOld)
|
|
27
31
|
}) : /*#__PURE__*/React.createElement(CrystalBallSVGOld, null), /*#__PURE__*/React.createElement("div", {
|
|
28
|
-
className: ax(["_11c8nbxd _ca0qpxbi _n3tdu2gc"])
|
|
29
|
-
}, formatMessage(initialStateViewMessages.searchTitle
|
|
32
|
+
className: ax([fg('platform-linking-visual-refresh-sllv') ? "_11c8lodh _syaz1fxt _ca0q1ejb _n3tdpxbi" : "_11c8nbxd _ca0qpxbi _n3tdu2gc"])
|
|
33
|
+
}, formatMessage(fg('platform-linking-visual-refresh-sllv') ? initialStateViewMessages.searchTitle : initialStateViewMessages.searchTitleOld)), /*#__PURE__*/React.createElement("div", {
|
|
34
|
+
className: ax([fg('platform-linking-visual-refresh-sllv') && "_syaz1gjq"])
|
|
35
|
+
}, formatMessage(initialStateViewMessages.searchDescription)), fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(Link, {
|
|
36
|
+
href: AQLSupportDocumentLink
|
|
37
|
+
}, formatMessage(initialStateViewMessages.learnMoreLink)) : /*#__PURE__*/React.createElement("a", {
|
|
30
38
|
href: AQLSupportDocumentLink,
|
|
31
39
|
target: "_blank"
|
|
32
|
-
}, formatMessage(initialStateViewMessages.
|
|
40
|
+
}, formatMessage(initialStateViewMessages.learnMoreLinkOld))));
|
|
33
41
|
};
|
package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js
CHANGED
|
@@ -1,18 +1,28 @@
|
|
|
1
1
|
import { defineMessages } from 'react-intl-next';
|
|
2
2
|
export const initialStateViewMessages = defineMessages({
|
|
3
|
+
searchTitleOld: {
|
|
4
|
+
id: 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitleOld',
|
|
5
|
+
description: 'The initial search state title that gives the user some idea about how to get information',
|
|
6
|
+
defaultMessage: 'Search for objects'
|
|
7
|
+
},
|
|
3
8
|
searchTitle: {
|
|
4
9
|
id: 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle',
|
|
5
10
|
description: 'The initial search state title that gives the user some idea about how to get information',
|
|
6
|
-
defaultMessage: 'Search for objects'
|
|
11
|
+
defaultMessage: 'Search for objects or object types'
|
|
7
12
|
},
|
|
8
13
|
searchDescription: {
|
|
9
14
|
id: 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription',
|
|
10
15
|
description: 'The initial search state helper message displays under the search title',
|
|
11
16
|
defaultMessage: 'Start typing or use AQL to search.'
|
|
12
17
|
},
|
|
18
|
+
learnMoreLinkOld: {
|
|
19
|
+
id: 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLinkOld',
|
|
20
|
+
description: 'The link that displays under the search description to help people know more about AQL',
|
|
21
|
+
defaultMessage: 'Learn more about searching with AQL.'
|
|
22
|
+
},
|
|
13
23
|
learnMoreLink: {
|
|
14
24
|
id: 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink',
|
|
15
25
|
description: 'The link that displays under the search description to help people know more about AQL',
|
|
16
|
-
defaultMessage: '
|
|
26
|
+
defaultMessage: 'Find out more about searching with AQL'
|
|
17
27
|
}
|
|
18
28
|
});
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
._11c82smr{font:var(--ds-font-body,normal 400 14px/20px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
|
+
._11c8lodh{font:var(--ds-font-heading-medium,normal 500 20px/24px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
3
|
._zulppxbi{gap:var(--ds-space-200,1pc)}
|
|
4
|
+
._19pkmgjw{margin-top:var(--ds-space-negative-200,-1pc)}
|
|
3
5
|
._1e0c1txw{display:flex}
|
|
4
6
|
._2lx21bp4{flex-direction:column}
|
|
5
7
|
._otyrpxbi{margin-bottom:var(--ds-space-200,1pc)}
|
|
8
|
+
._syaz1fxt{color:var(--ds-text,#172b4d)}
|
|
6
9
|
._syaznoz8{color:var(--ds-text-subtlest,#505f79)}
|
|
@@ -16,7 +16,8 @@ import { loadingErrorMessages } from './messages';
|
|
|
16
16
|
const styles = {
|
|
17
17
|
iconContainerStyles: "_otyrpxbi",
|
|
18
18
|
descriptionMessageStyles: "_zulppxbi _1e0c1txw _2lx21bp4",
|
|
19
|
-
|
|
19
|
+
urlStylesOld: "_11c82smr _syaznoz8",
|
|
20
|
+
urlStyles: "_11c8lodh _syaz1fxt _19pkmgjw"
|
|
20
21
|
};
|
|
21
22
|
const Description = ({
|
|
22
23
|
message,
|
|
@@ -25,7 +26,7 @@ const Description = ({
|
|
|
25
26
|
return /*#__PURE__*/React.createElement("div", {
|
|
26
27
|
className: ax([styles.descriptionMessageStyles])
|
|
27
28
|
}, /*#__PURE__*/React.createElement("span", {
|
|
28
|
-
className: ax([styles.urlStyles])
|
|
29
|
+
className: ax([fg('platform-linking-visual-refresh-sllv') ? styles.urlStyles : styles.urlStylesOld])
|
|
29
30
|
}, url), /*#__PURE__*/React.createElement("span", null, message));
|
|
30
31
|
};
|
|
31
32
|
const noop = () => '';
|
|
@@ -61,7 +62,8 @@ export const AccessRequired = ({
|
|
|
61
62
|
if (url) {
|
|
62
63
|
return /*#__PURE__*/React.createElement(EmptyState, {
|
|
63
64
|
testId: "datasource--access-required-with-url",
|
|
64
|
-
header: formatMessage(loadingErrorMessages.accessRequiredWithSite),
|
|
65
|
+
header: formatMessage(fg('platform-linking-visual-refresh-sllv') ? loadingErrorMessages.accessRequiredWithSite : loadingErrorMessages.accessRequiredWithSiteOld),
|
|
66
|
+
headingLevel: fg('platform-linking-visual-refresh-sllv') ? 2 : undefined,
|
|
65
67
|
description: /*#__PURE__*/React.createElement(Description, {
|
|
66
68
|
message: formatMessage(loadingErrorMessages.accessInstructions),
|
|
67
69
|
url: url
|
|
@@ -28,10 +28,15 @@ export const loadingErrorMessages = defineMessages({
|
|
|
28
28
|
defaultMessage: "You don't have access to the following site:"
|
|
29
29
|
},
|
|
30
30
|
//delete and remove duplicate from title above
|
|
31
|
+
accessRequiredWithSiteOld: {
|
|
32
|
+
id: 'linkDataSource.jira-issues.accessRequiredWithSiteOld',
|
|
33
|
+
description: 'Message letting user know that they do not have access to the site that will be listed below this message',
|
|
34
|
+
defaultMessage: "You don't have access to the following site:"
|
|
35
|
+
},
|
|
31
36
|
accessRequiredWithSite: {
|
|
32
37
|
id: 'linkDataSource.jira-issues.accessRequiredWithSite',
|
|
33
38
|
description: 'Message letting user know that they do not have access to the site that will be listed below this message',
|
|
34
|
-
defaultMessage: "You don't have access to
|
|
39
|
+
defaultMessage: "You don't have access to"
|
|
35
40
|
},
|
|
36
41
|
checkConnectionDuplicate: {
|
|
37
42
|
id: 'linkDataSource.checkConnection',
|
|
@@ -60,10 +65,20 @@ export const loadingErrorMessages = defineMessages({
|
|
|
60
65
|
defaultMessage: 'No results found'
|
|
61
66
|
},
|
|
62
67
|
//delete and remove duplicate from title above
|
|
68
|
+
noResultsFoundOld: {
|
|
69
|
+
id: 'linkDataSource.jira-issues.noResultsFoundOld',
|
|
70
|
+
description: 'Status message letting the user know their query did not have any results',
|
|
71
|
+
defaultMessage: 'No results found'
|
|
72
|
+
},
|
|
63
73
|
noResultsFound: {
|
|
64
74
|
id: 'linkDataSource.jira-issues.noResultsFound',
|
|
65
75
|
description: 'Status message letting the user know their query did not have any results',
|
|
66
|
-
defaultMessage: '
|
|
76
|
+
defaultMessage: "We couldn't find anything matching your search"
|
|
77
|
+
},
|
|
78
|
+
noResultsFoundDescription: {
|
|
79
|
+
id: 'linkDataSource.jira-issues.noResultsFound.description',
|
|
80
|
+
description: 'Status message letting the user know their query did not have any results',
|
|
81
|
+
defaultMessage: 'Try again with a different term.'
|
|
67
82
|
},
|
|
68
83
|
refreshDuplicate: {
|
|
69
84
|
id: 'linkDataSource.refresh',
|
|
@@ -93,10 +108,15 @@ export const loadingErrorMessages = defineMessages({
|
|
|
93
108
|
defaultMessage: 'Unable to load results'
|
|
94
109
|
},
|
|
95
110
|
//delete and remove duplicate from title above
|
|
111
|
+
unableToLoadResultsOld: {
|
|
112
|
+
id: 'linkDataSource.jira-issues.unableToLoadResultsOld',
|
|
113
|
+
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
114
|
+
defaultMessage: 'Unable to load results'
|
|
115
|
+
},
|
|
96
116
|
unableToLoadResults: {
|
|
97
117
|
id: 'linkDataSource.jira-issues.unableToLoadResults',
|
|
98
118
|
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
99
|
-
defaultMessage: '
|
|
119
|
+
defaultMessage: 'We ran into an issue trying to fetch results'
|
|
100
120
|
},
|
|
101
121
|
unableToLoadResultsVisualRefreshSllv: {
|
|
102
122
|
id: 'linkDataSource.jira-issues.unableToLoadResults.visual-refresh-sllv',
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
|
|
2
2
|
._zulp1ejb{gap:var(--ds-space-300,24px)}
|
|
3
|
+
._zulppxbi{gap:var(--ds-space-200,1pc)}
|
|
3
4
|
._zulpu2gc{gap:var(--ds-space-100,8px)}._10fp1h6o{justify-self:center}
|
|
5
|
+
._19bvoahv{padding-left:var(--ds-space-600,3pc)}
|
|
4
6
|
._1e0c11p5{display:grid}
|
|
5
7
|
._1wpz1h6o{align-self:center}
|
|
6
8
|
._4cvr1h6o{align-items:center}
|
|
7
|
-
._6a6z1h6o{justify-items:center}
|
|
9
|
+
._6a6z1h6o{justify-items:center}
|
|
10
|
+
._ca0qoahv{padding-top:var(--ds-space-600,3pc)}
|
|
11
|
+
._n3tdoahv{padding-bottom:var(--ds-space-600,3pc)}
|
|
12
|
+
._p12f1kdj{max-width:25pc}
|
|
13
|
+
._u5f3oahv{padding-right:var(--ds-space-600,3pc)}
|
|
14
|
+
._y3gn1h6o{text-align:center}
|
|
@@ -3,7 +3,9 @@ import "./modal-loading-error.compiled.css";
|
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
5
|
import { useEffect } from 'react';
|
|
6
|
+
import { cx } from '@compiled/react';
|
|
6
7
|
import { FormattedMessage } from 'react-intl-next';
|
|
8
|
+
import Button from '@atlaskit/button/new';
|
|
7
9
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
10
|
import { Box, Text } from '@atlaskit/primitives/compiled';
|
|
9
11
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
@@ -12,10 +14,13 @@ import { LoadingErrorSVGOld } from './loading-error-svg-old';
|
|
|
12
14
|
import { loadingErrorMessages } from './messages';
|
|
13
15
|
const styles = {
|
|
14
16
|
errorContainerStyles: "_zulp1ejb _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5",
|
|
15
|
-
|
|
17
|
+
errorContainerStylesNew: "_zulp1ejb _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5 _ca0qoahv _u5f3oahv _n3tdoahv _19bvoahv _p12f1kdj",
|
|
18
|
+
errorMessageContainerStylesOld: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
|
|
19
|
+
errorMessageContainerStyles: "_zulppxbi _4cvr1h6o _6a6z1h6o _1e0c11p5 _y3gn1h6o"
|
|
16
20
|
};
|
|
17
21
|
export const ModalLoadingError = ({
|
|
18
|
-
errorMessage = /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.checkConnection)
|
|
22
|
+
errorMessage = /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.checkConnection),
|
|
23
|
+
onRefresh
|
|
19
24
|
}) => {
|
|
20
25
|
const {
|
|
21
26
|
fireEvent
|
|
@@ -26,16 +31,27 @@ export const ModalLoadingError = ({
|
|
|
26
31
|
});
|
|
27
32
|
}, [fireEvent]);
|
|
28
33
|
return /*#__PURE__*/React.createElement(Box, {
|
|
29
|
-
xcss: styles.errorContainerStyles,
|
|
34
|
+
xcss: cx(fg('platform-linking-visual-refresh-sllv') ? styles.errorContainerStylesNew : styles.errorContainerStyles),
|
|
30
35
|
testId: "datasource-modal--loading-error"
|
|
31
36
|
}, fg('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(SpotErrorSearch, {
|
|
32
37
|
size: 'xlarge',
|
|
33
38
|
alt: ""
|
|
34
39
|
}) : /*#__PURE__*/React.createElement(LoadingErrorSVGOld, null), /*#__PURE__*/React.createElement(Box, {
|
|
35
|
-
xcss: styles.errorMessageContainerStyles
|
|
36
|
-
}, /*#__PURE__*/React.createElement(Text, {
|
|
40
|
+
xcss: cx(fg('platform-linking-visual-refresh-sllv') ? styles.errorMessageContainerStyles : styles.errorMessageContainerStylesOld)
|
|
41
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(Text, {
|
|
42
|
+
as: "span",
|
|
43
|
+
size: "large",
|
|
44
|
+
weight: "bold"
|
|
45
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadResults)) : /*#__PURE__*/React.createElement(Text, {
|
|
37
46
|
size: "small"
|
|
38
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.
|
|
47
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadResultsOld)), fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(Text, {
|
|
48
|
+
as: "span",
|
|
49
|
+
size: "medium"
|
|
50
|
+
}, errorMessage) : /*#__PURE__*/React.createElement(Text, {
|
|
39
51
|
as: "p"
|
|
40
|
-
}, errorMessage))
|
|
52
|
+
}, errorMessage), onRefresh && fg('platform-linking-visual-refresh-sllv') && /*#__PURE__*/React.createElement(Button, {
|
|
53
|
+
appearance: "primary",
|
|
54
|
+
onClick: onRefresh,
|
|
55
|
+
testId: "datasource-modal--loading-error-refresh"
|
|
56
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh))));
|
|
41
57
|
};
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
|
|
2
2
|
._zulp1ejb{gap:var(--ds-space-300,24px)}
|
|
3
|
+
._zulppxbi{gap:var(--ds-space-200,1pc)}
|
|
3
4
|
._zulpu2gc{gap:var(--ds-space-100,8px)}._10fp1h6o{justify-self:center}
|
|
4
5
|
._18u01jfw{margin-left:var(--ds-space-500,40px)}
|
|
6
|
+
._18u0oahv{margin-left:var(--ds-space-600,3pc)}
|
|
5
7
|
._19pk1jfw{margin-top:var(--ds-space-500,40px)}
|
|
8
|
+
._19pkoahv{margin-top:var(--ds-space-600,3pc)}
|
|
6
9
|
._1wpz1h6o{align-self:center}
|
|
7
10
|
._2hwx1jfw{margin-right:var(--ds-space-500,40px)}
|
|
11
|
+
._2hwxoahv{margin-right:var(--ds-space-600,3pc)}
|
|
8
12
|
._4cvr1h6o{align-items:center}
|
|
9
13
|
._6a6z1h6o{justify-items:center}
|
|
10
|
-
._otyr1jfw{margin-bottom:var(--ds-space-500,40px)}
|
|
14
|
+
._otyr1jfw{margin-bottom:var(--ds-space-500,40px)}
|
|
15
|
+
._otyroahv{margin-bottom:var(--ds-space-600,3pc)}
|
|
16
|
+
._p12fko4j{max-width:19pc}
|
|
17
|
+
._y3gn1h6o{text-align:center}
|