@atlaskit/link-datasource 4.3.0 → 4.3.1
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 +8 -0
- package/dist/cjs/ui/common/error-state/loading-error.compiled.css +3 -1
- package/dist/cjs/ui/common/error-state/loading-error.js +40 -7
- package/dist/cjs/ui/common/error-state/messages.js +17 -2
- package/dist/cjs/ui/common/modal/popup-select/control.js +5 -2
- package/dist/cjs/ui/common/modal/site-selector/index.compiled.css +2 -4
- package/dist/cjs/ui/common/modal/site-selector/index.js +9 -4
- package/dist/cjs/ui/datasource-table-view/datasourceTableView.js +7 -3
- package/dist/cjs/ui/issue-like-table/column-picker/index.js +1 -1
- package/dist/es2019/ui/common/error-state/loading-error.compiled.css +3 -1
- package/dist/es2019/ui/common/error-state/loading-error.js +35 -8
- package/dist/es2019/ui/common/error-state/messages.js +17 -2
- package/dist/es2019/ui/common/modal/popup-select/control.js +5 -2
- package/dist/es2019/ui/common/modal/site-selector/index.compiled.css +2 -4
- package/dist/es2019/ui/common/modal/site-selector/index.js +7 -3
- package/dist/es2019/ui/datasource-table-view/datasourceTableView.js +7 -3
- package/dist/es2019/ui/issue-like-table/column-picker/index.js +2 -2
- package/dist/esm/ui/common/error-state/loading-error.compiled.css +3 -1
- package/dist/esm/ui/common/error-state/loading-error.js +41 -8
- package/dist/esm/ui/common/error-state/messages.js +17 -2
- package/dist/esm/ui/common/modal/popup-select/control.js +5 -2
- package/dist/esm/ui/common/modal/site-selector/index.compiled.css +2 -4
- package/dist/esm/ui/common/modal/site-selector/index.js +9 -4
- package/dist/esm/ui/datasource-table-view/datasourceTableView.js +7 -3
- package/dist/esm/ui/issue-like-table/column-picker/index.js +2 -2
- package/dist/types/ui/common/error-state/loading-error.d.ts +2 -1
- package/dist/types/ui/common/error-state/messages.d.ts +16 -1
- package/dist/types-ts4.5/ui/common/error-state/loading-error.d.ts +2 -1
- package/dist/types-ts4.5/ui/common/error-state/messages.d.ts +16 -1
- package/package.json +8 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/link-datasource
|
|
2
2
|
|
|
3
|
+
## 4.3.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#141028](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141028)
|
|
8
|
+
[`f8e53e5484efd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f8e53e5484efd) -
|
|
9
|
+
[ux] Update error views on datasource table to have links to confluence and jira
|
|
10
|
+
|
|
3
11
|
## 4.3.0
|
|
4
12
|
|
|
5
13
|
### Minor Changes
|
|
@@ -11,8 +11,10 @@ require("./loading-error.compiled.css");
|
|
|
11
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
12
|
var React = _react;
|
|
13
13
|
var _runtime = require("@compiled/react/runtime");
|
|
14
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
14
15
|
var _reactIntlNext = require("react-intl-next");
|
|
15
16
|
var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
|
|
17
|
+
var _link = _interopRequireDefault(require("@atlaskit/link"));
|
|
16
18
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
17
19
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
18
20
|
var _typography = require("@atlaskit/theme/typography");
|
|
@@ -23,12 +25,20 @@ var _messages = require("./messages");
|
|
|
23
25
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
24
26
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
25
27
|
var styles = {
|
|
26
|
-
|
|
28
|
+
errorContainerStylesOld: "_zulppxbi _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5",
|
|
29
|
+
errorContainerStylesNew: "_zulppxbi _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5 _p12fko4j _y3gn1h6o",
|
|
27
30
|
errorMessageContainerStyles: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
|
|
28
31
|
errorMessageStyles: "_11c8nbxd"
|
|
29
32
|
};
|
|
33
|
+
var isConfluenceSearch = function isConfluenceSearch(url) {
|
|
34
|
+
return !!url.match(/https:\/\/.*\/wiki\/search/);
|
|
35
|
+
};
|
|
36
|
+
var isJiraIssuesList = function isJiraIssuesList(url) {
|
|
37
|
+
return !!url.match(/https:\/\/.*\/issues\/?\?jql=/);
|
|
38
|
+
};
|
|
30
39
|
var LoadingError = exports.LoadingError = function LoadingError(_ref) {
|
|
31
|
-
var onRefresh = _ref.onRefresh
|
|
40
|
+
var onRefresh = _ref.onRefresh,
|
|
41
|
+
url = _ref.url;
|
|
32
42
|
var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
|
|
33
43
|
fireEvent = _useDatasourceAnalyti.fireEvent;
|
|
34
44
|
(0, _react.useEffect)(function () {
|
|
@@ -36,8 +46,22 @@ var LoadingError = exports.LoadingError = function LoadingError(_ref) {
|
|
|
36
46
|
reason: 'network'
|
|
37
47
|
});
|
|
38
48
|
}, [fireEvent]);
|
|
39
|
-
|
|
40
|
-
|
|
49
|
+
var connectionErrorMessage = _messages.loadingErrorMessages.checkConnection;
|
|
50
|
+
if ((0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv')) {
|
|
51
|
+
if (url && isConfluenceSearch(url)) {
|
|
52
|
+
connectionErrorMessage = _messages.loadingErrorMessages.checkConnectionConfluence;
|
|
53
|
+
}
|
|
54
|
+
if (url && isJiraIssuesList(url)) {
|
|
55
|
+
connectionErrorMessage = _messages.loadingErrorMessages.checkConnectionJira;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// TODO: Move it to inline when cleaning platform-linking-visual-refresh-sllv
|
|
60
|
+
var FGWrapper = (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? 'div' : _react.Fragment;
|
|
61
|
+
return /*#__PURE__*/React.createElement(FGWrapper, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') && {
|
|
62
|
+
contentEditable: false
|
|
63
|
+
}, /*#__PURE__*/React.createElement(_compiled.Box, {
|
|
64
|
+
xcss: (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? styles.errorContainerStylesNew : styles.errorContainerStylesOld,
|
|
41
65
|
testId: "datasource--loading-error"
|
|
42
66
|
}, (0, _platformFeatureFlags.fg)('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(_search.SpotErrorSearch, {
|
|
43
67
|
size: 'xlarge',
|
|
@@ -47,10 +71,19 @@ var LoadingError = exports.LoadingError = function LoadingError(_ref) {
|
|
|
47
71
|
}, /*#__PURE__*/React.createElement(_compiled.Inline, {
|
|
48
72
|
as: "span",
|
|
49
73
|
xcss: styles.errorMessageStyles
|
|
50
|
-
}, /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.
|
|
74
|
+
}, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.unableToLoadResultsVisualRefreshSllv) : /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.unableToLoadItemsOld)), /*#__PURE__*/React.createElement(_compiled.Text, {
|
|
51
75
|
as: "p"
|
|
52
|
-
}, /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage,
|
|
76
|
+
}, /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, connectionErrorMessage, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') && {
|
|
77
|
+
values: {
|
|
78
|
+
a: function a(chunks) {
|
|
79
|
+
return /*#__PURE__*/React.createElement(_link.default, {
|
|
80
|
+
href: url || '',
|
|
81
|
+
target: "blank"
|
|
82
|
+
}, chunks);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}))), onRefresh && /*#__PURE__*/React.createElement(_standardButton.default, {
|
|
53
86
|
appearance: "primary",
|
|
54
87
|
onClick: onRefresh
|
|
55
|
-
}, /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.refresh))));
|
|
88
|
+
}, /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, _messages.loadingErrorMessages.refresh)))));
|
|
56
89
|
};
|
|
@@ -44,6 +44,16 @@ var loadingErrorMessages = exports.loadingErrorMessages = (0, _reactIntlNext.def
|
|
|
44
44
|
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
45
45
|
defaultMessage: 'Check your connection and refresh, or try again later.'
|
|
46
46
|
},
|
|
47
|
+
checkConnectionConfluence: {
|
|
48
|
+
id: 'linkDataSource.jira-issues.checkConnection.confluence',
|
|
49
|
+
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
50
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this search in Confluence</a> to review.'
|
|
51
|
+
},
|
|
52
|
+
checkConnectionJira: {
|
|
53
|
+
id: 'linkDataSource.jira-issues.checkConnection.jira',
|
|
54
|
+
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
55
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this search in Jira</a> to review. '
|
|
56
|
+
},
|
|
47
57
|
//delete and remove duplicate from title above
|
|
48
58
|
checkConnection: {
|
|
49
59
|
id: 'linkDataSource.jira-issues.checkConnection',
|
|
@@ -77,8 +87,8 @@ var loadingErrorMessages = exports.loadingErrorMessages = (0, _reactIntlNext.def
|
|
|
77
87
|
description: 'Error state message letting the user know we were unable the load the requested list of items',
|
|
78
88
|
defaultMessage: 'Unable to load items'
|
|
79
89
|
},
|
|
80
|
-
//
|
|
81
|
-
|
|
90
|
+
// TODO Delete when cleaning platform-linking-visual-refresh-sllv
|
|
91
|
+
unableToLoadItemsOld: {
|
|
82
92
|
id: 'linkDataSource.jira-issues.unableToLoadItems',
|
|
83
93
|
description: 'Error state message letting the user know we were unable the load the requested list of items',
|
|
84
94
|
defaultMessage: 'Unable to load items'
|
|
@@ -94,6 +104,11 @@ var loadingErrorMessages = exports.loadingErrorMessages = (0, _reactIntlNext.def
|
|
|
94
104
|
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
95
105
|
defaultMessage: 'Unable to load results'
|
|
96
106
|
},
|
|
107
|
+
unableToLoadResultsVisualRefreshSllv: {
|
|
108
|
+
id: 'linkDataSource.jira-issues.unableToLoadResults.visual-refresh-sllv',
|
|
109
|
+
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
110
|
+
defaultMessage: 'We ran into an issue trying to fetch results'
|
|
111
|
+
},
|
|
97
112
|
// delete once EDM-9407 is merged
|
|
98
113
|
noAccessToJiraSitesTitle: {
|
|
99
114
|
id: 'linkDataSource.jira-issues.no.jira.sites.access.title',
|
|
@@ -15,14 +15,17 @@ var popupCustomControlStyles = function popupCustomControlStyles() {
|
|
|
15
15
|
return {
|
|
16
16
|
display: 'flex',
|
|
17
17
|
padding: "var(--ds-space-050, 4px)",
|
|
18
|
-
|
|
18
|
+
border: 'none',
|
|
19
|
+
borderBottom: "solid 1px ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
|
|
20
|
+
minHeight: 'auto'
|
|
19
21
|
};
|
|
20
22
|
};
|
|
21
23
|
var CustomControl = exports.CustomControl = function CustomControl(_ref) {
|
|
22
24
|
var children = _ref.children,
|
|
23
25
|
innerProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
24
26
|
return /*#__PURE__*/_react.default.createElement(_select.components.Control, (0, _extends2.default)({}, innerProps, {
|
|
25
|
-
getStyles: popupCustomControlStyles
|
|
27
|
+
getStyles: popupCustomControlStyles,
|
|
28
|
+
appearance: "none"
|
|
26
29
|
}), children);
|
|
27
30
|
};
|
|
28
31
|
var _default = exports.default = CustomControl;
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
._zulpu2gc{gap:var(--ds-space-100,8px)}
|
|
3
|
-
._1e0c1txw{display:flex}
|
|
4
|
-
._1pbyibnn{z-index:11}
|
|
1
|
+
|
|
2
|
+
._zulpu2gc{gap:var(--ds-space-100,8px)}._1e0c1txw{display:flex}
|
|
5
3
|
._1tke1ylp{min-height:40px}
|
|
6
4
|
._4cvr1h6o{align-items:center}
|
|
@@ -11,8 +11,8 @@ require("./index.compiled.css");
|
|
|
11
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
12
|
var React = _react;
|
|
13
13
|
var _runtime = require("@compiled/react/runtime");
|
|
14
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
14
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
15
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
16
|
var _reactIntlNext = require("react-intl-next");
|
|
17
17
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
18
18
|
var _select = _interopRequireDefault(require("@atlaskit/select"));
|
|
@@ -26,7 +26,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
26
26
|
var styles = {
|
|
27
27
|
dropdownContainerStyles: "_zulpu2gc _1e0c1txw _4cvr1h6o _1tke1ylp"
|
|
28
28
|
};
|
|
29
|
-
var selectStyles = null;
|
|
30
29
|
var SiteSelector = exports.SiteSelector = function SiteSelector(props) {
|
|
31
30
|
var availableSites = props.availableSites,
|
|
32
31
|
onSiteSelection = props.onSiteSelection,
|
|
@@ -66,6 +65,13 @@ var SiteSelector = exports.SiteSelector = function SiteSelector(props) {
|
|
|
66
65
|
options: availableSitesOptions,
|
|
67
66
|
placeholder: formatMessage(_messages.siteSelectorMessages.chooseSite),
|
|
68
67
|
styles: {
|
|
68
|
+
container: function container(css) {
|
|
69
|
+
return _objectSpread(_objectSpread({}, css), {}, {
|
|
70
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
|
|
71
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
72
|
+
zIndex: 11
|
|
73
|
+
});
|
|
74
|
+
},
|
|
69
75
|
// prevents the popup menu with available sites from being too narrow
|
|
70
76
|
// if the selected site is much shorter than the other options
|
|
71
77
|
menu: function menu(_ref) {
|
|
@@ -89,7 +95,6 @@ var SiteSelector = exports.SiteSelector = function SiteSelector(props) {
|
|
|
89
95
|
},
|
|
90
96
|
testId: testId,
|
|
91
97
|
value: selectedSiteOption,
|
|
92
|
-
label: formatMessage(_messages.siteSelectorMessages.chooseSite)
|
|
93
|
-
className: (0, _runtime.ax)(["_11c82smr _1pbyibnn"])
|
|
98
|
+
label: formatMessage(_messages.siteSelectorMessages.chooseSite)
|
|
94
99
|
})));
|
|
95
100
|
};
|
|
@@ -11,8 +11,10 @@ require("./datasourceTableView.compiled.css");
|
|
|
11
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
12
|
var React = _react;
|
|
13
13
|
var _runtime = require("@compiled/react/runtime");
|
|
14
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
14
15
|
var _analyticsNext = require("@atlaskit/analytics-next");
|
|
15
16
|
var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
|
|
17
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
18
|
var _analytics = require("../../analytics");
|
|
17
19
|
var _constants = require("../../analytics/constants");
|
|
18
20
|
var _ufoExperiences = require("../../analytics/ufoExperiences");
|
|
@@ -135,7 +137,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
135
137
|
});
|
|
136
138
|
}, [reset]);
|
|
137
139
|
if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
|
|
138
|
-
return /*#__PURE__*/React.createElement(_noResults.NoResults, {
|
|
140
|
+
return /*#__PURE__*/React.createElement(_noResults.NoResults, !(0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') && {
|
|
139
141
|
onRefresh: handleErrorRefresh
|
|
140
142
|
});
|
|
141
143
|
}
|
|
@@ -152,9 +154,11 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
152
154
|
});
|
|
153
155
|
}
|
|
154
156
|
if (status === 'rejected') {
|
|
155
|
-
return /*#__PURE__*/React.createElement(_loadingError.LoadingError, {
|
|
157
|
+
return /*#__PURE__*/React.createElement(_loadingError.LoadingError, (0, _extends2.default)({
|
|
156
158
|
onRefresh: handleErrorRefresh
|
|
157
|
-
})
|
|
159
|
+
}, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') && {
|
|
160
|
+
url: url
|
|
161
|
+
}));
|
|
158
162
|
}
|
|
159
163
|
return /*#__PURE__*/React.createElement(_intlMessagesProvider.IntlMessagesProvider, {
|
|
160
164
|
defaultMessages: _en.default,
|
|
@@ -162,7 +162,7 @@ var ColumnPicker = exports.ColumnPicker = function ColumnPicker(_ref) {
|
|
|
162
162
|
return /*#__PURE__*/_react.default.createElement(_new.default, (0, _extends2.default)({}, tooltipProps, triggerProps, {
|
|
163
163
|
isSelected: isOpen,
|
|
164
164
|
spacing: "compact",
|
|
165
|
-
appearance: (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ?
|
|
165
|
+
appearance: (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? 'default' : 'subtle',
|
|
166
166
|
testId: "column-picker-trigger-button",
|
|
167
167
|
iconBefore: function iconBefore() {
|
|
168
168
|
return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
/* loading-error.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
|
+
import _extends from "@babel/runtime/helpers/extends";
|
|
2
3
|
import "./loading-error.compiled.css";
|
|
3
4
|
import * as React from 'react';
|
|
4
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
|
-
import { useEffect } from 'react';
|
|
6
|
+
import { Fragment, useEffect } from 'react';
|
|
6
7
|
import { FormattedMessage } from 'react-intl-next';
|
|
7
8
|
import Button from '@atlaskit/button/standard-button';
|
|
9
|
+
import AKLink from '@atlaskit/link';
|
|
8
10
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
11
|
import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
|
|
10
12
|
import { fontFallback } from '@atlaskit/theme/typography';
|
|
@@ -13,12 +15,16 @@ import { SpotErrorSearch } from '../../../common/ui/spot/error-state/search';
|
|
|
13
15
|
import { LoadingErrorSVGOld } from './loading-error-svg-old';
|
|
14
16
|
import { loadingErrorMessages } from './messages';
|
|
15
17
|
const styles = {
|
|
16
|
-
|
|
18
|
+
errorContainerStylesOld: "_zulppxbi _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5",
|
|
19
|
+
errorContainerStylesNew: "_zulppxbi _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5 _p12fko4j _y3gn1h6o",
|
|
17
20
|
errorMessageContainerStyles: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
|
|
18
21
|
errorMessageStyles: "_11c8nbxd"
|
|
19
22
|
};
|
|
23
|
+
const isConfluenceSearch = url => !!url.match(/https:\/\/.*\/wiki\/search/);
|
|
24
|
+
const isJiraIssuesList = url => !!url.match(/https:\/\/.*\/issues\/?\?jql=/);
|
|
20
25
|
export const LoadingError = ({
|
|
21
|
-
onRefresh
|
|
26
|
+
onRefresh,
|
|
27
|
+
url
|
|
22
28
|
}) => {
|
|
23
29
|
const {
|
|
24
30
|
fireEvent
|
|
@@ -28,8 +34,22 @@ export const LoadingError = ({
|
|
|
28
34
|
reason: 'network'
|
|
29
35
|
});
|
|
30
36
|
}, [fireEvent]);
|
|
31
|
-
|
|
32
|
-
|
|
37
|
+
let connectionErrorMessage = loadingErrorMessages.checkConnection;
|
|
38
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
39
|
+
if (url && isConfluenceSearch(url)) {
|
|
40
|
+
connectionErrorMessage = loadingErrorMessages.checkConnectionConfluence;
|
|
41
|
+
}
|
|
42
|
+
if (url && isJiraIssuesList(url)) {
|
|
43
|
+
connectionErrorMessage = loadingErrorMessages.checkConnectionJira;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
// TODO: Move it to inline when cleaning platform-linking-visual-refresh-sllv
|
|
48
|
+
const FGWrapper = fg('platform-linking-visual-refresh-sllv') ? 'div' : Fragment;
|
|
49
|
+
return /*#__PURE__*/React.createElement(FGWrapper, fg('platform-linking-visual-refresh-sllv') && {
|
|
50
|
+
contentEditable: false
|
|
51
|
+
}, /*#__PURE__*/React.createElement(Box, {
|
|
52
|
+
xcss: fg('platform-linking-visual-refresh-sllv') ? styles.errorContainerStylesNew : styles.errorContainerStylesOld,
|
|
33
53
|
testId: "datasource--loading-error"
|
|
34
54
|
}, fg('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(SpotErrorSearch, {
|
|
35
55
|
size: 'xlarge',
|
|
@@ -39,10 +59,17 @@ export const LoadingError = ({
|
|
|
39
59
|
}, /*#__PURE__*/React.createElement(Inline, {
|
|
40
60
|
as: "span",
|
|
41
61
|
xcss: styles.errorMessageStyles
|
|
42
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.
|
|
62
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadResultsVisualRefreshSllv) : /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadItemsOld)), /*#__PURE__*/React.createElement(Text, {
|
|
43
63
|
as: "p"
|
|
44
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage,
|
|
64
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, connectionErrorMessage, fg('platform-linking-visual-refresh-sllv') && {
|
|
65
|
+
values: {
|
|
66
|
+
a: chunks => /*#__PURE__*/React.createElement(AKLink, {
|
|
67
|
+
href: url || '',
|
|
68
|
+
target: "blank"
|
|
69
|
+
}, chunks)
|
|
70
|
+
}
|
|
71
|
+
}))), onRefresh && /*#__PURE__*/React.createElement(Button, {
|
|
45
72
|
appearance: "primary",
|
|
46
73
|
onClick: onRefresh
|
|
47
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh))));
|
|
74
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh)))));
|
|
48
75
|
};
|
|
@@ -38,6 +38,16 @@ export const loadingErrorMessages = defineMessages({
|
|
|
38
38
|
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
39
39
|
defaultMessage: 'Check your connection and refresh, or try again later.'
|
|
40
40
|
},
|
|
41
|
+
checkConnectionConfluence: {
|
|
42
|
+
id: 'linkDataSource.jira-issues.checkConnection.confluence',
|
|
43
|
+
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
44
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this search in Confluence</a> to review.'
|
|
45
|
+
},
|
|
46
|
+
checkConnectionJira: {
|
|
47
|
+
id: 'linkDataSource.jira-issues.checkConnection.jira',
|
|
48
|
+
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
49
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this search in Jira</a> to review. '
|
|
50
|
+
},
|
|
41
51
|
//delete and remove duplicate from title above
|
|
42
52
|
checkConnection: {
|
|
43
53
|
id: 'linkDataSource.jira-issues.checkConnection',
|
|
@@ -71,8 +81,8 @@ export const loadingErrorMessages = defineMessages({
|
|
|
71
81
|
description: 'Error state message letting the user know we were unable the load the requested list of items',
|
|
72
82
|
defaultMessage: 'Unable to load items'
|
|
73
83
|
},
|
|
74
|
-
//
|
|
75
|
-
|
|
84
|
+
// TODO Delete when cleaning platform-linking-visual-refresh-sllv
|
|
85
|
+
unableToLoadItemsOld: {
|
|
76
86
|
id: 'linkDataSource.jira-issues.unableToLoadItems',
|
|
77
87
|
description: 'Error state message letting the user know we were unable the load the requested list of items',
|
|
78
88
|
defaultMessage: 'Unable to load items'
|
|
@@ -88,6 +98,11 @@ export const loadingErrorMessages = defineMessages({
|
|
|
88
98
|
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
89
99
|
defaultMessage: 'Unable to load results'
|
|
90
100
|
},
|
|
101
|
+
unableToLoadResultsVisualRefreshSllv: {
|
|
102
|
+
id: 'linkDataSource.jira-issues.unableToLoadResults.visual-refresh-sllv',
|
|
103
|
+
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
104
|
+
defaultMessage: 'We ran into an issue trying to fetch results'
|
|
105
|
+
},
|
|
91
106
|
// delete once EDM-9407 is merged
|
|
92
107
|
noAccessToJiraSitesTitle: {
|
|
93
108
|
id: 'linkDataSource.jira-issues.no.jira.sites.access.title',
|
|
@@ -5,12 +5,15 @@ import { N40 } from '@atlaskit/theme/colors';
|
|
|
5
5
|
const popupCustomControlStyles = () => ({
|
|
6
6
|
display: 'flex',
|
|
7
7
|
padding: "var(--ds-space-050, 4px)",
|
|
8
|
-
|
|
8
|
+
border: 'none',
|
|
9
|
+
borderBottom: `solid 1px ${`var(--ds-border, ${N40})`}`,
|
|
10
|
+
minHeight: 'auto'
|
|
9
11
|
});
|
|
10
12
|
export const CustomControl = ({
|
|
11
13
|
children,
|
|
12
14
|
...innerProps
|
|
13
15
|
}) => /*#__PURE__*/React.createElement(components.Control, _extends({}, innerProps, {
|
|
14
|
-
getStyles: popupCustomControlStyles
|
|
16
|
+
getStyles: popupCustomControlStyles,
|
|
17
|
+
appearance: "none"
|
|
15
18
|
}), children);
|
|
16
19
|
export default CustomControl;
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
._zulpu2gc{gap:var(--ds-space-100,8px)}
|
|
3
|
-
._1e0c1txw{display:flex}
|
|
4
|
-
._1pbyibnn{z-index:11}
|
|
1
|
+
|
|
2
|
+
._zulpu2gc{gap:var(--ds-space-100,8px)}._1e0c1txw{display:flex}
|
|
5
3
|
._1tke1ylp{min-height:40px}
|
|
6
4
|
._4cvr1h6o{align-items:center}
|
|
@@ -10,7 +10,6 @@ import { siteSelectorMessages } from './messages';
|
|
|
10
10
|
const styles = {
|
|
11
11
|
dropdownContainerStyles: "_zulpu2gc _1e0c1txw _4cvr1h6o _1tke1ylp"
|
|
12
12
|
};
|
|
13
|
-
const selectStyles = null;
|
|
14
13
|
export const SiteSelector = props => {
|
|
15
14
|
const {
|
|
16
15
|
availableSites,
|
|
@@ -47,6 +46,12 @@ export const SiteSelector = props => {
|
|
|
47
46
|
options: availableSitesOptions,
|
|
48
47
|
placeholder: formatMessage(siteSelectorMessages.chooseSite),
|
|
49
48
|
styles: {
|
|
49
|
+
container: css => ({
|
|
50
|
+
...css,
|
|
51
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
|
|
52
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
53
|
+
zIndex: 11
|
|
54
|
+
}),
|
|
50
55
|
// prevents the popup menu with available sites from being too narrow
|
|
51
56
|
// if the selected site is much shorter than the other options
|
|
52
57
|
menu: ({
|
|
@@ -70,7 +75,6 @@ export const SiteSelector = props => {
|
|
|
70
75
|
},
|
|
71
76
|
testId: testId,
|
|
72
77
|
value: selectedSiteOption,
|
|
73
|
-
label: formatMessage(siteSelectorMessages.chooseSite)
|
|
74
|
-
className: ax(["_11c82smr _1pbyibnn"])
|
|
78
|
+
label: formatMessage(siteSelectorMessages.chooseSite)
|
|
75
79
|
})));
|
|
76
80
|
};
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
/* datasourceTableView.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
|
+
import _extends from "@babel/runtime/helpers/extends";
|
|
2
3
|
import "./datasourceTableView.compiled.css";
|
|
3
4
|
import * as React from 'react';
|
|
4
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
6
|
import { useCallback, useEffect, useRef } from 'react';
|
|
6
7
|
import { withAnalyticsContext } from '@atlaskit/analytics-next';
|
|
7
8
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
9
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
10
|
import { useDatasourceAnalyticsEvents } from '../../analytics';
|
|
9
11
|
import { componentMetadata } from '../../analytics/constants';
|
|
10
12
|
import { startUfoExperience } from '../../analytics/ufoExperiences';
|
|
@@ -127,7 +129,7 @@ const DatasourceTableViewWithoutAnalytics = ({
|
|
|
127
129
|
});
|
|
128
130
|
}, [reset]);
|
|
129
131
|
if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
|
|
130
|
-
return /*#__PURE__*/React.createElement(NoResults, {
|
|
132
|
+
return /*#__PURE__*/React.createElement(NoResults, !fg('platform-linking-visual-refresh-sllv') && {
|
|
131
133
|
onRefresh: handleErrorRefresh
|
|
132
134
|
});
|
|
133
135
|
}
|
|
@@ -144,9 +146,11 @@ const DatasourceTableViewWithoutAnalytics = ({
|
|
|
144
146
|
});
|
|
145
147
|
}
|
|
146
148
|
if (status === 'rejected') {
|
|
147
|
-
return /*#__PURE__*/React.createElement(LoadingError, {
|
|
149
|
+
return /*#__PURE__*/React.createElement(LoadingError, _extends({
|
|
148
150
|
onRefresh: handleErrorRefresh
|
|
149
|
-
})
|
|
151
|
+
}, fg('platform-linking-visual-refresh-sllv') && {
|
|
152
|
+
url
|
|
153
|
+
}));
|
|
150
154
|
}
|
|
151
155
|
return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
|
|
152
156
|
defaultMessages: i18nEN,
|
|
@@ -9,7 +9,7 @@ import CustomizeIcon from '@atlaskit/icon/core/customize';
|
|
|
9
9
|
import BoardIcon from '@atlaskit/icon/core/migration/board';
|
|
10
10
|
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
11
11
|
import ChevronDownIconOld from '@atlaskit/icon/utility/migration/chevron-down';
|
|
12
|
-
import { fg } from
|
|
12
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
13
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
14
14
|
import { CheckboxOption, createFilter, PopupSelect } from '@atlaskit/select';
|
|
15
15
|
import Tooltip from '@atlaskit/tooltip';
|
|
@@ -133,7 +133,7 @@ export const ColumnPicker = ({
|
|
|
133
133
|
}, tooltipProps => /*#__PURE__*/React.createElement(Button, _extends({}, tooltipProps, triggerProps, {
|
|
134
134
|
isSelected: isOpen,
|
|
135
135
|
spacing: "compact",
|
|
136
|
-
appearance: fg('platform-linking-visual-refresh-sllv') ?
|
|
136
|
+
appearance: fg('platform-linking-visual-refresh-sllv') ? 'default' : 'subtle',
|
|
137
137
|
testId: "column-picker-trigger-button",
|
|
138
138
|
iconBefore: () => /*#__PURE__*/React.createElement(Box, {
|
|
139
139
|
as: "span",
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
/* loading-error.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
|
+
import _extends from "@babel/runtime/helpers/extends";
|
|
2
3
|
import "./loading-error.compiled.css";
|
|
3
4
|
import * as React from 'react';
|
|
4
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
|
-
import { useEffect } from 'react';
|
|
6
|
+
import { Fragment, useEffect } from 'react';
|
|
6
7
|
import { FormattedMessage } from 'react-intl-next';
|
|
7
8
|
import Button from '@atlaskit/button/standard-button';
|
|
9
|
+
import AKLink from '@atlaskit/link';
|
|
8
10
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
11
|
import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
|
|
10
12
|
import { fontFallback } from '@atlaskit/theme/typography';
|
|
@@ -13,12 +15,20 @@ import { SpotErrorSearch } from '../../../common/ui/spot/error-state/search';
|
|
|
13
15
|
import { LoadingErrorSVGOld } from './loading-error-svg-old';
|
|
14
16
|
import { loadingErrorMessages } from './messages';
|
|
15
17
|
var styles = {
|
|
16
|
-
|
|
18
|
+
errorContainerStylesOld: "_zulppxbi _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5",
|
|
19
|
+
errorContainerStylesNew: "_zulppxbi _4cvr1h6o _6a6z1h6o _1wpz1h6o _10fp1h6o _1e0c11p5 _p12fko4j _y3gn1h6o",
|
|
17
20
|
errorMessageContainerStyles: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
|
|
18
21
|
errorMessageStyles: "_11c8nbxd"
|
|
19
22
|
};
|
|
23
|
+
var isConfluenceSearch = function isConfluenceSearch(url) {
|
|
24
|
+
return !!url.match(/https:\/\/.*\/wiki\/search/);
|
|
25
|
+
};
|
|
26
|
+
var isJiraIssuesList = function isJiraIssuesList(url) {
|
|
27
|
+
return !!url.match(/https:\/\/.*\/issues\/?\?jql=/);
|
|
28
|
+
};
|
|
20
29
|
export var LoadingError = function LoadingError(_ref) {
|
|
21
|
-
var onRefresh = _ref.onRefresh
|
|
30
|
+
var onRefresh = _ref.onRefresh,
|
|
31
|
+
url = _ref.url;
|
|
22
32
|
var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
|
|
23
33
|
fireEvent = _useDatasourceAnalyti.fireEvent;
|
|
24
34
|
useEffect(function () {
|
|
@@ -26,8 +36,22 @@ export var LoadingError = function LoadingError(_ref) {
|
|
|
26
36
|
reason: 'network'
|
|
27
37
|
});
|
|
28
38
|
}, [fireEvent]);
|
|
29
|
-
|
|
30
|
-
|
|
39
|
+
var connectionErrorMessage = loadingErrorMessages.checkConnection;
|
|
40
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
41
|
+
if (url && isConfluenceSearch(url)) {
|
|
42
|
+
connectionErrorMessage = loadingErrorMessages.checkConnectionConfluence;
|
|
43
|
+
}
|
|
44
|
+
if (url && isJiraIssuesList(url)) {
|
|
45
|
+
connectionErrorMessage = loadingErrorMessages.checkConnectionJira;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
// TODO: Move it to inline when cleaning platform-linking-visual-refresh-sllv
|
|
50
|
+
var FGWrapper = fg('platform-linking-visual-refresh-sllv') ? 'div' : Fragment;
|
|
51
|
+
return /*#__PURE__*/React.createElement(FGWrapper, fg('platform-linking-visual-refresh-sllv') && {
|
|
52
|
+
contentEditable: false
|
|
53
|
+
}, /*#__PURE__*/React.createElement(Box, {
|
|
54
|
+
xcss: fg('platform-linking-visual-refresh-sllv') ? styles.errorContainerStylesNew : styles.errorContainerStylesOld,
|
|
31
55
|
testId: "datasource--loading-error"
|
|
32
56
|
}, fg('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(SpotErrorSearch, {
|
|
33
57
|
size: 'xlarge',
|
|
@@ -37,10 +61,19 @@ export var LoadingError = function LoadingError(_ref) {
|
|
|
37
61
|
}, /*#__PURE__*/React.createElement(Inline, {
|
|
38
62
|
as: "span",
|
|
39
63
|
xcss: styles.errorMessageStyles
|
|
40
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.
|
|
64
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadResultsVisualRefreshSllv) : /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadItemsOld)), /*#__PURE__*/React.createElement(Text, {
|
|
41
65
|
as: "p"
|
|
42
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage,
|
|
66
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, connectionErrorMessage, fg('platform-linking-visual-refresh-sllv') && {
|
|
67
|
+
values: {
|
|
68
|
+
a: function a(chunks) {
|
|
69
|
+
return /*#__PURE__*/React.createElement(AKLink, {
|
|
70
|
+
href: url || '',
|
|
71
|
+
target: "blank"
|
|
72
|
+
}, chunks);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}))), onRefresh && /*#__PURE__*/React.createElement(Button, {
|
|
43
76
|
appearance: "primary",
|
|
44
77
|
onClick: onRefresh
|
|
45
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh))));
|
|
78
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh)))));
|
|
46
79
|
};
|
|
@@ -38,6 +38,16 @@ export var loadingErrorMessages = defineMessages({
|
|
|
38
38
|
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
39
39
|
defaultMessage: 'Check your connection and refresh, or try again later.'
|
|
40
40
|
},
|
|
41
|
+
checkConnectionConfluence: {
|
|
42
|
+
id: 'linkDataSource.jira-issues.checkConnection.confluence',
|
|
43
|
+
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
44
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this search in Confluence</a> to review.'
|
|
45
|
+
},
|
|
46
|
+
checkConnectionJira: {
|
|
47
|
+
id: 'linkDataSource.jira-issues.checkConnection.jira',
|
|
48
|
+
description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
|
|
49
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this search in Jira</a> to review. '
|
|
50
|
+
},
|
|
41
51
|
//delete and remove duplicate from title above
|
|
42
52
|
checkConnection: {
|
|
43
53
|
id: 'linkDataSource.jira-issues.checkConnection',
|
|
@@ -71,8 +81,8 @@ export var loadingErrorMessages = defineMessages({
|
|
|
71
81
|
description: 'Error state message letting the user know we were unable the load the requested list of items',
|
|
72
82
|
defaultMessage: 'Unable to load items'
|
|
73
83
|
},
|
|
74
|
-
//
|
|
75
|
-
|
|
84
|
+
// TODO Delete when cleaning platform-linking-visual-refresh-sllv
|
|
85
|
+
unableToLoadItemsOld: {
|
|
76
86
|
id: 'linkDataSource.jira-issues.unableToLoadItems',
|
|
77
87
|
description: 'Error state message letting the user know we were unable the load the requested list of items',
|
|
78
88
|
defaultMessage: 'Unable to load items'
|
|
@@ -88,6 +98,11 @@ export var loadingErrorMessages = defineMessages({
|
|
|
88
98
|
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
89
99
|
defaultMessage: 'Unable to load results'
|
|
90
100
|
},
|
|
101
|
+
unableToLoadResultsVisualRefreshSllv: {
|
|
102
|
+
id: 'linkDataSource.jira-issues.unableToLoadResults.visual-refresh-sllv',
|
|
103
|
+
description: 'Error state message letting the user know we were unable the load the requested list of results',
|
|
104
|
+
defaultMessage: 'We ran into an issue trying to fetch results'
|
|
105
|
+
},
|
|
91
106
|
// delete once EDM-9407 is merged
|
|
92
107
|
noAccessToJiraSitesTitle: {
|
|
93
108
|
id: 'linkDataSource.jira-issues.no.jira.sites.access.title',
|
|
@@ -8,14 +8,17 @@ var popupCustomControlStyles = function popupCustomControlStyles() {
|
|
|
8
8
|
return {
|
|
9
9
|
display: 'flex',
|
|
10
10
|
padding: "var(--ds-space-050, 4px)",
|
|
11
|
-
|
|
11
|
+
border: 'none',
|
|
12
|
+
borderBottom: "solid 1px ".concat("var(--ds-border, ".concat(N40, ")")),
|
|
13
|
+
minHeight: 'auto'
|
|
12
14
|
};
|
|
13
15
|
};
|
|
14
16
|
export var CustomControl = function CustomControl(_ref) {
|
|
15
17
|
var children = _ref.children,
|
|
16
18
|
innerProps = _objectWithoutProperties(_ref, _excluded);
|
|
17
19
|
return /*#__PURE__*/React.createElement(components.Control, _extends({}, innerProps, {
|
|
18
|
-
getStyles: popupCustomControlStyles
|
|
20
|
+
getStyles: popupCustomControlStyles,
|
|
21
|
+
appearance: "none"
|
|
19
22
|
}), children);
|
|
20
23
|
};
|
|
21
24
|
export default CustomControl;
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
._zulpu2gc{gap:var(--ds-space-100,8px)}
|
|
3
|
-
._1e0c1txw{display:flex}
|
|
4
|
-
._1pbyibnn{z-index:11}
|
|
1
|
+
|
|
2
|
+
._zulpu2gc{gap:var(--ds-space-100,8px)}._1e0c1txw{display:flex}
|
|
5
3
|
._1tke1ylp{min-height:40px}
|
|
6
4
|
._4cvr1h6o{align-items:center}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
|
-
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
3
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
4
4
|
var _excluded = ["width"],
|
|
5
5
|
_excluded2 = ["width"];
|
|
6
6
|
import "./index.compiled.css";
|
|
@@ -16,7 +16,6 @@ import { siteSelectorMessages } from './messages';
|
|
|
16
16
|
var styles = {
|
|
17
17
|
dropdownContainerStyles: "_zulpu2gc _1e0c1txw _4cvr1h6o _1tke1ylp"
|
|
18
18
|
};
|
|
19
|
-
var selectStyles = null;
|
|
20
19
|
export var SiteSelector = function SiteSelector(props) {
|
|
21
20
|
var availableSites = props.availableSites,
|
|
22
21
|
onSiteSelection = props.onSiteSelection,
|
|
@@ -56,6 +55,13 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
56
55
|
options: availableSitesOptions,
|
|
57
56
|
placeholder: formatMessage(siteSelectorMessages.chooseSite),
|
|
58
57
|
styles: {
|
|
58
|
+
container: function container(css) {
|
|
59
|
+
return _objectSpread(_objectSpread({}, css), {}, {
|
|
60
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
|
|
61
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
62
|
+
zIndex: 11
|
|
63
|
+
});
|
|
64
|
+
},
|
|
59
65
|
// prevents the popup menu with available sites from being too narrow
|
|
60
66
|
// if the selected site is much shorter than the other options
|
|
61
67
|
menu: function menu(_ref) {
|
|
@@ -79,7 +85,6 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
79
85
|
},
|
|
80
86
|
testId: testId,
|
|
81
87
|
value: selectedSiteOption,
|
|
82
|
-
label: formatMessage(siteSelectorMessages.chooseSite)
|
|
83
|
-
className: ax(["_11c82smr _1pbyibnn"])
|
|
88
|
+
label: formatMessage(siteSelectorMessages.chooseSite)
|
|
84
89
|
})));
|
|
85
90
|
};
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
/* datasourceTableView.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
|
+
import _extends from "@babel/runtime/helpers/extends";
|
|
2
3
|
import "./datasourceTableView.compiled.css";
|
|
3
4
|
import * as React from 'react';
|
|
4
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
6
|
import { useCallback, useEffect, useRef } from 'react';
|
|
6
7
|
import { withAnalyticsContext } from '@atlaskit/analytics-next';
|
|
7
8
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
9
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
10
|
import { useDatasourceAnalyticsEvents } from '../../analytics';
|
|
9
11
|
import { componentMetadata } from '../../analytics/constants';
|
|
10
12
|
import { startUfoExperience } from '../../analytics/ufoExperiences';
|
|
@@ -125,7 +127,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
125
127
|
});
|
|
126
128
|
}, [reset]);
|
|
127
129
|
if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
|
|
128
|
-
return /*#__PURE__*/React.createElement(NoResults, {
|
|
130
|
+
return /*#__PURE__*/React.createElement(NoResults, !fg('platform-linking-visual-refresh-sllv') && {
|
|
129
131
|
onRefresh: handleErrorRefresh
|
|
130
132
|
});
|
|
131
133
|
}
|
|
@@ -142,9 +144,11 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
142
144
|
});
|
|
143
145
|
}
|
|
144
146
|
if (status === 'rejected') {
|
|
145
|
-
return /*#__PURE__*/React.createElement(LoadingError, {
|
|
147
|
+
return /*#__PURE__*/React.createElement(LoadingError, _extends({
|
|
146
148
|
onRefresh: handleErrorRefresh
|
|
147
|
-
})
|
|
149
|
+
}, fg('platform-linking-visual-refresh-sllv') && {
|
|
150
|
+
url: url
|
|
151
|
+
}));
|
|
148
152
|
}
|
|
149
153
|
return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
|
|
150
154
|
defaultMessages: i18nEN,
|
|
@@ -13,7 +13,7 @@ import CustomizeIcon from '@atlaskit/icon/core/customize';
|
|
|
13
13
|
import BoardIcon from '@atlaskit/icon/core/migration/board';
|
|
14
14
|
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
15
15
|
import ChevronDownIconOld from '@atlaskit/icon/utility/migration/chevron-down';
|
|
16
|
-
import { fg } from
|
|
16
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
17
17
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
18
18
|
import { CheckboxOption, createFilter, PopupSelect } from '@atlaskit/select';
|
|
19
19
|
import Tooltip from '@atlaskit/tooltip';
|
|
@@ -152,7 +152,7 @@ export var ColumnPicker = function ColumnPicker(_ref) {
|
|
|
152
152
|
return /*#__PURE__*/React.createElement(Button, _extends({}, tooltipProps, triggerProps, {
|
|
153
153
|
isSelected: isOpen,
|
|
154
154
|
spacing: "compact",
|
|
155
|
-
appearance: fg('platform-linking-visual-refresh-sllv') ?
|
|
155
|
+
appearance: fg('platform-linking-visual-refresh-sllv') ? 'default' : 'subtle',
|
|
156
156
|
testId: "column-picker-trigger-button",
|
|
157
157
|
iconBefore: function iconBefore() {
|
|
158
158
|
return /*#__PURE__*/React.createElement(Box, {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
interface LoadingErrorProps {
|
|
3
3
|
onRefresh?: () => void;
|
|
4
|
+
url?: string;
|
|
4
5
|
}
|
|
5
|
-
export declare const LoadingError: ({ onRefresh }: LoadingErrorProps) => JSX.Element;
|
|
6
|
+
export declare const LoadingError: ({ onRefresh, url }: LoadingErrorProps) => JSX.Element;
|
|
6
7
|
export {};
|
|
@@ -34,6 +34,16 @@ export declare const loadingErrorMessages: {
|
|
|
34
34
|
description: string;
|
|
35
35
|
defaultMessage: string;
|
|
36
36
|
};
|
|
37
|
+
checkConnectionConfluence: {
|
|
38
|
+
id: string;
|
|
39
|
+
description: string;
|
|
40
|
+
defaultMessage: string;
|
|
41
|
+
};
|
|
42
|
+
checkConnectionJira: {
|
|
43
|
+
id: string;
|
|
44
|
+
description: string;
|
|
45
|
+
defaultMessage: string;
|
|
46
|
+
};
|
|
37
47
|
checkConnection: {
|
|
38
48
|
id: string;
|
|
39
49
|
description: string;
|
|
@@ -64,7 +74,7 @@ export declare const loadingErrorMessages: {
|
|
|
64
74
|
description: string;
|
|
65
75
|
defaultMessage: string;
|
|
66
76
|
};
|
|
67
|
-
|
|
77
|
+
unableToLoadItemsOld: {
|
|
68
78
|
id: string;
|
|
69
79
|
description: string;
|
|
70
80
|
defaultMessage: string;
|
|
@@ -79,6 +89,11 @@ export declare const loadingErrorMessages: {
|
|
|
79
89
|
description: string;
|
|
80
90
|
defaultMessage: string;
|
|
81
91
|
};
|
|
92
|
+
unableToLoadResultsVisualRefreshSllv: {
|
|
93
|
+
id: string;
|
|
94
|
+
description: string;
|
|
95
|
+
defaultMessage: string;
|
|
96
|
+
};
|
|
82
97
|
noAccessToJiraSitesTitle: {
|
|
83
98
|
id: string;
|
|
84
99
|
description: string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
interface LoadingErrorProps {
|
|
3
3
|
onRefresh?: () => void;
|
|
4
|
+
url?: string;
|
|
4
5
|
}
|
|
5
|
-
export declare const LoadingError: ({ onRefresh }: LoadingErrorProps) => JSX.Element;
|
|
6
|
+
export declare const LoadingError: ({ onRefresh, url }: LoadingErrorProps) => JSX.Element;
|
|
6
7
|
export {};
|
|
@@ -34,6 +34,16 @@ export declare const loadingErrorMessages: {
|
|
|
34
34
|
description: string;
|
|
35
35
|
defaultMessage: string;
|
|
36
36
|
};
|
|
37
|
+
checkConnectionConfluence: {
|
|
38
|
+
id: string;
|
|
39
|
+
description: string;
|
|
40
|
+
defaultMessage: string;
|
|
41
|
+
};
|
|
42
|
+
checkConnectionJira: {
|
|
43
|
+
id: string;
|
|
44
|
+
description: string;
|
|
45
|
+
defaultMessage: string;
|
|
46
|
+
};
|
|
37
47
|
checkConnection: {
|
|
38
48
|
id: string;
|
|
39
49
|
description: string;
|
|
@@ -64,7 +74,7 @@ export declare const loadingErrorMessages: {
|
|
|
64
74
|
description: string;
|
|
65
75
|
defaultMessage: string;
|
|
66
76
|
};
|
|
67
|
-
|
|
77
|
+
unableToLoadItemsOld: {
|
|
68
78
|
id: string;
|
|
69
79
|
description: string;
|
|
70
80
|
defaultMessage: string;
|
|
@@ -79,6 +89,11 @@ export declare const loadingErrorMessages: {
|
|
|
79
89
|
description: string;
|
|
80
90
|
defaultMessage: string;
|
|
81
91
|
};
|
|
92
|
+
unableToLoadResultsVisualRefreshSllv: {
|
|
93
|
+
id: string;
|
|
94
|
+
description: string;
|
|
95
|
+
defaultMessage: string;
|
|
96
|
+
};
|
|
82
97
|
noAccessToJiraSitesTitle: {
|
|
83
98
|
id: string;
|
|
84
99
|
description: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/link-datasource",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.1",
|
|
4
4
|
"description": "UI Components to support linking platform dataset feature",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -52,8 +52,8 @@
|
|
|
52
52
|
"@atlaskit/flag": "^17.1.0",
|
|
53
53
|
"@atlaskit/form": "^12.0.0",
|
|
54
54
|
"@atlaskit/heading": "^5.2.0",
|
|
55
|
-
"@atlaskit/icon": "^25.
|
|
56
|
-
"@atlaskit/icon-object": "^7.
|
|
55
|
+
"@atlaskit/icon": "^25.6.0",
|
|
56
|
+
"@atlaskit/icon-object": "^7.1.0",
|
|
57
57
|
"@atlaskit/image": "^3.0.0",
|
|
58
58
|
"@atlaskit/inline-edit": "^15.1.0",
|
|
59
59
|
"@atlaskit/intl-messages-provider": "^2.0.0",
|
|
@@ -61,6 +61,7 @@
|
|
|
61
61
|
"@atlaskit/jql-editor": "^5.2.0",
|
|
62
62
|
"@atlaskit/jql-editor-autocomplete-rest": "^3.0.0",
|
|
63
63
|
"@atlaskit/layering": "^2.1.0",
|
|
64
|
+
"@atlaskit/link": "^3.1.0",
|
|
64
65
|
"@atlaskit/link-client-extension": "^4.0.0",
|
|
65
66
|
"@atlaskit/linking-common": "^8.0.0",
|
|
66
67
|
"@atlaskit/linking-types": "^9.8.0",
|
|
@@ -69,22 +70,22 @@
|
|
|
69
70
|
"@atlaskit/modal-dialog": "^14.1.0",
|
|
70
71
|
"@atlaskit/outbound-auth-flow-client": "^3.4.0",
|
|
71
72
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
72
|
-
"@atlaskit/popup": "^4.
|
|
73
|
+
"@atlaskit/popup": "^4.1.0",
|
|
73
74
|
"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
|
|
74
75
|
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
|
|
75
76
|
"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^2.0.0",
|
|
76
77
|
"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.1.0",
|
|
77
78
|
"@atlaskit/primitives": "^14.4.0",
|
|
78
|
-
"@atlaskit/react-select": "^2.
|
|
79
|
+
"@atlaskit/react-select": "^2.4.0",
|
|
79
80
|
"@atlaskit/select": "^20.3.0",
|
|
80
|
-
"@atlaskit/smart-card": "^36.
|
|
81
|
+
"@atlaskit/smart-card": "^36.8.0",
|
|
81
82
|
"@atlaskit/smart-user-picker": "^8.0.0",
|
|
82
83
|
"@atlaskit/spinner": "^18.0.0",
|
|
83
84
|
"@atlaskit/tag": "^14.0.0",
|
|
84
85
|
"@atlaskit/temp-nav-app-icons": "^0.7.0",
|
|
85
86
|
"@atlaskit/textfield": "^8.0.0",
|
|
86
87
|
"@atlaskit/theme": "^18.0.0",
|
|
87
|
-
"@atlaskit/tokens": "^4.
|
|
88
|
+
"@atlaskit/tokens": "^4.8.0",
|
|
88
89
|
"@atlaskit/tooltip": "^20.0.0",
|
|
89
90
|
"@atlaskit/ufo": "^0.4.0",
|
|
90
91
|
"@atlaskit/width-detector": "^5.0.0",
|