@atlaskit/link-datasource 4.3.1 → 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 +20 -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/assets-modal/search-container/object-schema-select/index.js +27 -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/common/modal/display-view-dropdown/display-view-drop-down.compiled.css +3 -1
- package/dist/cjs/ui/common/modal/display-view-dropdown/display-view-drop-down.js +35 -8
- package/dist/cjs/ui/common/modal/display-view-dropdown/messages.js +10 -0
- package/dist/cjs/ui/common/modal/site-selector/index.js +45 -14
- package/dist/cjs/ui/common/modal/site-selector/messages.js +5 -0
- 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/assets-modal/search-container/object-schema-select/index.js +25 -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/common/modal/display-view-dropdown/display-view-drop-down.compiled.css +3 -1
- package/dist/es2019/ui/common/modal/display-view-dropdown/display-view-drop-down.js +35 -8
- package/dist/es2019/ui/common/modal/display-view-dropdown/messages.js +10 -0
- package/dist/es2019/ui/common/modal/site-selector/index.js +34 -5
- package/dist/es2019/ui/common/modal/site-selector/messages.js +5 -0
- 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/assets-modal/search-container/object-schema-select/index.js +28 -3
- 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/common/modal/display-view-dropdown/display-view-drop-down.compiled.css +3 -1
- package/dist/esm/ui/common/modal/display-view-dropdown/display-view-drop-down.js +35 -8
- package/dist/esm/ui/common/modal/display-view-dropdown/messages.js +10 -0
- package/dist/esm/ui/common/modal/site-selector/index.js +45 -14
- package/dist/esm/ui/common/modal/site-selector/messages.js +5 -0
- 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/common/modal/display-view-dropdown/messages.d.ts +10 -0
- package/dist/types/ui/common/modal/site-selector/messages.d.ts +5 -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/common/modal/display-view-dropdown/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/common/modal/site-selector/messages.d.ts +5 -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 +2 -2
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
|
-
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
3
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
import _extends from "@babel/runtime/helpers/extends";
|
|
4
|
+
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
5
|
+
var _excluded = ["isOpen"],
|
|
6
|
+
_excluded2 = ["width"],
|
|
7
|
+
_excluded3 = ["width"];
|
|
6
8
|
import "./index.compiled.css";
|
|
7
9
|
import * as React from 'react';
|
|
8
10
|
import { ax, ix } from "@compiled/react/runtime";
|
|
@@ -10,8 +12,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
10
12
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
11
13
|
import { useMemo } from 'react';
|
|
12
14
|
import { useIntl } from 'react-intl-next';
|
|
15
|
+
import Button from '@atlaskit/button/new';
|
|
16
|
+
import Heading from '@atlaskit/heading';
|
|
17
|
+
import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
|
|
18
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
19
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
14
|
-
import Select from '@atlaskit/select';
|
|
20
|
+
import Select, { PopupSelect } from '@atlaskit/select';
|
|
15
21
|
import { siteSelectorMessages } from './messages';
|
|
16
22
|
var styles = {
|
|
17
23
|
dropdownContainerStyles: "_zulpu2gc _1e0c1txw _4cvr1h6o _1tke1ylp"
|
|
@@ -46,14 +52,39 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
46
52
|
};
|
|
47
53
|
return /*#__PURE__*/React.createElement(Box, {
|
|
48
54
|
xcss: styles.dropdownContainerStyles
|
|
49
|
-
},
|
|
55
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(Heading, {
|
|
56
|
+
size: "medium",
|
|
57
|
+
as: "h1"
|
|
58
|
+
}, formatMessage(label)) : formatMessage(label), availableSites && availableSites.length > 1 && /*#__PURE__*/React.createElement("span", {
|
|
50
59
|
"data-testid": "".concat(testId, "--trigger")
|
|
51
|
-
}, /*#__PURE__*/React.createElement(
|
|
52
|
-
|
|
60
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(PopupSelect, {
|
|
61
|
+
searchThreshold: 10,
|
|
62
|
+
maxMenuWidth: 300,
|
|
63
|
+
minMenuWidth: 300,
|
|
53
64
|
isLoading: !availableSites,
|
|
65
|
+
testId: testId,
|
|
54
66
|
onChange: onChange,
|
|
67
|
+
value: selectedSiteOption,
|
|
68
|
+
label: formatMessage(siteSelectorMessages.chooseSite),
|
|
55
69
|
options: availableSitesOptions,
|
|
56
70
|
placeholder: formatMessage(siteSelectorMessages.chooseSite),
|
|
71
|
+
target: function target(_ref) {
|
|
72
|
+
var isOpen = _ref.isOpen,
|
|
73
|
+
triggerProps = _objectWithoutProperties(_ref, _excluded);
|
|
74
|
+
return /*#__PURE__*/React.createElement(Button, _extends({}, triggerProps, {
|
|
75
|
+
isSelected: isOpen,
|
|
76
|
+
iconAfter: ChevronDownIcon,
|
|
77
|
+
testId: "".concat(testId, "__control")
|
|
78
|
+
}), (selectedSiteOption === null || selectedSiteOption === void 0 ? void 0 : selectedSiteOption.label) || formatMessage(siteSelectorMessages.chooseSite));
|
|
79
|
+
}
|
|
80
|
+
}) : /*#__PURE__*/React.createElement(Select, {
|
|
81
|
+
classNamePrefix: testId,
|
|
82
|
+
isLoading: !availableSites,
|
|
83
|
+
onChange: onChange,
|
|
84
|
+
options: availableSitesOptions,
|
|
85
|
+
placeholder: formatMessage(siteSelectorMessages.chooseSiteOld)
|
|
86
|
+
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
|
|
87
|
+
,
|
|
57
88
|
styles: {
|
|
58
89
|
container: function container(css) {
|
|
59
90
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
@@ -64,9 +95,9 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
64
95
|
},
|
|
65
96
|
// prevents the popup menu with available sites from being too narrow
|
|
66
97
|
// if the selected site is much shorter than the other options
|
|
67
|
-
menu: function menu(
|
|
68
|
-
var width =
|
|
69
|
-
css = _objectWithoutProperties(
|
|
98
|
+
menu: function menu(_ref2) {
|
|
99
|
+
var width = _ref2.width,
|
|
100
|
+
css = _objectWithoutProperties(_ref2, _excluded2);
|
|
70
101
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
71
102
|
minWidth: '100%',
|
|
72
103
|
width: 'max-content',
|
|
@@ -74,9 +105,9 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
74
105
|
fontWeight: "var(--ds-font-weight-medium, 500)"
|
|
75
106
|
});
|
|
76
107
|
},
|
|
77
|
-
valueContainer: function valueContainer(
|
|
78
|
-
var width =
|
|
79
|
-
css = _objectWithoutProperties(
|
|
108
|
+
valueContainer: function valueContainer(_ref3) {
|
|
109
|
+
var width = _ref3.width,
|
|
110
|
+
css = _objectWithoutProperties(_ref3, _excluded3);
|
|
80
111
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
81
112
|
// font-weight has to be overridden here so that it gets applied after the font styles in teh css element above
|
|
82
113
|
fontWeight: "var(--ds-font-weight-medium, 500)"
|
|
@@ -85,6 +116,6 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
85
116
|
},
|
|
86
117
|
testId: testId,
|
|
87
118
|
value: selectedSiteOption,
|
|
88
|
-
label: formatMessage(siteSelectorMessages.
|
|
119
|
+
label: formatMessage(siteSelectorMessages.chooseSiteOld)
|
|
89
120
|
})));
|
|
90
121
|
};
|
|
@@ -9,6 +9,11 @@ export var siteSelectorMessages = defineMessages({
|
|
|
9
9
|
chooseSite: {
|
|
10
10
|
id: 'linkDataSource.jira-issues.configmodal.chooseSite',
|
|
11
11
|
description: 'Label for input letting user know they have to choose a site',
|
|
12
|
+
defaultMessage: 'Select a site'
|
|
13
|
+
},
|
|
14
|
+
chooseSiteOld: {
|
|
15
|
+
id: 'linkDataSource.jira-issues.configmodal.chooseSiteOld',
|
|
16
|
+
description: 'Label for input letting user know they have to choose a site',
|
|
12
17
|
defaultMessage: 'Choose site'
|
|
13
18
|
}
|
|
14
19
|
});
|
|
@@ -9,6 +9,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
9
9
|
import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
|
|
10
10
|
import { FormattedMessage, useIntl } from 'react-intl-next';
|
|
11
11
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
12
|
+
import LinkComponent from '@atlaskit/link';
|
|
12
13
|
import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
|
|
13
14
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
14
15
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
@@ -213,6 +214,24 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
|
|
|
213
214
|
}, [currentViewMode, fireInlineViewedEvent, fireTableViewedEvent, status]);
|
|
214
215
|
var renderTableModalContent = useCallback(function () {
|
|
215
216
|
if (status === 'rejected') {
|
|
217
|
+
if (selectedConfluenceSite && fg('platform-linking-visual-refresh-sllv')) {
|
|
218
|
+
return /*#__PURE__*/React.createElement(ModalLoadingError, {
|
|
219
|
+
errorMessage: /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, confluenceSearchModalMessages.checkConnectionWithSource, {
|
|
220
|
+
values: {
|
|
221
|
+
a: function a(urlText) {
|
|
222
|
+
return /*#__PURE__*/React.createElement(LinkComponent, {
|
|
223
|
+
href: selectedConfluenceSite.url
|
|
224
|
+
}, urlText);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
})),
|
|
228
|
+
onRefresh: function onRefresh() {
|
|
229
|
+
return reset({
|
|
230
|
+
shouldForceRequest: true
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
});
|
|
234
|
+
}
|
|
216
235
|
return /*#__PURE__*/React.createElement(ModalLoadingError, null);
|
|
217
236
|
} else if (status === 'unauthorized') {
|
|
218
237
|
return /*#__PURE__*/React.createElement(AccessRequired, {
|
|
@@ -241,7 +260,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
|
|
|
241
260
|
}, /*#__PURE__*/React.createElement(DatasourcesTableInModalPreview, {
|
|
242
261
|
testId: "confluence-search-datasource-table"
|
|
243
262
|
}));
|
|
244
|
-
}, [status, resolvedWithNoResults, columns.length, selectedConfluenceSiteUrl, urlBeingEdited, hasConfluenceSearchParams, formatMessage]);
|
|
263
|
+
}, [status, resolvedWithNoResults, columns.length, selectedConfluenceSiteUrl, urlBeingEdited, hasConfluenceSearchParams, formatMessage, reset, selectedConfluenceSite]);
|
|
245
264
|
var renderInlineLinkModalContent = useCallback(function () {
|
|
246
265
|
if (status === 'unauthorized') {
|
|
247
266
|
return /*#__PURE__*/React.createElement(AccessRequired, {
|
|
@@ -44,5 +44,10 @@ export var confluenceSearchModalMessages = defineMessages({
|
|
|
44
44
|
id: 'linkDataSource.confluence-search.configmodal.placeholder.issues',
|
|
45
45
|
description: 'Placeholder text that will be placed next to a count of confluence search results',
|
|
46
46
|
defaultMessage: '### Results'
|
|
47
|
+
},
|
|
48
|
+
checkConnectionWithSource: {
|
|
49
|
+
id: 'linkDataSource.confluence-search.checkConnectionWithSource',
|
|
50
|
+
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',
|
|
51
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this project in Confluence</a> to review.'
|
|
47
52
|
}
|
|
48
53
|
});
|
|
@@ -8,6 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
8
8
|
import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
9
9
|
import { FormattedMessage, useIntl } from 'react-intl-next';
|
|
10
10
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
11
|
+
import LinkComponent from '@atlaskit/link';
|
|
11
12
|
import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
|
|
12
13
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
14
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
@@ -271,12 +272,33 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
271
272
|
var renderIssuesModeContent = useCallback(function () {
|
|
272
273
|
var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
|
|
273
274
|
var getDescriptionMessage = function getDescriptionMessage() {
|
|
275
|
+
if (currentSearchMethod === 'basic' && fg('platform-linking-visual-refresh-sllv')) {
|
|
276
|
+
return initialStateViewMessages.searchDescriptionForBasicSearchVisualRefreshSllv;
|
|
277
|
+
}
|
|
274
278
|
if (fg('confluence-issue-terminology-refresh')) {
|
|
275
279
|
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
|
|
276
280
|
}
|
|
277
281
|
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch;
|
|
278
282
|
};
|
|
279
283
|
if (status === 'rejected' && jqlUrl) {
|
|
284
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
285
|
+
return /*#__PURE__*/React.createElement(ModalLoadingError, {
|
|
286
|
+
errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
|
|
287
|
+
values: {
|
|
288
|
+
a: function a(urlText) {
|
|
289
|
+
return /*#__PURE__*/React.createElement(LinkComponent, {
|
|
290
|
+
href: jqlUrl
|
|
291
|
+
}, urlText);
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
})) : undefined,
|
|
295
|
+
onRefresh: function onRefresh() {
|
|
296
|
+
return reset({
|
|
297
|
+
shouldForceRequest: true
|
|
298
|
+
});
|
|
299
|
+
}
|
|
300
|
+
});
|
|
301
|
+
}
|
|
280
302
|
return /*#__PURE__*/React.createElement(ModalLoadingError, {
|
|
281
303
|
errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSource, {
|
|
282
304
|
values: {
|
|
@@ -308,6 +330,9 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
308
330
|
title: fg('confluence-issue-terminology-refresh') ? modalMessages.searchJiraTitleIssueTermRefresh : modalMessages.searchJiraTitle,
|
|
309
331
|
description: getDescriptionMessage(),
|
|
310
332
|
learnMoreLink: currentSearchMethod === 'jql' ? {
|
|
333
|
+
href: jqlSupportDocumentLink,
|
|
334
|
+
text: initialStateViewMessages.learnMoreLinkOld
|
|
335
|
+
} : fg('platform-linking-visual-refresh-sllv') ? {
|
|
311
336
|
href: jqlSupportDocumentLink,
|
|
312
337
|
text: initialStateViewMessages.learnMoreLink
|
|
313
338
|
} : undefined
|
|
@@ -318,7 +343,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
318
343
|
}, /*#__PURE__*/React.createElement(DatasourcesTableInModalPreview, {
|
|
319
344
|
testId: "jira-datasource-table"
|
|
320
345
|
}));
|
|
321
|
-
}, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
|
|
346
|
+
}, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, reset]);
|
|
322
347
|
var siteSelectorLabel = useMemo(function () {
|
|
323
348
|
if (fg('confluence-issue-terminology-refresh')) {
|
|
324
349
|
return availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySitesIssueTermRefresh : modalMessages.insertIssuesTitleIssueTermRefresh;
|
|
@@ -390,7 +415,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
390
415
|
testId: "jira-datasource-modal--insert-button",
|
|
391
416
|
url: urlToInsert,
|
|
392
417
|
getAnalyticsPayload: getInsertButtonAnalyticsPayload
|
|
393
|
-
}, fg('confluence-issue-terminology-refresh') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
418
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv) : fg('confluence-issue-terminology-refresh') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
394
419
|
};
|
|
395
420
|
var ConnectedJiraIssueConfigModal = createDatasourceModal({
|
|
396
421
|
isValidParameters: isValidParameters,
|
|
@@ -91,11 +91,21 @@ export var modalMessages = defineMessages({
|
|
|
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
93
|
},
|
|
94
|
+
checkConnectionWithSourceVisualRefreshSllv: {
|
|
95
|
+
id: 'linkDataSource.jira-issues.checkConnectionWithSource.visual-refresh-sllv',
|
|
96
|
+
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',
|
|
97
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this project in Jira</a> to review.'
|
|
98
|
+
},
|
|
94
99
|
insertIssuesButtonTextIssueTermRefresh: {
|
|
95
100
|
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
|
|
96
101
|
description: 'Button text to insert the displayed content',
|
|
97
102
|
defaultMessage: 'Insert work items'
|
|
98
103
|
},
|
|
104
|
+
insertIssuesButtonTextIssueTermSllv: {
|
|
105
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-sllv',
|
|
106
|
+
description: 'Button text to insert the displayed content',
|
|
107
|
+
defaultMessage: 'Insert results'
|
|
108
|
+
},
|
|
99
109
|
insertIssuesTitleIssueTermRefresh: {
|
|
100
110
|
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitle-issue-term-refresh',
|
|
101
111
|
description: 'Title for the Jira Issues Datasource config modal',
|
package/dist/types/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
export declare const initialStateViewMessages: {
|
|
2
|
+
searchTitleOld: {
|
|
3
|
+
id: string;
|
|
4
|
+
description: string;
|
|
5
|
+
defaultMessage: string;
|
|
6
|
+
};
|
|
2
7
|
searchTitle: {
|
|
3
8
|
id: string;
|
|
4
9
|
description: string;
|
|
@@ -9,6 +14,11 @@ export declare const initialStateViewMessages: {
|
|
|
9
14
|
description: string;
|
|
10
15
|
defaultMessage: string;
|
|
11
16
|
};
|
|
17
|
+
learnMoreLinkOld: {
|
|
18
|
+
id: string;
|
|
19
|
+
description: string;
|
|
20
|
+
defaultMessage: string;
|
|
21
|
+
};
|
|
12
22
|
learnMoreLink: {
|
|
13
23
|
id: string;
|
|
14
24
|
description: string;
|
|
@@ -24,6 +24,11 @@ export declare const loadingErrorMessages: {
|
|
|
24
24
|
description: string;
|
|
25
25
|
defaultMessage: string;
|
|
26
26
|
};
|
|
27
|
+
accessRequiredWithSiteOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
27
32
|
accessRequiredWithSite: {
|
|
28
33
|
id: string;
|
|
29
34
|
description: string;
|
|
@@ -54,11 +59,21 @@ export declare const loadingErrorMessages: {
|
|
|
54
59
|
description: string;
|
|
55
60
|
defaultMessage: string;
|
|
56
61
|
};
|
|
62
|
+
noResultsFoundOld: {
|
|
63
|
+
id: string;
|
|
64
|
+
description: string;
|
|
65
|
+
defaultMessage: string;
|
|
66
|
+
};
|
|
57
67
|
noResultsFound: {
|
|
58
68
|
id: string;
|
|
59
69
|
description: string;
|
|
60
70
|
defaultMessage: string;
|
|
61
71
|
};
|
|
72
|
+
noResultsFoundDescription: {
|
|
73
|
+
id: string;
|
|
74
|
+
description: string;
|
|
75
|
+
defaultMessage: string;
|
|
76
|
+
};
|
|
62
77
|
refreshDuplicate: {
|
|
63
78
|
id: string;
|
|
64
79
|
description: string;
|
|
@@ -84,6 +99,11 @@ export declare const loadingErrorMessages: {
|
|
|
84
99
|
description: string;
|
|
85
100
|
defaultMessage: string;
|
|
86
101
|
};
|
|
102
|
+
unableToLoadResultsOld: {
|
|
103
|
+
id: string;
|
|
104
|
+
description: string;
|
|
105
|
+
defaultMessage: string;
|
|
106
|
+
};
|
|
87
107
|
unableToLoadResults: {
|
|
88
108
|
id: string;
|
|
89
109
|
description: string;
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
interface ModalLoadingErrorProps {
|
|
3
3
|
errorMessage?: React.ReactNode;
|
|
4
|
+
/**
|
|
5
|
+
* This callback function is only consumed when the
|
|
6
|
+
* ff `platform-linking-visual-refresh-sllv` is enabled.
|
|
7
|
+
*/
|
|
8
|
+
onRefresh?: () => void;
|
|
4
9
|
}
|
|
5
|
-
export declare const ModalLoadingError: ({ errorMessage, }: ModalLoadingErrorProps) => JSX.Element;
|
|
10
|
+
export declare const ModalLoadingError: ({ errorMessage, onRefresh, }: ModalLoadingErrorProps) => JSX.Element;
|
|
6
11
|
export {};
|
|
@@ -24,6 +24,11 @@ export declare const initialStateViewMessages: {
|
|
|
24
24
|
description: string;
|
|
25
25
|
defaultMessage: string;
|
|
26
26
|
};
|
|
27
|
+
learnMoreLinkOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
27
32
|
learnMoreLink: {
|
|
28
33
|
id: string;
|
|
29
34
|
description: string;
|
|
@@ -39,4 +44,9 @@ export declare const initialStateViewMessages: {
|
|
|
39
44
|
description: string;
|
|
40
45
|
defaultMessage: string;
|
|
41
46
|
};
|
|
47
|
+
searchDescriptionForBasicSearchVisualRefreshSllv: {
|
|
48
|
+
id: string;
|
|
49
|
+
description: string;
|
|
50
|
+
defaultMessage: string;
|
|
51
|
+
};
|
|
42
52
|
};
|
|
@@ -9,6 +9,11 @@ export declare const displayViewDropDownMessages: {
|
|
|
9
9
|
description: string;
|
|
10
10
|
defaultMessage: string;
|
|
11
11
|
};
|
|
12
|
+
viewModeListDescriptionOld: {
|
|
13
|
+
id: string;
|
|
14
|
+
description: string;
|
|
15
|
+
defaultMessage: string;
|
|
16
|
+
};
|
|
12
17
|
viewModeInlineLinkLabel: {
|
|
13
18
|
id: string;
|
|
14
19
|
description: string;
|
|
@@ -19,4 +24,9 @@ export declare const displayViewDropDownMessages: {
|
|
|
19
24
|
description: string;
|
|
20
25
|
defaultMessage: string;
|
|
21
26
|
};
|
|
27
|
+
viewModeInlineLinkDescriptionOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
22
32
|
};
|
|
@@ -84,11 +84,21 @@ export declare const modalMessages: {
|
|
|
84
84
|
description: string;
|
|
85
85
|
defaultMessage: string;
|
|
86
86
|
};
|
|
87
|
+
checkConnectionWithSourceVisualRefreshSllv: {
|
|
88
|
+
id: string;
|
|
89
|
+
description: string;
|
|
90
|
+
defaultMessage: string;
|
|
91
|
+
};
|
|
87
92
|
insertIssuesButtonTextIssueTermRefresh: {
|
|
88
93
|
id: string;
|
|
89
94
|
description: string;
|
|
90
95
|
defaultMessage: string;
|
|
91
96
|
};
|
|
97
|
+
insertIssuesButtonTextIssueTermSllv: {
|
|
98
|
+
id: string;
|
|
99
|
+
description: string;
|
|
100
|
+
defaultMessage: string;
|
|
101
|
+
};
|
|
92
102
|
insertIssuesTitleIssueTermRefresh: {
|
|
93
103
|
id: string;
|
|
94
104
|
description: string;
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
export declare const initialStateViewMessages: {
|
|
2
|
+
searchTitleOld: {
|
|
3
|
+
id: string;
|
|
4
|
+
description: string;
|
|
5
|
+
defaultMessage: string;
|
|
6
|
+
};
|
|
2
7
|
searchTitle: {
|
|
3
8
|
id: string;
|
|
4
9
|
description: string;
|
|
@@ -9,6 +14,11 @@ export declare const initialStateViewMessages: {
|
|
|
9
14
|
description: string;
|
|
10
15
|
defaultMessage: string;
|
|
11
16
|
};
|
|
17
|
+
learnMoreLinkOld: {
|
|
18
|
+
id: string;
|
|
19
|
+
description: string;
|
|
20
|
+
defaultMessage: string;
|
|
21
|
+
};
|
|
12
22
|
learnMoreLink: {
|
|
13
23
|
id: string;
|
|
14
24
|
description: string;
|
|
@@ -24,6 +24,11 @@ export declare const loadingErrorMessages: {
|
|
|
24
24
|
description: string;
|
|
25
25
|
defaultMessage: string;
|
|
26
26
|
};
|
|
27
|
+
accessRequiredWithSiteOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
27
32
|
accessRequiredWithSite: {
|
|
28
33
|
id: string;
|
|
29
34
|
description: string;
|
|
@@ -54,11 +59,21 @@ export declare const loadingErrorMessages: {
|
|
|
54
59
|
description: string;
|
|
55
60
|
defaultMessage: string;
|
|
56
61
|
};
|
|
62
|
+
noResultsFoundOld: {
|
|
63
|
+
id: string;
|
|
64
|
+
description: string;
|
|
65
|
+
defaultMessage: string;
|
|
66
|
+
};
|
|
57
67
|
noResultsFound: {
|
|
58
68
|
id: string;
|
|
59
69
|
description: string;
|
|
60
70
|
defaultMessage: string;
|
|
61
71
|
};
|
|
72
|
+
noResultsFoundDescription: {
|
|
73
|
+
id: string;
|
|
74
|
+
description: string;
|
|
75
|
+
defaultMessage: string;
|
|
76
|
+
};
|
|
62
77
|
refreshDuplicate: {
|
|
63
78
|
id: string;
|
|
64
79
|
description: string;
|
|
@@ -84,6 +99,11 @@ export declare const loadingErrorMessages: {
|
|
|
84
99
|
description: string;
|
|
85
100
|
defaultMessage: string;
|
|
86
101
|
};
|
|
102
|
+
unableToLoadResultsOld: {
|
|
103
|
+
id: string;
|
|
104
|
+
description: string;
|
|
105
|
+
defaultMessage: string;
|
|
106
|
+
};
|
|
87
107
|
unableToLoadResults: {
|
|
88
108
|
id: string;
|
|
89
109
|
description: string;
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
interface ModalLoadingErrorProps {
|
|
3
3
|
errorMessage?: React.ReactNode;
|
|
4
|
+
/**
|
|
5
|
+
* This callback function is only consumed when the
|
|
6
|
+
* ff `platform-linking-visual-refresh-sllv` is enabled.
|
|
7
|
+
*/
|
|
8
|
+
onRefresh?: () => void;
|
|
4
9
|
}
|
|
5
|
-
export declare const ModalLoadingError: ({ errorMessage, }: ModalLoadingErrorProps) => JSX.Element;
|
|
10
|
+
export declare const ModalLoadingError: ({ errorMessage, onRefresh, }: ModalLoadingErrorProps) => JSX.Element;
|
|
6
11
|
export {};
|
|
@@ -24,6 +24,11 @@ export declare const initialStateViewMessages: {
|
|
|
24
24
|
description: string;
|
|
25
25
|
defaultMessage: string;
|
|
26
26
|
};
|
|
27
|
+
learnMoreLinkOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
27
32
|
learnMoreLink: {
|
|
28
33
|
id: string;
|
|
29
34
|
description: string;
|
|
@@ -39,4 +44,9 @@ export declare const initialStateViewMessages: {
|
|
|
39
44
|
description: string;
|
|
40
45
|
defaultMessage: string;
|
|
41
46
|
};
|
|
47
|
+
searchDescriptionForBasicSearchVisualRefreshSllv: {
|
|
48
|
+
id: string;
|
|
49
|
+
description: string;
|
|
50
|
+
defaultMessage: string;
|
|
51
|
+
};
|
|
42
52
|
};
|
|
@@ -9,6 +9,11 @@ export declare const displayViewDropDownMessages: {
|
|
|
9
9
|
description: string;
|
|
10
10
|
defaultMessage: string;
|
|
11
11
|
};
|
|
12
|
+
viewModeListDescriptionOld: {
|
|
13
|
+
id: string;
|
|
14
|
+
description: string;
|
|
15
|
+
defaultMessage: string;
|
|
16
|
+
};
|
|
12
17
|
viewModeInlineLinkLabel: {
|
|
13
18
|
id: string;
|
|
14
19
|
description: string;
|
|
@@ -19,4 +24,9 @@ export declare const displayViewDropDownMessages: {
|
|
|
19
24
|
description: string;
|
|
20
25
|
defaultMessage: string;
|
|
21
26
|
};
|
|
27
|
+
viewModeInlineLinkDescriptionOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
22
32
|
};
|
|
@@ -84,11 +84,21 @@ export declare const modalMessages: {
|
|
|
84
84
|
description: string;
|
|
85
85
|
defaultMessage: string;
|
|
86
86
|
};
|
|
87
|
+
checkConnectionWithSourceVisualRefreshSllv: {
|
|
88
|
+
id: string;
|
|
89
|
+
description: string;
|
|
90
|
+
defaultMessage: string;
|
|
91
|
+
};
|
|
87
92
|
insertIssuesButtonTextIssueTermRefresh: {
|
|
88
93
|
id: string;
|
|
89
94
|
description: string;
|
|
90
95
|
defaultMessage: string;
|
|
91
96
|
};
|
|
97
|
+
insertIssuesButtonTextIssueTermSllv: {
|
|
98
|
+
id: string;
|
|
99
|
+
description: string;
|
|
100
|
+
defaultMessage: string;
|
|
101
|
+
};
|
|
92
102
|
insertIssuesTitleIssueTermRefresh: {
|
|
93
103
|
id: string;
|
|
94
104
|
description: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/link-datasource",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.5.0",
|
|
4
4
|
"description": "UI Components to support linking platform dataset feature",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@atlaskit/link": "^3.1.0",
|
|
65
65
|
"@atlaskit/link-client-extension": "^4.0.0",
|
|
66
66
|
"@atlaskit/linking-common": "^8.0.0",
|
|
67
|
-
"@atlaskit/linking-types": "^9.
|
|
67
|
+
"@atlaskit/linking-types": "^9.9.0",
|
|
68
68
|
"@atlaskit/logo": "^16.0.0",
|
|
69
69
|
"@atlaskit/lozenge": "^12.2.0",
|
|
70
70
|
"@atlaskit/modal-dialog": "^14.1.0",
|