@atlaskit/link-datasource 1.24.4 → 1.24.6
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 +13 -0
- package/dist/cjs/common/types.js +5 -1
- package/dist/cjs/services/{getAvailableJiraSites.js → getAvailableSites.js} +5 -5
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +1 -3
- package/dist/cjs/ui/common/error-state/access-required.js +1 -2
- package/dist/cjs/ui/common/error-state/loading-error.js +2 -3
- package/dist/cjs/ui/common/error-state/messages.js +56 -0
- package/dist/cjs/ui/common/error-state/modal-loading-error.js +2 -3
- package/dist/cjs/ui/common/error-state/no-instances.js +10 -7
- package/dist/cjs/ui/common/error-state/no-results.js +2 -3
- package/dist/cjs/ui/common/initial-state-view/index.js +73 -0
- package/dist/cjs/ui/{jira-issues-modal → common}/initial-state-view/messages.js +9 -2
- package/dist/cjs/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js +8 -6
- package/dist/cjs/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js +5 -0
- package/dist/cjs/ui/{jira-issues-modal → common/modal}/site-selector/index.js +20 -10
- package/dist/cjs/ui/{jira-issues-modal → common/modal}/site-selector/messages.js +6 -0
- package/dist/cjs/ui/confluence-search-modal/index.js +29 -0
- package/dist/cjs/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.js +152 -0
- package/dist/cjs/ui/confluence-search-modal/modal/index.js +153 -0
- package/dist/cjs/ui/confluence-search-modal/modal/messages.js +54 -0
- package/dist/cjs/ui/issue-like-table/column-picker/concatenated-menu-list.js +2 -3
- package/dist/cjs/ui/issue-like-table/drag-column-preview.js +1 -1
- package/dist/cjs/ui/issue-like-table/index.js +2 -2
- package/dist/cjs/ui/issue-like-table/styled.js +2 -2
- package/dist/cjs/ui/jira-issues-modal/index.js +1 -1
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +8 -5
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +41 -32
- package/dist/cjs/ui/jira-issues-modal/modal/{display-view-dropdown/display-view-drop-down.js → jira-display-view-dropdown/jira-display-view-drop-down.js} +3 -3
- package/dist/cjs/ui/jira-issues-modal/{initial-state-view/assets/initial-state-svg.js → modal/jira-issues-initial-state-svg.js} +2 -2
- package/dist/cjs/ui/jira-issues-modal/modal/messages.js +66 -0
- package/dist/es2019/common/types.js +1 -0
- package/dist/es2019/services/{getAvailableJiraSites.js → getAvailableSites.js} +2 -2
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +1 -3
- package/dist/es2019/ui/common/error-state/access-required.js +1 -2
- package/dist/es2019/ui/common/error-state/loading-error.js +2 -3
- package/dist/es2019/ui/common/error-state/messages.js +56 -0
- package/dist/es2019/ui/common/error-state/modal-loading-error.js +2 -3
- package/dist/es2019/ui/common/error-state/no-instances.js +21 -14
- package/dist/es2019/ui/common/error-state/no-results.js +2 -3
- package/dist/es2019/ui/common/initial-state-view/index.js +66 -0
- package/dist/es2019/ui/{jira-issues-modal → common}/initial-state-view/messages.js +9 -2
- package/dist/es2019/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js +8 -5
- package/dist/es2019/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js +5 -0
- package/dist/es2019/ui/{jira-issues-modal → common/modal}/site-selector/index.js +19 -9
- package/dist/es2019/ui/{jira-issues-modal → common/modal}/site-selector/messages.js +6 -0
- package/dist/es2019/ui/confluence-search-modal/index.js +13 -0
- package/dist/es2019/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.js +143 -0
- package/dist/es2019/ui/confluence-search-modal/modal/index.js +108 -0
- package/dist/es2019/ui/confluence-search-modal/modal/messages.js +48 -0
- package/dist/es2019/ui/issue-like-table/column-picker/concatenated-menu-list.js +2 -3
- package/dist/es2019/ui/issue-like-table/drag-column-preview.js +1 -1
- package/dist/es2019/ui/issue-like-table/index.js +2 -2
- package/dist/es2019/ui/issue-like-table/styled.js +2 -2
- package/dist/es2019/ui/jira-issues-modal/index.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +5 -2
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +36 -27
- package/dist/es2019/ui/jira-issues-modal/modal/{display-view-dropdown/display-view-drop-down.js → jira-display-view-dropdown/jira-display-view-drop-down.js} +2 -2
- package/dist/es2019/ui/jira-issues-modal/{initial-state-view/assets/initial-state-svg.js → modal/jira-issues-initial-state-svg.js} +1 -1
- package/dist/es2019/ui/jira-issues-modal/modal/messages.js +66 -0
- package/dist/esm/common/types.js +1 -0
- package/dist/esm/services/{getAvailableJiraSites.js → getAvailableSites.js} +4 -4
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +1 -3
- package/dist/esm/ui/common/error-state/access-required.js +1 -2
- package/dist/esm/ui/common/error-state/loading-error.js +2 -3
- package/dist/esm/ui/common/error-state/messages.js +56 -0
- package/dist/esm/ui/common/error-state/modal-loading-error.js +2 -3
- package/dist/esm/ui/common/error-state/no-instances.js +11 -8
- package/dist/esm/ui/common/error-state/no-results.js +2 -3
- package/dist/esm/ui/common/initial-state-view/index.js +65 -0
- package/dist/esm/ui/{jira-issues-modal → common}/initial-state-view/messages.js +9 -2
- package/dist/esm/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js +8 -6
- package/dist/esm/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js +5 -0
- package/dist/esm/ui/{jira-issues-modal → common/modal}/site-selector/index.js +19 -9
- package/dist/esm/ui/{jira-issues-modal → common/modal}/site-selector/messages.js +6 -0
- package/dist/esm/ui/confluence-search-modal/index.js +17 -0
- package/dist/esm/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.js +145 -0
- package/dist/esm/ui/confluence-search-modal/modal/index.js +142 -0
- package/dist/esm/ui/confluence-search-modal/modal/messages.js +48 -0
- package/dist/esm/ui/issue-like-table/column-picker/concatenated-menu-list.js +2 -3
- package/dist/esm/ui/issue-like-table/drag-column-preview.js +1 -1
- package/dist/esm/ui/issue-like-table/index.js +2 -2
- package/dist/esm/ui/issue-like-table/styled.js +2 -2
- package/dist/esm/ui/jira-issues-modal/index.js +1 -1
- package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +5 -2
- package/dist/esm/ui/jira-issues-modal/modal/index.js +36 -27
- package/dist/esm/ui/jira-issues-modal/modal/{display-view-dropdown/display-view-drop-down.js → jira-display-view-dropdown/jira-display-view-drop-down.js} +2 -2
- package/dist/esm/ui/jira-issues-modal/{initial-state-view/assets/initial-state-svg.js → modal/jira-issues-initial-state-svg.js} +1 -1
- package/dist/esm/ui/jira-issues-modal/modal/messages.js +66 -0
- package/dist/types/common/types.d.ts +30 -0
- package/dist/types/services/getAvailableSites.d.ts +2 -0
- package/dist/types/ui/common/error-state/messages.d.ts +45 -0
- package/dist/types/ui/common/error-state/no-instances.d.ts +8 -1
- package/dist/types/ui/common/initial-state-view/index.d.ts +16 -0
- package/dist/{types-ts4.5/ui/jira-issues-modal → types/ui/common}/initial-state-view/messages.d.ts +6 -1
- package/dist/types/ui/{jira-issues-modal → common/modal}/basic-search-input/index.d.ts +5 -2
- package/dist/types/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.d.ts +5 -0
- package/dist/types/ui/common/modal/site-selector/index.d.ts +11 -0
- package/dist/{types-ts4.5/ui/jira-issues-modal → types/ui/common/modal}/site-selector/messages.d.ts +5 -0
- package/dist/types/ui/confluence-search-modal/index.d.ts +5 -0
- package/dist/types/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.d.ts +2 -0
- package/dist/types/ui/confluence-search-modal/modal/index.d.ts +3 -0
- package/dist/types/ui/confluence-search-modal/modal/messages.d.ts +47 -0
- package/dist/types/ui/issue-like-table/styled.d.ts +1 -1
- package/dist/types/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts +1 -1
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts +1 -1
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts +1 -1
- package/dist/types/ui/jira-issues-modal/index.d.ts +2 -2
- package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts +2 -2
- package/dist/types/ui/jira-issues-modal/modal/index.d.ts +6 -5
- package/dist/types/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts +8 -0
- package/dist/types/ui/jira-issues-modal/modal/jira-issues-initial-state-svg.d.ts +2 -0
- package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +60 -0
- package/dist/types/ui/jira-issues-modal/types.d.ts +1 -28
- package/dist/types-ts4.5/common/types.d.ts +30 -0
- package/dist/types-ts4.5/services/getAvailableSites.d.ts +2 -0
- package/dist/types-ts4.5/ui/common/error-state/messages.d.ts +45 -0
- package/dist/types-ts4.5/ui/common/error-state/no-instances.d.ts +8 -1
- package/dist/types-ts4.5/ui/common/initial-state-view/index.d.ts +16 -0
- package/dist/{types/ui/jira-issues-modal → types-ts4.5/ui/common}/initial-state-view/messages.d.ts +6 -1
- package/dist/types-ts4.5/ui/{jira-issues-modal → common/modal}/basic-search-input/index.d.ts +5 -2
- package/dist/types-ts4.5/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.d.ts +5 -0
- package/dist/types-ts4.5/ui/common/modal/site-selector/index.d.ts +11 -0
- package/dist/{types/ui/jira-issues-modal → types-ts4.5/ui/common/modal}/site-selector/messages.d.ts +5 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/index.d.ts +5 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.d.ts +2 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/modal/index.d.ts +3 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/modal/messages.d.ts +47 -0
- package/dist/types-ts4.5/ui/issue-like-table/styled.d.ts +1 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts +1 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/index.d.ts +2 -2
- package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts +2 -2
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/index.d.ts +6 -5
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts +8 -0
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-issues-initial-state-svg.d.ts +2 -0
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +60 -0
- package/dist/types-ts4.5/ui/jira-issues-modal/types.d.ts +1 -28
- package/package.json +6 -3
- package/dist/cjs/ui/jira-issues-modal/initial-state-view/index.js +0 -83
- package/dist/es2019/ui/jira-issues-modal/initial-state-view/index.js +0 -77
- package/dist/esm/ui/jira-issues-modal/initial-state-view/index.js +0 -76
- package/dist/types/services/getAvailableJiraSites.d.ts +0 -2
- package/dist/types/ui/jira-issues-modal/initial-state-view/assets/initial-state-svg.d.ts +0 -2
- package/dist/types/ui/jira-issues-modal/initial-state-view/index.d.ts +0 -8
- package/dist/types/ui/jira-issues-modal/modal/display-view-dropdown/display-view-drop-down.d.ts +0 -8
- package/dist/types/ui/jira-issues-modal/site-selector/index.d.ts +0 -9
- package/dist/types-ts4.5/services/getAvailableJiraSites.d.ts +0 -2
- package/dist/types-ts4.5/ui/jira-issues-modal/initial-state-view/assets/initial-state-svg.d.ts +0 -2
- package/dist/types-ts4.5/ui/jira-issues-modal/initial-state-view/index.d.ts +0 -8
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/display-view-dropdown/display-view-drop-down.d.ts +0 -8
- package/dist/types-ts4.5/ui/jira-issues-modal/site-selector/index.d.ts +0 -9
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { defineMessages } from 'react-intl-next';
|
|
2
2
|
export const initialStateViewMessages = defineMessages({
|
|
3
|
-
|
|
4
|
-
id: 'linkDataSource.modal-initial-state.
|
|
3
|
+
jiraSearchTitle: {
|
|
4
|
+
id: 'linkDataSource.modal-initial-state.jiraSearchTitle',
|
|
5
5
|
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
6
6
|
defaultMessage: 'Search for Jira issues'
|
|
7
7
|
},
|
|
@@ -10,6 +10,13 @@ export const initialStateViewMessages = defineMessages({
|
|
|
10
10
|
description: 'Beta lozenge',
|
|
11
11
|
defaultMessage: 'Beta'
|
|
12
12
|
},
|
|
13
|
+
// everything below is a duplication from the work around EDM-9407
|
|
14
|
+
// needs to be cleaned up after that PR is merged
|
|
15
|
+
searchTitle: {
|
|
16
|
+
id: 'linkDataSource.modal-initial-state.searchTitle',
|
|
17
|
+
description: 'The initial modal search state title that gives the user some idea about how to get information',
|
|
18
|
+
defaultMessage: 'Search for Jira issues'
|
|
19
|
+
},
|
|
13
20
|
searchDescriptionForBasicSearch: {
|
|
14
21
|
id: 'linkDataSource.modal-initial-state.searchDescription-basic',
|
|
15
22
|
description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
|
|
@@ -23,7 +23,9 @@ export const BasicSearchInput = ({
|
|
|
23
23
|
onChange,
|
|
24
24
|
onSearch,
|
|
25
25
|
searchTerm,
|
|
26
|
-
|
|
26
|
+
fullWidth,
|
|
27
|
+
testId,
|
|
28
|
+
placeholder
|
|
27
29
|
}) => {
|
|
28
30
|
const {
|
|
29
31
|
formatMessage
|
|
@@ -38,8 +40,9 @@ export const BasicSearchInput = ({
|
|
|
38
40
|
}
|
|
39
41
|
return false;
|
|
40
42
|
}, []);
|
|
43
|
+
const isFullWidth = fullWidth || !showBasicFilters;
|
|
41
44
|
return jsx("form", {
|
|
42
|
-
css:
|
|
45
|
+
css: isFullWidth ? formStyles : formWithMaxWidthStyles,
|
|
43
46
|
onSubmit: handleFormSubmit
|
|
44
47
|
}, jsx(Textfield, {
|
|
45
48
|
elemAfterInput: jsx(LoadingButton, {
|
|
@@ -53,12 +56,12 @@ export const BasicSearchInput = ({
|
|
|
53
56
|
isLoading: isSearching,
|
|
54
57
|
onClick: () => onSearch(searchTerm),
|
|
55
58
|
spacing: "none",
|
|
56
|
-
testId:
|
|
59
|
+
testId: `${testId}--basic-search-button`
|
|
57
60
|
}),
|
|
58
61
|
autoFocus: true,
|
|
59
62
|
onChange: onChange,
|
|
60
|
-
placeholder: formatMessage(
|
|
61
|
-
testId: testId
|
|
63
|
+
placeholder: formatMessage(placeholder),
|
|
64
|
+
testId: `${testId}--basic-search-input`,
|
|
62
65
|
value: searchTerm
|
|
63
66
|
}));
|
|
64
67
|
};
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { defineMessages } from 'react-intl-next';
|
|
2
2
|
export const basicSearchInputMessages = defineMessages({
|
|
3
|
+
basicTextSearchLabelDuplicate: {
|
|
4
|
+
id: 'linkDataSource.configmodal.basicTextSearchPlaceholder',
|
|
5
|
+
description: 'Placeholder text for the search input box',
|
|
6
|
+
defaultMessage: 'Search for issues by keyword'
|
|
7
|
+
},
|
|
3
8
|
basicTextSearchLabel: {
|
|
4
9
|
id: 'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder',
|
|
5
10
|
description: 'Placeholder text for the search input box',
|
|
@@ -2,20 +2,28 @@
|
|
|
2
2
|
import { useMemo } from 'react';
|
|
3
3
|
import { css, jsx } from '@emotion/react';
|
|
4
4
|
import { useIntl } from 'react-intl-next';
|
|
5
|
+
import { Box, xcss } from '@atlaskit/primitives';
|
|
5
6
|
import Select from '@atlaskit/select';
|
|
6
|
-
import { siteSelectorIndex } from '
|
|
7
|
+
import { siteSelectorIndex } from '../../../../common/zindex';
|
|
7
8
|
import { siteSelectorMessages } from './messages';
|
|
9
|
+
const dropdownContainerStyles = xcss({
|
|
10
|
+
display: 'flex',
|
|
11
|
+
alignItems: 'center',
|
|
12
|
+
gap: 'space.100',
|
|
13
|
+
minHeight: '40px' // to prevent vertical shifting when site selector pops in
|
|
14
|
+
});
|
|
8
15
|
const selectStyles = css({
|
|
9
16
|
fontSize: "var(--ds-font-size-100, 14px)",
|
|
10
17
|
fontWeight: "var(--ds-font-weight-medium, 500)",
|
|
11
|
-
lineHeight: "var(--ds-
|
|
18
|
+
lineHeight: "var(--ds-space-250, 20px)",
|
|
12
19
|
zIndex: siteSelectorIndex
|
|
13
20
|
});
|
|
14
|
-
export const
|
|
21
|
+
export const SiteSelector = props => {
|
|
15
22
|
const {
|
|
16
23
|
availableSites,
|
|
17
24
|
onSiteSelection,
|
|
18
|
-
|
|
25
|
+
selectedSite,
|
|
26
|
+
label,
|
|
19
27
|
testId
|
|
20
28
|
} = props;
|
|
21
29
|
const {
|
|
@@ -31,11 +39,13 @@ export const JiraSiteSelector = props => {
|
|
|
31
39
|
label: site.displayName,
|
|
32
40
|
value: site.cloudId
|
|
33
41
|
})), [availableSites]);
|
|
34
|
-
const selectedSiteOption =
|
|
35
|
-
label:
|
|
36
|
-
value:
|
|
42
|
+
const selectedSiteOption = selectedSite && {
|
|
43
|
+
label: selectedSite.displayName,
|
|
44
|
+
value: selectedSite.cloudId
|
|
37
45
|
};
|
|
38
|
-
return jsx(
|
|
46
|
+
return jsx(Box, {
|
|
47
|
+
xcss: dropdownContainerStyles
|
|
48
|
+
}, formatMessage(label), availableSites && availableSites.length > 1 && jsx("span", {
|
|
39
49
|
"data-testid": `${testId}--trigger`
|
|
40
50
|
}, jsx(Select, {
|
|
41
51
|
css: selectStyles,
|
|
@@ -58,5 +68,5 @@ export const JiraSiteSelector = props => {
|
|
|
58
68
|
},
|
|
59
69
|
testId: testId,
|
|
60
70
|
value: selectedSiteOption
|
|
61
|
-
}));
|
|
71
|
+
})));
|
|
62
72
|
};
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { defineMessages } from 'react-intl-next';
|
|
2
2
|
export const siteSelectorMessages = defineMessages({
|
|
3
|
+
chooseSiteDuplicate: {
|
|
4
|
+
id: 'linkDataSource.site-selector.configmodal.chooseSite',
|
|
5
|
+
description: 'Label for input letting user know they have to choose a site',
|
|
6
|
+
defaultMessage: 'Choose site'
|
|
7
|
+
},
|
|
8
|
+
// delete this and remove duplicate from above once EDM-9407 is merged
|
|
3
9
|
chooseSite: {
|
|
4
10
|
id: 'linkDataSource.jira-issues.configmodal.chooseSite',
|
|
5
11
|
description: 'Label for input letting user know they have to choose a site',
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import React, { lazy, Suspense } from 'react';
|
|
2
|
+
export const CONFLUENCE_SEARCH_DATASOURCE_ID = '768fc736-3af4-4a8f-b27e-203602bff8ca';
|
|
3
|
+
const LazyConfluenceSearchConfigModal = /*#__PURE__*/lazy(() => import( /* webpackChunkName: "@atlaskit-internal_linkdatasource-confluencesearchmodal" */'./modal').then(module => ({
|
|
4
|
+
default: module.ConfluenceSearchConfigModal
|
|
5
|
+
})));
|
|
6
|
+
const ConfluenceSearchConfigModalWithWrappers = props => {
|
|
7
|
+
return /*#__PURE__*/React.createElement(Suspense, {
|
|
8
|
+
fallback: /*#__PURE__*/React.createElement("div", {
|
|
9
|
+
"data-testid": 'confluence-search-datasource-table-suspense'
|
|
10
|
+
})
|
|
11
|
+
}, /*#__PURE__*/React.createElement(LazyConfluenceSearchConfigModal, props));
|
|
12
|
+
};
|
|
13
|
+
export default ConfluenceSearchConfigModalWithWrappers;
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
export const ConfluenceSearchInitialStateSVG = () => /*#__PURE__*/React.createElement("svg", {
|
|
3
|
+
width: "188",
|
|
4
|
+
height: "112",
|
|
5
|
+
viewBox: "0 0 188 112",
|
|
6
|
+
fill: "none",
|
|
7
|
+
xmlns: "http://www.w3.org/2000/svg"
|
|
8
|
+
}, /*#__PURE__*/React.createElement("rect", {
|
|
9
|
+
x: "25.5",
|
|
10
|
+
y: "1",
|
|
11
|
+
width: "127",
|
|
12
|
+
height: "97",
|
|
13
|
+
rx: "4",
|
|
14
|
+
fill: "white",
|
|
15
|
+
stroke: "#B7BDC8",
|
|
16
|
+
strokeWidth: "2"
|
|
17
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
18
|
+
x1: "24.5",
|
|
19
|
+
y1: "10",
|
|
20
|
+
x2: "152.5",
|
|
21
|
+
y2: "10",
|
|
22
|
+
stroke: "#B7BDC8",
|
|
23
|
+
strokeWidth: "2"
|
|
24
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
25
|
+
x1: "24.5",
|
|
26
|
+
y1: "32",
|
|
27
|
+
x2: "152.5",
|
|
28
|
+
y2: "32",
|
|
29
|
+
stroke: "#B7BDC8",
|
|
30
|
+
strokeWidth: "2"
|
|
31
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
32
|
+
x1: "24.5",
|
|
33
|
+
y1: "54",
|
|
34
|
+
x2: "152.5",
|
|
35
|
+
y2: "54",
|
|
36
|
+
stroke: "#B7BDC8",
|
|
37
|
+
strokeWidth: "2"
|
|
38
|
+
}), /*#__PURE__*/React.createElement("rect", {
|
|
39
|
+
x: "32",
|
|
40
|
+
y: "18",
|
|
41
|
+
width: "114",
|
|
42
|
+
height: "5",
|
|
43
|
+
rx: "2.5",
|
|
44
|
+
fill: "#C1C7D0",
|
|
45
|
+
fillOpacity: "0.4"
|
|
46
|
+
}), /*#__PURE__*/React.createElement("rect", {
|
|
47
|
+
x: "32",
|
|
48
|
+
y: "41",
|
|
49
|
+
width: "114",
|
|
50
|
+
height: "5",
|
|
51
|
+
rx: "2.5",
|
|
52
|
+
fill: "#C1C7D0",
|
|
53
|
+
fillOpacity: "0.4"
|
|
54
|
+
}), /*#__PURE__*/React.createElement("rect", {
|
|
55
|
+
x: "32",
|
|
56
|
+
y: "84",
|
|
57
|
+
width: "114",
|
|
58
|
+
height: "5",
|
|
59
|
+
rx: "2.5",
|
|
60
|
+
fill: "#C1C7D0",
|
|
61
|
+
fillOpacity: "0.4"
|
|
62
|
+
}), /*#__PURE__*/React.createElement("rect", {
|
|
63
|
+
x: "32",
|
|
64
|
+
y: "62",
|
|
65
|
+
width: "114",
|
|
66
|
+
height: "5",
|
|
67
|
+
rx: "2.5",
|
|
68
|
+
fill: "#C1C7D0",
|
|
69
|
+
fillOpacity: "0.4"
|
|
70
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
71
|
+
x1: "24.5",
|
|
72
|
+
y1: "76",
|
|
73
|
+
x2: "152.5",
|
|
74
|
+
y2: "76",
|
|
75
|
+
stroke: "#B7BDC8",
|
|
76
|
+
strokeWidth: "2"
|
|
77
|
+
}), /*#__PURE__*/React.createElement("g", {
|
|
78
|
+
clipPath: "url(#clip0_1_10772)"
|
|
79
|
+
}, /*#__PURE__*/React.createElement("rect", {
|
|
80
|
+
width: "72",
|
|
81
|
+
height: "72",
|
|
82
|
+
transform: "translate(100.5 40)",
|
|
83
|
+
fill: "white",
|
|
84
|
+
fillOpacity: "0.01"
|
|
85
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
86
|
+
d: "M146.011 90.5858L142.602 87.2253L147.304 82.5063L150.713 85.8668C151.581 86.7186 152.678 87.3021 153.872 87.5471C155.063 87.8204 156.155 88.4139 157.03 89.2631L170.885 102.884C171.892 103.878 172.464 105.228 172.478 106.641C172.491 108.053 171.944 109.414 170.957 110.427C169.953 111.425 168.595 111.989 167.177 111.995C165.759 112.002 164.396 111.451 163.383 110.463L149.529 96.842C148.659 95.9778 148.049 94.8879 147.77 93.696C147.512 92.5065 146.899 91.4224 146.011 90.5858Z",
|
|
87
|
+
fill: "#CFD4DB"
|
|
88
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
89
|
+
d: "M146.011 90.5858L144.971 89.549C144.659 89.243 144.412 88.8785 144.243 88.4765C144.074 88.0745 143.987 87.6431 143.987 87.2074C143.987 86.7717 144.074 86.3403 144.243 85.9383C144.412 85.5363 144.659 85.1718 144.971 84.8658C145.275 84.5532 145.64 84.3041 146.042 84.1329C146.444 83.9617 146.877 83.8718 147.314 83.8685C147.751 83.8652 148.185 83.9485 148.59 84.1135C148.995 84.2786 149.363 84.5222 149.672 84.8301L150.713 85.8668C151.581 86.7186 152.678 87.3021 153.872 87.547C155.063 87.8204 156.155 88.4139 157.03 89.263L170.885 102.884C171.892 103.878 172.464 105.228 172.478 106.641C172.491 108.053 171.944 109.414 170.957 110.427C169.953 111.425 168.595 111.989 167.177 111.995C165.759 112.002 164.396 111.451 163.383 110.463L149.529 96.842C148.659 95.9778 148.049 94.8879 147.77 93.696C147.512 92.5065 146.899 91.4224 146.011 90.5858Z",
|
|
90
|
+
fill: "#8270DB"
|
|
91
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
92
|
+
opacity: "0.2",
|
|
93
|
+
d: "M147.734 93.5887C147.458 92.4449 146.861 91.4032 146.011 90.5858L144.971 89.549C144.659 89.243 144.412 88.8785 144.243 88.4765C144.074 88.0745 143.987 87.6431 143.987 87.2074C143.987 86.7717 144.074 86.3403 144.243 85.9383C144.412 85.5363 144.659 85.1718 144.971 84.8658C145.275 84.5532 145.64 84.3041 146.042 84.1329C146.444 83.9617 146.877 83.8718 147.314 83.8685C147.752 83.8652 148.185 83.9485 148.59 84.1135C148.995 84.2786 149.363 84.5222 149.672 84.8301L150.713 85.8668C151.539 86.6914 152.586 87.2622 153.728 87.5113C152.888 88.6723 151.964 89.7714 150.965 90.8003C149.956 91.8048 148.876 92.7366 147.734 93.5887Z",
|
|
94
|
+
fill: "#403294"
|
|
95
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
96
|
+
d: "M156.313 67.599C156.268 62.1046 154.591 56.7464 151.493 52.2003C148.395 47.6542 144.014 44.124 138.904 42.0551C133.794 39.9861 128.182 39.4712 122.778 40.5752C117.374 41.6792 112.42 44.3527 108.54 48.2583C105.959 50.8491 103.919 53.924 102.539 57.3052C101.159 60.6864 100.466 64.3067 100.5 67.9565C100.515 71.6054 101.255 75.2154 102.678 78.5778C104.101 81.9403 106.179 84.9888 108.791 87.5473C112.721 91.4036 117.71 94.0141 123.128 95.0494C128.545 96.0846 134.15 95.4982 139.234 93.3642C144.317 91.2302 148.652 87.6442 151.692 83.0587C154.732 78.4732 156.339 73.0937 156.313 67.599Z",
|
|
97
|
+
fill: "#66A3FF"
|
|
98
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
99
|
+
d: "M114.678 51.6186C110.935 54.7774 108.407 59.1306 107.525 63.9371C106.643 68.7435 107.46 73.706 109.838 77.9797C112.216 82.2534 116.008 85.574 120.567 87.3761C125.127 89.1783 130.173 89.3507 134.846 87.8638C139.519 86.377 143.53 83.3229 146.197 79.2215C148.863 75.1202 150.02 70.2251 149.47 65.3697C148.92 60.5144 146.698 55.9989 143.181 52.5921C139.665 49.1853 135.071 47.0979 130.183 46.6851C127.4 46.4461 124.596 46.7591 121.935 47.6059C119.273 48.4527 116.807 49.8165 114.678 51.6186Z",
|
|
100
|
+
fill: "white"
|
|
101
|
+
}), /*#__PURE__*/React.createElement("mask", {
|
|
102
|
+
id: "mask0_1_10772",
|
|
103
|
+
style: {
|
|
104
|
+
maskType: 'alpha'
|
|
105
|
+
},
|
|
106
|
+
maskUnits: "userSpaceOnUse",
|
|
107
|
+
x: "107",
|
|
108
|
+
y: "46",
|
|
109
|
+
width: "43",
|
|
110
|
+
height: "43"
|
|
111
|
+
}, /*#__PURE__*/React.createElement("path", {
|
|
112
|
+
d: "M114.66 51.7782C110.928 54.9501 108.416 59.3122 107.55 64.1217C106.684 68.9312 107.519 73.8908 109.912 78.1561C112.305 82.4214 116.109 85.7287 120.675 87.5149C125.241 89.3011 130.287 89.4558 134.955 87.9526C139.623 86.4494 143.623 83.3813 146.275 79.2706C148.927 75.1599 150.067 70.2608 149.5 65.4074C148.933 60.554 146.695 56.0463 143.166 52.6519C139.638 49.2574 135.037 47.1861 130.148 46.7904C127.363 46.5612 124.561 46.884 121.902 47.7401C119.244 48.5962 116.782 49.9687 114.66 51.7782Z",
|
|
113
|
+
fill: "white"
|
|
114
|
+
})), /*#__PURE__*/React.createElement("g", {
|
|
115
|
+
mask: "url(#mask0_1_10772)"
|
|
116
|
+
}, /*#__PURE__*/React.createElement("rect", {
|
|
117
|
+
x: "-9.11658",
|
|
118
|
+
y: "60.6511",
|
|
119
|
+
width: "152.638",
|
|
120
|
+
height: "10.2857",
|
|
121
|
+
rx: "5.14286",
|
|
122
|
+
transform: "rotate(-0.200699 -9.11658 60.6511)",
|
|
123
|
+
fill: "#C1C7D0",
|
|
124
|
+
fillOpacity: "0.4"
|
|
125
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
126
|
+
d: "M68.3882 50.885L151.465 50.594",
|
|
127
|
+
stroke: "#B7BDC8",
|
|
128
|
+
strokeWidth: "4"
|
|
129
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
130
|
+
x1: "68.4865",
|
|
131
|
+
y1: "78.9508",
|
|
132
|
+
x2: "151.563",
|
|
133
|
+
y2: "78.6598",
|
|
134
|
+
stroke: "#B7BDC8",
|
|
135
|
+
strokeWidth: "4"
|
|
136
|
+
}))), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("clipPath", {
|
|
137
|
+
id: "clip0_1_10772"
|
|
138
|
+
}, /*#__PURE__*/React.createElement("rect", {
|
|
139
|
+
width: "72",
|
|
140
|
+
height: "72",
|
|
141
|
+
fill: "white",
|
|
142
|
+
transform: "translate(100.5 40)"
|
|
143
|
+
}))));
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/** @jsx jsx */
|
|
2
|
+
import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
|
|
3
|
+
import { jsx } from '@emotion/react';
|
|
4
|
+
import { FormattedMessage } from 'react-intl-next';
|
|
5
|
+
import Button from '@atlaskit/button/standard-button';
|
|
6
|
+
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
7
|
+
import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
|
|
8
|
+
import { Box, xcss } from '@atlaskit/primitives';
|
|
9
|
+
import { N40 } from '@atlaskit/theme/colors';
|
|
10
|
+
import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
|
|
11
|
+
import i18nEN from '../../../i18n/en';
|
|
12
|
+
import { getAvailableSites } from '../../../services/getAvailableSites';
|
|
13
|
+
import { NoInstancesView } from '../../common/error-state/no-instances';
|
|
14
|
+
import { InitialStateView } from '../../common/initial-state-view';
|
|
15
|
+
import { BasicSearchInput } from '../../common/modal/basic-search-input';
|
|
16
|
+
import { SiteSelector } from '../../common/modal/site-selector';
|
|
17
|
+
import { scrollableContainerShadowsCssComponents } from '../../issue-like-table';
|
|
18
|
+
import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
|
|
19
|
+
import { confluenceSearchModalMessages } from './messages';
|
|
20
|
+
const contentContainerStyles = xcss({
|
|
21
|
+
display: 'grid',
|
|
22
|
+
maxHeight: '420px',
|
|
23
|
+
overflow: 'auto',
|
|
24
|
+
borderBottom: `2px solid ${`var(--ds-background-accent-gray-subtler, ${N40})`}`,
|
|
25
|
+
backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
|
|
26
|
+
backgroundPosition: scrollableContainerShadowsCssComponents.backgroundPosition,
|
|
27
|
+
backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
|
|
28
|
+
backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
|
|
29
|
+
backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment
|
|
30
|
+
});
|
|
31
|
+
export const ConfluenceSearchConfigModal = props => {
|
|
32
|
+
const {
|
|
33
|
+
parameters: initialParameters,
|
|
34
|
+
onCancel
|
|
35
|
+
} = props;
|
|
36
|
+
const [availableSites, setAvailableSites] = useState(undefined);
|
|
37
|
+
const [cloudId, setCloudId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId);
|
|
38
|
+
const [searchTerm, setSearchTerm] = useState('');
|
|
39
|
+
const onSiteSelection = useCallback(site => {
|
|
40
|
+
setCloudId(site.cloudId);
|
|
41
|
+
}, [setCloudId]);
|
|
42
|
+
const hasNoConfluenceSites = availableSites && availableSites.length === 0;
|
|
43
|
+
const selectedConfluenceSite = useMemo(() => {
|
|
44
|
+
if (cloudId) {
|
|
45
|
+
return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(confluenceSite => confluenceSite.cloudId === cloudId);
|
|
46
|
+
} else {
|
|
47
|
+
let currentlyLoggedInSiteUrl;
|
|
48
|
+
if (typeof window.location !== 'undefined') {
|
|
49
|
+
currentlyLoggedInSiteUrl = window.location.origin;
|
|
50
|
+
}
|
|
51
|
+
return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(confluenceSite => confluenceSite.url === currentlyLoggedInSiteUrl)) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
|
|
52
|
+
}
|
|
53
|
+
}, [availableSites, cloudId]);
|
|
54
|
+
const handleSearchChange = useCallback(e => {
|
|
55
|
+
const rawSearch = e.currentTarget.value;
|
|
56
|
+
setSearchTerm(rawSearch);
|
|
57
|
+
}, [setSearchTerm]);
|
|
58
|
+
useEffect(() => {
|
|
59
|
+
const fetchSiteDisplayNames = async () => {
|
|
60
|
+
const confluenceSites = await getAvailableSites('confluence');
|
|
61
|
+
const sortedAvailableSites = [...confluenceSites].sort((a, b) => a.displayName.localeCompare(b.displayName));
|
|
62
|
+
setAvailableSites(sortedAvailableSites);
|
|
63
|
+
};
|
|
64
|
+
void fetchSiteDisplayNames();
|
|
65
|
+
}, []);
|
|
66
|
+
const siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
|
|
67
|
+
return jsx(IntlMessagesProvider, {
|
|
68
|
+
defaultMessages: i18nEN,
|
|
69
|
+
loaderFn: fetchMessagesForLocale
|
|
70
|
+
}, jsx(Modal, {
|
|
71
|
+
testId: "confluence-search-datasource-modal",
|
|
72
|
+
onClose: onCancel,
|
|
73
|
+
width: "calc(100% - 80px)",
|
|
74
|
+
shouldScrollInViewport: true
|
|
75
|
+
}, jsx(ModalHeader, null, jsx(ModalTitle, null, jsx(SiteSelector, {
|
|
76
|
+
availableSites: availableSites,
|
|
77
|
+
onSiteSelection: onSiteSelection,
|
|
78
|
+
selectedSite: selectedConfluenceSite,
|
|
79
|
+
testId: "confluence-search-datasource-modal--site-selector",
|
|
80
|
+
label: siteSelectorLabel
|
|
81
|
+
}))), jsx(ModalBody, null, !hasNoConfluenceSites ? jsx(Fragment, null, jsx(BasicSearchInput, {
|
|
82
|
+
testId: "confluence-search-datasource-modal",
|
|
83
|
+
isSearching: status === 'loading',
|
|
84
|
+
onChange: handleSearchChange,
|
|
85
|
+
onSearch: () => {},
|
|
86
|
+
searchTerm: searchTerm,
|
|
87
|
+
placeholder: confluenceSearchModalMessages.searchLabel,
|
|
88
|
+
fullWidth: true
|
|
89
|
+
}), jsx(Box, {
|
|
90
|
+
xcss: contentContainerStyles
|
|
91
|
+
}, jsx(InitialStateView, {
|
|
92
|
+
icon: jsx(ConfluenceSearchInitialStateSVG, null),
|
|
93
|
+
title: confluenceSearchModalMessages.initialViewSearchTitle,
|
|
94
|
+
description: confluenceSearchModalMessages.initialViewSearchDescription
|
|
95
|
+
}))) : jsx(NoInstancesView, {
|
|
96
|
+
title: confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
|
|
97
|
+
description: confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,
|
|
98
|
+
testId: 'no-confluence-instances-content'
|
|
99
|
+
})), jsx(ModalFooter, null, jsx(Button, {
|
|
100
|
+
appearance: "default",
|
|
101
|
+
onClick: onCancel
|
|
102
|
+
}, jsx(FormattedMessage, confluenceSearchModalMessages.cancelButtonText)), !hasNoConfluenceSites && jsx(Button, {
|
|
103
|
+
appearance: "primary",
|
|
104
|
+
onClick: () => {},
|
|
105
|
+
isDisabled: true,
|
|
106
|
+
testId: "confluence-search-datasource-modal--insert-button"
|
|
107
|
+
}, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
|
|
108
|
+
};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { defineMessages } from 'react-intl-next';
|
|
2
|
+
export const confluenceSearchModalMessages = defineMessages({
|
|
3
|
+
cancelButtonText: {
|
|
4
|
+
id: 'linkDataSource.confluence-search.configmodal.cancelButtonText',
|
|
5
|
+
description: 'Button text to close the modal with no changes being made',
|
|
6
|
+
defaultMessage: 'Cancel'
|
|
7
|
+
},
|
|
8
|
+
insertResultsButtonText: {
|
|
9
|
+
id: 'linkDataSource.confluence-search.configmodal.insertResultsButtonText',
|
|
10
|
+
description: 'Button text to insert the displayed content',
|
|
11
|
+
defaultMessage: 'Insert results'
|
|
12
|
+
},
|
|
13
|
+
searchLabel: {
|
|
14
|
+
id: 'linkDataSource.confluence-search.configmodal.searchLabel',
|
|
15
|
+
description: 'Placeholder text for the search input box',
|
|
16
|
+
defaultMessage: 'Enter keywords to find pages, attachments, and more'
|
|
17
|
+
},
|
|
18
|
+
insertIssuesTitle: {
|
|
19
|
+
id: 'linkDataSource.confluence-search.configmodal.insertConfluenceTitle',
|
|
20
|
+
description: 'Title for the Confluence Search Datasource Confluence Search config modal',
|
|
21
|
+
defaultMessage: 'Insert Confluence list'
|
|
22
|
+
},
|
|
23
|
+
insertIssuesTitleManySites: {
|
|
24
|
+
id: 'linkDataSource.confluence-search.configmodal.insertConfluenceTitleManySites',
|
|
25
|
+
description: 'Title for the Confluence Search config modal when a user has to select a site to insert issues from',
|
|
26
|
+
defaultMessage: 'Insert Confluence list from'
|
|
27
|
+
},
|
|
28
|
+
initialViewSearchTitle: {
|
|
29
|
+
id: 'linkDataSource.modal-initial-state.confluenceSearchTitle',
|
|
30
|
+
description: 'The initial modal search state title explains to user how to get information',
|
|
31
|
+
defaultMessage: 'Search for Confluence pages'
|
|
32
|
+
},
|
|
33
|
+
initialViewSearchDescription: {
|
|
34
|
+
id: 'linkDataSource.modal-initial-state.searchDescription-confluence',
|
|
35
|
+
description: 'The initial modal search state helper message for confluence search displayed under the search title',
|
|
36
|
+
defaultMessage: 'Search by keyword for pages to insert.'
|
|
37
|
+
},
|
|
38
|
+
noAccessToConfluenceSitesTitle: {
|
|
39
|
+
id: 'linkDataSource.confluence-search.no.confluence.sites.access.title',
|
|
40
|
+
description: 'Title that shows in the modal when user has no access to any Confluence sites',
|
|
41
|
+
defaultMessage: "You don't have access to any Confluence sites"
|
|
42
|
+
},
|
|
43
|
+
noAccessToConfluenceSitesDescription: {
|
|
44
|
+
id: 'linkDataSource.confluence-search.no.confluence.sites.access.description',
|
|
45
|
+
description: 'Description that shows in the modal when user has no access to any Confluence sites',
|
|
46
|
+
defaultMessage: 'To request access, contact your admin.'
|
|
47
|
+
}
|
|
48
|
+
});
|
|
@@ -7,9 +7,8 @@ import { columnPickerMessages } from './messages';
|
|
|
7
7
|
export const SELECT_ITEMS_MAXIMUM_THRESHOLD = 200;
|
|
8
8
|
const messageStyles = css({
|
|
9
9
|
color: "var(--ds-text-subtle, #44546F)",
|
|
10
|
-
|
|
11
|
-
fontWeight: "var(--ds-font-weight-regular, 400)"
|
|
12
|
-
lineHeight: "var(--ds-font-lineHeight-100, 14px)"
|
|
10
|
+
font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
|
|
11
|
+
fontWeight: "var(--ds-font-weight-regular, 400)"
|
|
13
12
|
});
|
|
14
13
|
export const ConcatenatedMenuList = ({
|
|
15
14
|
children,
|
|
@@ -32,7 +32,7 @@ const tableStyles = css({
|
|
|
32
32
|
background: "var(--ds-surface, #FFF)",
|
|
33
33
|
borderCollapse: 'separate',
|
|
34
34
|
borderSpacing: 0,
|
|
35
|
-
|
|
35
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
|
|
36
36
|
maxWidth
|
|
37
37
|
});
|
|
38
38
|
export const DragColumnPreview = ({
|
|
@@ -60,7 +60,7 @@ const truncateStyles = css({
|
|
|
60
60
|
});
|
|
61
61
|
const TableCell = styled.td({
|
|
62
62
|
[`${withTablePluginBodyPrefix()}`]: {
|
|
63
|
-
|
|
63
|
+
font: fieldTextFontSize,
|
|
64
64
|
padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"}`,
|
|
65
65
|
border: 0,
|
|
66
66
|
minWidth: 'auto',
|
|
@@ -223,7 +223,7 @@ const noDefaultBorderStyles = css({
|
|
|
223
223
|
borderBottom: 0
|
|
224
224
|
});
|
|
225
225
|
const headerStyles = css({
|
|
226
|
-
|
|
226
|
+
font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
|
|
227
227
|
fontWeight: "var(--ds-font-weight-medium, 500)"
|
|
228
228
|
});
|
|
229
229
|
const headingHoverEffectStyles = css({
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import styled from '@emotion/styled';
|
|
2
2
|
import { N40 } from '@atlaskit/theme/colors';
|
|
3
3
|
export const ScrollableContainerHeight = 590;
|
|
4
|
-
export const fieldTextFontSize = "var(--ds-font-
|
|
4
|
+
export const fieldTextFontSize = "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)";
|
|
5
5
|
export const Table = styled.table({
|
|
6
6
|
width: '100%'
|
|
7
7
|
});
|
|
8
|
-
const lineHeight =
|
|
8
|
+
const lineHeight = '24px';
|
|
9
9
|
const verticalPadding = "var(--ds-space-025, 2px)";
|
|
10
10
|
|
|
11
11
|
/**
|
|
@@ -6,7 +6,7 @@ const LazyJiraIssuesConfigModal = /*#__PURE__*/lazy(() => import( /* webpackChun
|
|
|
6
6
|
const JiraIssuesConfigModalWithWrappers = props => {
|
|
7
7
|
return /*#__PURE__*/React.createElement(Suspense, {
|
|
8
8
|
fallback: /*#__PURE__*/React.createElement("div", {
|
|
9
|
-
"data-testid": 'jira-
|
|
9
|
+
"data-testid": 'jira-datasource-table-suspense'
|
|
10
10
|
})
|
|
11
11
|
}, /*#__PURE__*/React.createElement(LazyJiraIssuesConfigModal, props));
|
|
12
12
|
};
|
|
@@ -6,10 +6,11 @@ import { useDebouncedCallback } from 'use-debounce';
|
|
|
6
6
|
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
7
7
|
import { Flex, xcss } from '@atlaskit/primitives';
|
|
8
8
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
9
|
+
import { BasicSearchInput } from '../../common/modal/basic-search-input';
|
|
10
|
+
import { basicSearchInputMessages } from '../../common/modal/basic-search-input/messages';
|
|
9
11
|
import { BasicFilters } from '../basic-filters';
|
|
10
12
|
import { useHydrateJqlQuery } from '../basic-filters/hooks/useHydrateJqlQuery';
|
|
11
13
|
import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
|
|
12
|
-
import { BasicSearchInput } from '../basic-search-input';
|
|
13
14
|
import { JiraJQLEditor } from '../jql-editor';
|
|
14
15
|
import { ModeSwitcher } from '../mode-switcher';
|
|
15
16
|
import { buildJQL } from './buildJQL';
|
|
@@ -192,7 +193,9 @@ export const JiraSearchContainer = props => {
|
|
|
192
193
|
isSearching: isSearching,
|
|
193
194
|
onChange: handleBasicSearchChange,
|
|
194
195
|
onSearch: handleSearch,
|
|
195
|
-
searchTerm: basicSearchTerm
|
|
196
|
+
searchTerm: basicSearchTerm,
|
|
197
|
+
placeholder: basicSearchInputMessages.basicTextSearchLabel,
|
|
198
|
+
testId: "jira-datasource-modal"
|
|
196
199
|
}), showBasicFilters && jsx(BasicFilters, {
|
|
197
200
|
jql: searchBarJql,
|
|
198
201
|
site: site,
|