@atlaskit/link-datasource 1.26.2 → 1.27.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 +16 -0
- package/dist/cjs/ui/common/modal/basic-search-input/index.js +9 -18
- package/dist/cjs/ui/common/modal/count-view-smart-link/index.js +40 -0
- package/dist/cjs/ui/{jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js → common/modal/display-view-dropdown/display-view-drop-down.js} +29 -13
- package/dist/cjs/ui/common/modal/display-view-dropdown/messages.js +58 -0
- package/dist/cjs/ui/common/modal/popup-select/index.js +217 -0
- package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/errorMessage.js +3 -3
- package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/index.js +6 -5
- package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/messages.js +5 -0
- package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/noOptionsMessage.js +3 -3
- package/dist/cjs/ui/common/modal/popup-select/menu-list/showMoreButton.js +36 -0
- package/dist/cjs/ui/common/modal/popup-select/messages.js +19 -0
- package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.js +12 -13
- package/dist/cjs/ui/common/modal/popup-select/types.js +5 -0
- package/dist/cjs/ui/confluence-search-modal/basic-filters/index.js +22 -0
- package/dist/cjs/ui/confluence-search-modal/confluence-search-container/index.js +18 -3
- package/dist/cjs/ui/confluence-search-modal/modal/index.js +114 -45
- package/dist/cjs/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js +27 -163
- package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js +0 -15
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +2 -1
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +8 -23
- package/dist/cjs/ui/jira-issues-modal/modal/messages.js +0 -20
- package/dist/es2019/ui/common/modal/basic-search-input/index.js +2 -10
- package/dist/es2019/ui/common/modal/count-view-smart-link/index.js +30 -0
- package/dist/es2019/ui/common/modal/display-view-dropdown/display-view-drop-down.js +71 -0
- package/dist/es2019/ui/common/modal/display-view-dropdown/messages.js +52 -0
- package/dist/es2019/ui/common/modal/popup-select/index.js +170 -0
- package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/errorMessage.js +3 -3
- package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/index.js +6 -5
- package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/messages.js +5 -0
- package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/noOptionsMessage.js +3 -3
- package/dist/es2019/ui/common/modal/popup-select/menu-list/showMoreButton.js +29 -0
- package/dist/es2019/ui/common/modal/popup-select/messages.js +13 -0
- package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.js +10 -11
- package/dist/es2019/ui/common/modal/popup-select/types.js +1 -0
- package/dist/es2019/ui/confluence-search-modal/basic-filters/index.js +13 -0
- package/dist/es2019/ui/confluence-search-modal/confluence-search-container/index.js +19 -4
- package/dist/es2019/ui/confluence-search-modal/modal/index.js +98 -31
- package/dist/es2019/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js +25 -145
- package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js +0 -15
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +2 -1
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +9 -24
- package/dist/es2019/ui/jira-issues-modal/modal/messages.js +0 -20
- package/dist/esm/ui/common/modal/basic-search-input/index.js +2 -10
- package/dist/esm/ui/common/modal/count-view-smart-link/index.js +32 -0
- package/dist/esm/ui/common/modal/display-view-dropdown/display-view-drop-down.js +73 -0
- package/dist/esm/ui/common/modal/display-view-dropdown/messages.js +52 -0
- package/dist/esm/ui/common/modal/popup-select/index.js +207 -0
- package/dist/esm/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/errorMessage.js +3 -3
- package/dist/esm/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/index.js +6 -5
- package/dist/esm/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/messages.js +5 -0
- package/dist/esm/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/noOptionsMessage.js +3 -3
- package/dist/esm/ui/common/modal/popup-select/menu-list/showMoreButton.js +26 -0
- package/dist/esm/ui/common/modal/popup-select/messages.js +13 -0
- package/dist/esm/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.js +12 -13
- package/dist/esm/ui/common/modal/popup-select/types.js +1 -0
- package/dist/esm/ui/confluence-search-modal/basic-filters/index.js +15 -0
- package/dist/esm/ui/confluence-search-modal/confluence-search-container/index.js +19 -4
- package/dist/esm/ui/confluence-search-modal/modal/index.js +114 -45
- package/dist/esm/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js +27 -163
- package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js +0 -15
- package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +2 -1
- package/dist/esm/ui/jira-issues-modal/modal/index.js +9 -24
- package/dist/esm/ui/jira-issues-modal/modal/messages.js +0 -20
- package/dist/types/analytics/generated/analytics.types.d.ts +6 -6
- package/dist/types/common/types.d.ts +5 -5
- package/dist/types/ui/common/modal/basic-search-input/index.d.ts +1 -0
- package/dist/types/ui/common/modal/count-view-smart-link/index.d.ts +9 -0
- package/dist/types/ui/common/modal/display-view-dropdown/display-view-drop-down.d.ts +8 -0
- package/dist/types/ui/common/modal/display-view-dropdown/messages.d.ts +42 -0
- package/dist/types/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/control.d.ts +1 -1
- package/dist/{types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select → types/ui/common/modal/popup-select}/dropdownIndicator.d.ts +1 -1
- package/dist/types/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/formatOptionLabel.d.ts +1 -1
- package/dist/types/ui/common/modal/popup-select/index.d.ts +21 -0
- package/dist/types/ui/common/modal/popup-select/menu-list/errorMessage.d.ts +6 -0
- package/dist/types/ui/common/modal/popup-select/menu-list/index.d.ts +15 -0
- package/dist/types/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/messages.d.ts +5 -0
- package/dist/types/ui/common/modal/popup-select/menu-list/noOptionsMessage.d.ts +5 -0
- package/dist/{types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select → types/ui/common/modal/popup-select/menu-list}/showMoreButton.d.ts +2 -1
- package/dist/types/ui/common/modal/popup-select/messages.d.ts +12 -0
- package/dist/types/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.d.ts +3 -2
- package/dist/types/ui/common/modal/popup-select/types.d.ts +22 -0
- package/dist/types/ui/confluence-search-modal/basic-filters/index.d.ts +5 -0
- package/dist/types/ui/confluence-search-modal/modal/messages.d.ts +5 -0
- package/dist/types/ui/confluence-search-modal/types.d.ts +2 -2
- package/dist/types/ui/jira-issues-modal/basic-filters/types.d.ts +0 -2
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.d.ts +0 -15
- package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +0 -20
- package/dist/types-ts4.5/analytics/generated/analytics.types.d.ts +6 -6
- package/dist/types-ts4.5/common/types.d.ts +5 -5
- package/dist/types-ts4.5/ui/common/modal/basic-search-input/index.d.ts +1 -0
- package/dist/types-ts4.5/ui/common/modal/count-view-smart-link/index.d.ts +9 -0
- package/dist/types-ts4.5/ui/common/modal/display-view-dropdown/display-view-drop-down.d.ts +8 -0
- package/dist/types-ts4.5/ui/common/modal/display-view-dropdown/messages.d.ts +42 -0
- package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/control.d.ts +1 -1
- package/dist/{types/ui/jira-issues-modal/basic-filters/ui/async-popup-select → types-ts4.5/ui/common/modal/popup-select}/dropdownIndicator.d.ts +1 -1
- package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/formatOptionLabel.d.ts +1 -1
- package/dist/types-ts4.5/ui/common/modal/popup-select/index.d.ts +21 -0
- package/dist/types-ts4.5/ui/common/modal/popup-select/menu-list/errorMessage.d.ts +6 -0
- package/dist/types-ts4.5/ui/common/modal/popup-select/menu-list/index.d.ts +15 -0
- package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/messages.d.ts +5 -0
- package/dist/types-ts4.5/ui/common/modal/popup-select/menu-list/noOptionsMessage.d.ts +5 -0
- package/dist/{types/ui/jira-issues-modal/basic-filters/ui/async-popup-select → types-ts4.5/ui/common/modal/popup-select/menu-list}/showMoreButton.d.ts +2 -1
- package/dist/types-ts4.5/ui/common/modal/popup-select/messages.d.ts +12 -0
- package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.d.ts +3 -2
- package/dist/types-ts4.5/ui/common/modal/popup-select/types.d.ts +22 -0
- package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/index.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/confluence-search-modal/types.d.ts +2 -2
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/types.d.ts +0 -2
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.d.ts +0 -15
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +0 -20
- package/examples-helpers/mockSmartLinkData.ts +49 -0
- package/examples-helpers/smartLinkCustomClient.ts +8 -3
- package/package.json +6 -3
- package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js +0 -22
- package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js +0 -17
- package/dist/es2019/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js +0 -55
- package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js +0 -15
- package/dist/esm/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js +0 -57
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/errorMessage.d.ts +0 -8
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/index.d.ts +0 -5
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/noOptionsMessage.d.ts +0 -6
- package/dist/types/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts +0 -8
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/menu-list/errorMessage.d.ts +0 -8
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/menu-list/index.d.ts +0 -5
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/menu-list/noOptionsMessage.d.ts +0 -6
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts +0 -8
- /package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/control.js +0 -0
- /package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/dropdownIndicator.js +0 -0
- /package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/footer.js +0 -0
- /package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/formatOptionLabel.js +0 -0
- /package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/loadingMessage.js +0 -0
- /package/dist/cjs/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/selectMessage.js +0 -0
- /package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/control.js +0 -0
- /package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/dropdownIndicator.js +0 -0
- /package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/footer.js +0 -0
- /package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/formatOptionLabel.js +0 -0
- /package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/loadingMessage.js +0 -0
- /package/dist/es2019/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/selectMessage.js +0 -0
- /package/dist/esm/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/control.js +0 -0
- /package/dist/esm/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/dropdownIndicator.js +0 -0
- /package/dist/esm/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/footer.js +0 -0
- /package/dist/esm/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/formatOptionLabel.js +0 -0
- /package/dist/esm/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/loadingMessage.js +0 -0
- /package/dist/esm/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/selectMessage.js +0 -0
- /package/dist/types/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/footer.d.ts +0 -0
- /package/dist/types/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/loadingMessage.d.ts +0 -0
- /package/dist/types/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/selectMessage.d.ts +0 -0
- /package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/footer.d.ts +0 -0
- /package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/loadingMessage.d.ts +0 -0
- /package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui → common/modal/popup-select}/menu-list/selectMessage.d.ts +0 -0
|
@@ -1,20 +1,10 @@
|
|
|
1
|
-
import _extends from "@babel/runtime/helpers/extends";
|
|
2
1
|
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
3
2
|
import isEqual from 'lodash/isEqual';
|
|
4
3
|
import { useIntl } from 'react-intl-next';
|
|
5
4
|
import { useDebouncedCallback } from 'use-debounce';
|
|
6
|
-
import {
|
|
7
|
-
import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
|
|
5
|
+
import { FilterPopupSelect } from '../../../../common/modal/popup-select';
|
|
8
6
|
import { useFilterOptions } from '../../hooks/useFilterOptions';
|
|
9
|
-
import CustomMenuList from '../menu-list';
|
|
10
|
-
import CustomControl from './control';
|
|
11
|
-
import CustomDropdownIndicator from './dropdownIndicator';
|
|
12
|
-
import PopupFooter from './footer';
|
|
13
|
-
import formatOptionLabel from './formatOptionLabel';
|
|
14
7
|
import { asyncPopupSelectMessages } from './messages';
|
|
15
|
-
import PopupTrigger from './trigger';
|
|
16
|
-
// Needed to disable filtering from react-select
|
|
17
|
-
const noFilterOptions = () => true;
|
|
18
8
|
export const SEARCH_DEBOUNCE_MS = 350;
|
|
19
9
|
const AsyncPopupSelect = ({
|
|
20
10
|
filterType,
|
|
@@ -27,18 +17,12 @@ const AsyncPopupSelect = ({
|
|
|
27
17
|
const {
|
|
28
18
|
formatMessage
|
|
29
19
|
} = useIntl();
|
|
30
|
-
const {
|
|
31
|
-
fireEvent
|
|
32
|
-
} = useDatasourceAnalyticsEvents();
|
|
33
20
|
const [searchTerm, setSearchTerm] = useState('');
|
|
34
21
|
const [selectedOptions, setSelectedOptions] = useState(selection);
|
|
35
|
-
const [sortedOptions, setSortedOptions] = useState([]);
|
|
36
22
|
const {
|
|
37
23
|
cloudId
|
|
38
24
|
} = site || {};
|
|
39
25
|
const currentSiteCloudId = useRef(cloudId || '');
|
|
40
|
-
const sortPaginatedResults = useRef(false); // this is to track pagination for sorting purpose
|
|
41
|
-
|
|
42
26
|
const {
|
|
43
27
|
filterOptions,
|
|
44
28
|
fetchFilterOptions,
|
|
@@ -56,103 +40,32 @@ const AsyncPopupSelect = ({
|
|
|
56
40
|
searchString
|
|
57
41
|
});
|
|
58
42
|
}, SEARCH_DEBOUNCE_MS);
|
|
59
|
-
const handleInputChange = useCallback(async
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
}
|
|
64
|
-
}, [handleDebouncedFetchFilterOptions, searchTerm]);
|
|
43
|
+
const handleInputChange = useCallback(async newSearchTerm => {
|
|
44
|
+
setSearchTerm(newSearchTerm);
|
|
45
|
+
handleDebouncedFetchFilterOptions(newSearchTerm);
|
|
46
|
+
}, [handleDebouncedFetchFilterOptions]);
|
|
65
47
|
const handleOptionSelection = useCallback(newValue => {
|
|
66
48
|
onSelectionChange(filterType, newValue);
|
|
67
49
|
}, [filterType, onSelectionChange]);
|
|
68
|
-
const sortOptionsOnPopupOpen = useCallback(() => {
|
|
69
|
-
if (selectedOptions.length === 0) {
|
|
70
|
-
return setSortedOptions(filterOptions);
|
|
71
|
-
}
|
|
72
|
-
const nonSelectedOptions = filterOptions.filter(option => !selectedOptions.find(selectedOption => selectedOption.value === option.value));
|
|
73
|
-
const newOptions = [...selectedOptions, ...nonSelectedOptions];
|
|
74
|
-
if (!isEqual(newOptions, sortedOptions)) {
|
|
75
|
-
setSortedOptions(newOptions);
|
|
76
|
-
}
|
|
77
|
-
}, [selectedOptions, filterOptions, sortedOptions]);
|
|
78
|
-
const sortOptionsOnResolve = useCallback(() => {
|
|
79
|
-
// when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
|
|
80
|
-
if (searchTerm) {
|
|
81
|
-
sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
|
|
82
|
-
return setSortedOptions(filterOptions);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
// sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
|
|
86
|
-
if (sortedOptions.length === 0) {
|
|
87
|
-
return sortOptionsOnPopupOpen();
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
// this block handles the pagination, where on pagination, we will just append newOptions to the current list
|
|
91
|
-
if (sortPaginatedResults.current) {
|
|
92
|
-
const newOptions = filterOptions.filter(option => !sortedOptions.find(sortedOption => sortedOption.value === option.value));
|
|
93
|
-
if (newOptions.length > 0) {
|
|
94
|
-
setSortedOptions([...sortedOptions, ...newOptions]);
|
|
95
|
-
}
|
|
96
|
-
sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
|
|
97
|
-
return;
|
|
98
|
-
}
|
|
99
|
-
sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
|
|
100
|
-
sortOptionsOnPopupOpen();
|
|
101
|
-
}, [filterOptions, searchTerm, sortOptionsOnPopupOpen, sortedOptions]);
|
|
102
50
|
const handleShowMore = useCallback(() => {
|
|
103
51
|
if (pageCursor) {
|
|
104
|
-
sortPaginatedResults.current = true;
|
|
105
52
|
fetchFilterOptions({
|
|
106
53
|
pageCursor,
|
|
107
54
|
searchString: searchTerm
|
|
108
55
|
});
|
|
109
|
-
fireEvent('ui.button.clicked.basicSearchDropdown', {
|
|
110
|
-
filterType,
|
|
111
|
-
type: 'showMore'
|
|
112
|
-
});
|
|
113
56
|
}
|
|
114
|
-
}, [fetchFilterOptions,
|
|
57
|
+
}, [fetchFilterOptions, pageCursor, searchTerm]);
|
|
115
58
|
const handleMenuOpen = useCallback(() => {
|
|
116
59
|
if (status === 'empty' || status === 'rejected') {
|
|
117
60
|
// if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown
|
|
118
61
|
fetchFilterOptions({
|
|
119
62
|
searchString: searchTerm
|
|
120
63
|
});
|
|
121
|
-
} else if (status === 'resolved') {
|
|
122
|
-
sortOptionsOnPopupOpen();
|
|
123
64
|
}
|
|
124
|
-
|
|
125
|
-
filterType,
|
|
126
|
-
selectionCount: selectedOptions.length
|
|
127
|
-
});
|
|
128
|
-
}, [fetchFilterOptions, filterType, fireEvent, searchTerm, selectedOptions.length, sortOptionsOnPopupOpen, status]);
|
|
129
|
-
const handleMenuClose = useCallback(() => {
|
|
130
|
-
/**
|
|
131
|
-
* Clearing the search is to ensure that the sortOptionsOnPopupOpen logic does not mess up.
|
|
132
|
-
* Without this, when the user opens, sortOptionsOnPopupOpen will inject the selected options to the list and the list count and values will be off
|
|
133
|
-
*/
|
|
134
|
-
if (searchTerm) {
|
|
135
|
-
handleInputChange('', {
|
|
136
|
-
action: 'input-change',
|
|
137
|
-
prevInputValue: searchTerm
|
|
138
|
-
});
|
|
139
|
-
}
|
|
140
|
-
fireEvent('ui.dropdown.closed.basicSearchDropdown', {
|
|
141
|
-
filterType,
|
|
142
|
-
selectionCount: selectedOptions.length
|
|
143
|
-
});
|
|
144
|
-
}, [filterType, fireEvent, handleInputChange, searchTerm, selectedOptions.length]);
|
|
145
|
-
useEffect(() => {
|
|
146
|
-
if (status === 'resolved') {
|
|
147
|
-
sortOptionsOnResolve();
|
|
148
|
-
}
|
|
149
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
150
|
-
}, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
|
|
151
|
-
|
|
65
|
+
}, [fetchFilterOptions, searchTerm, status]);
|
|
152
66
|
useEffect(() => {
|
|
153
67
|
if (cloudId && currentSiteCloudId.current !== cloudId) {
|
|
154
68
|
currentSiteCloudId.current = cloudId;
|
|
155
|
-
setSortedOptions([]);
|
|
156
69
|
setSearchTerm('');
|
|
157
70
|
resetHook();
|
|
158
71
|
}
|
|
@@ -167,29 +80,27 @@ const AsyncPopupSelect = ({
|
|
|
167
80
|
const isLoading = status === 'loading' || status === 'empty';
|
|
168
81
|
const isLoadingMore = status === 'loadingMore';
|
|
169
82
|
const isEmpty = status === 'resolved' && filterOptionsLength === 0;
|
|
170
|
-
const popupSelectOptions = isLoading || isError ? [] :
|
|
83
|
+
const popupSelectOptions = isLoading || isError ? [] : filterOptions; // if not set to [], then on loading, no loading UI will be shown
|
|
171
84
|
const areAllResultsLoaded = filterOptionsLength === totalCount;
|
|
172
85
|
const shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptionsLength > 0; // footer should not disappear when there is an inline spinner for loading more data
|
|
173
86
|
const shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
isLoading: isLoading,
|
|
190
|
-
placeholder: formatMessage(asyncPopupSelectMessages.selectPlaceholder),
|
|
87
|
+
const triggerButtonLabel = formatMessage(asyncPopupSelectMessages[`${filterType}Label`]);
|
|
88
|
+
return /*#__PURE__*/React.createElement(FilterPopupSelect, {
|
|
89
|
+
filterName: `jlol-basic-filter-${filterType}`,
|
|
90
|
+
status: status,
|
|
91
|
+
showLoading: isLoading,
|
|
92
|
+
showHydrating: isJQLHydrating,
|
|
93
|
+
isDisabled: isDisabled,
|
|
94
|
+
totalCount: totalCount,
|
|
95
|
+
shouldShowFooter: shouldShowFooter,
|
|
96
|
+
selectedOptions: selectedOptions,
|
|
97
|
+
options: popupSelectOptions,
|
|
98
|
+
buttonLabel: triggerButtonLabel,
|
|
99
|
+
onInputChange: handleInputChange,
|
|
100
|
+
onSelectionChange: handleOptionSelection,
|
|
101
|
+
onMenuOpen: handleMenuOpen,
|
|
191
102
|
menuListProps: {
|
|
192
|
-
filterType,
|
|
103
|
+
filterName: filterType,
|
|
193
104
|
isError,
|
|
194
105
|
isEmpty,
|
|
195
106
|
isLoading,
|
|
@@ -197,38 +108,7 @@ const AsyncPopupSelect = ({
|
|
|
197
108
|
handleShowMore,
|
|
198
109
|
errors,
|
|
199
110
|
showMore: shouldDisplayShowMoreButton
|
|
200
|
-
}
|
|
201
|
-
components: {
|
|
202
|
-
Option: CheckboxOption,
|
|
203
|
-
Control: CustomControl,
|
|
204
|
-
MenuList: CustomMenuList,
|
|
205
|
-
DropdownIndicator: CustomDropdownIndicator,
|
|
206
|
-
LoadingIndicator: undefined,
|
|
207
|
-
// disables the three ... indicator in the searchbox when picker is loading
|
|
208
|
-
IndicatorSeparator: undefined // disables the | separator between search input and icon
|
|
209
|
-
},
|
|
210
|
-
options: popupSelectOptions,
|
|
211
|
-
value: selectedOptions,
|
|
212
|
-
filterOption: noFilterOptions,
|
|
213
|
-
formatOptionLabel: formatOptionLabel,
|
|
214
|
-
onChange: handleOptionSelection,
|
|
215
|
-
onInputChange: handleInputChange,
|
|
216
|
-
onOpen: handleMenuOpen,
|
|
217
|
-
onClose: handleMenuClose,
|
|
218
|
-
target: ({
|
|
219
|
-
isOpen,
|
|
220
|
-
...triggerProps
|
|
221
|
-
}) => /*#__PURE__*/React.createElement(PopupTrigger, _extends({}, triggerProps, {
|
|
222
|
-
filterType: filterType,
|
|
223
|
-
selectedOptions: selectedOptions,
|
|
224
|
-
isSelected: isOpen,
|
|
225
|
-
isDisabled: isDisabled,
|
|
226
|
-
isLoading: isJQLHydrating
|
|
227
|
-
})),
|
|
228
|
-
footer: shouldShowFooter && /*#__PURE__*/React.createElement(PopupFooter, {
|
|
229
|
-
currentDisplayCount: popupSelectOptions.length,
|
|
230
|
-
totalCount: totalCount
|
|
231
|
-
})
|
|
111
|
+
}
|
|
232
112
|
});
|
|
233
113
|
};
|
|
234
114
|
export default AsyncPopupSelect;
|
|
@@ -1,15 +1,5 @@
|
|
|
1
1
|
import { defineMessages } from 'react-intl-next';
|
|
2
2
|
export const asyncPopupSelectMessages = defineMessages({
|
|
3
|
-
selectPlaceholder: {
|
|
4
|
-
id: 'linkDataSource.basic-filter.dropdown.select.placeholder',
|
|
5
|
-
description: 'Placeholder text to be displayed for the search input box.',
|
|
6
|
-
defaultMessage: 'Search'
|
|
7
|
-
},
|
|
8
|
-
paginationDetails: {
|
|
9
|
-
id: 'linkDataSource.basic-filter.footer.pagination-details',
|
|
10
|
-
description: 'Text to indicate page count and total count information.',
|
|
11
|
-
defaultMessage: '{currentDisplayCount} of {totalCount}'
|
|
12
|
-
},
|
|
13
3
|
projectLabel: {
|
|
14
4
|
id: 'linkDataSource.basic-filter.project.label',
|
|
15
5
|
description: 'Label to be displayed for project filter dropdown button.',
|
|
@@ -29,10 +19,5 @@ export const asyncPopupSelectMessages = defineMessages({
|
|
|
29
19
|
id: 'linkDataSource.basic-filter.assignee.label',
|
|
30
20
|
description: 'Label to be displayed for assignee filter dropdown button.',
|
|
31
21
|
defaultMessage: 'Assignee'
|
|
32
|
-
},
|
|
33
|
-
showMoreMessage: {
|
|
34
|
-
id: 'linkDataSource.basic-filter.showMoreButton',
|
|
35
|
-
defaultMessage: 'Show more',
|
|
36
|
-
description: 'The text to show more options in dropdown'
|
|
37
22
|
}
|
|
38
23
|
});
|
|
@@ -193,7 +193,8 @@ export const JiraSearchContainer = props => {
|
|
|
193
193
|
onSearch: handleSearch,
|
|
194
194
|
searchTerm: basicSearchTerm,
|
|
195
195
|
placeholder: basicSearchInputMessages.basicTextSearchLabel,
|
|
196
|
-
testId: "jira-datasource-modal"
|
|
196
|
+
testId: "jira-datasource-modal",
|
|
197
|
+
fullWidth: !showBasicFilters
|
|
197
198
|
}), showBasicFilters && jsx(BasicFilters, {
|
|
198
199
|
jql: searchBarJql,
|
|
199
200
|
site: site,
|
|
@@ -10,7 +10,7 @@ import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
|
10
10
|
import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
|
|
11
11
|
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
12
12
|
import LinkUrl from '@atlaskit/smart-card/link-url';
|
|
13
|
-
import {
|
|
13
|
+
import { N800 } from '@atlaskit/theme/colors';
|
|
14
14
|
import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
15
15
|
import { componentMetadata } from '../../../analytics/constants';
|
|
16
16
|
import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
|
|
@@ -32,29 +32,19 @@ import { InitialStateView } from '../../common/initial-state-view';
|
|
|
32
32
|
import { initialStateViewMessages } from '../../common/initial-state-view/messages';
|
|
33
33
|
import { CancelButton } from '../../common/modal/cancel-button';
|
|
34
34
|
import { ContentContainer } from '../../common/modal/content-container';
|
|
35
|
+
import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
|
|
36
|
+
import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
|
|
35
37
|
import { SiteSelector } from '../../common/modal/site-selector';
|
|
36
38
|
import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
|
|
37
|
-
import LinkRenderType from '../../issue-like-table/render-type/link';
|
|
38
39
|
import { availableBasicFilterTypes } from '../basic-filters/ui';
|
|
39
40
|
import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
|
|
40
41
|
import { JiraSearchContainer } from '../jira-search-container';
|
|
41
|
-
import { JiraDisplayViewDropDown } from './jira-display-view-dropdown/jira-display-view-drop-down';
|
|
42
42
|
import { JiraInitialStateSVG } from './jira-issues-initial-state-svg';
|
|
43
43
|
import { modalMessages } from './messages';
|
|
44
|
-
const placeholderSmartLinkStyles = css({
|
|
45
|
-
backgroundColor: `var(--ds-surface-raised, ${N0})`,
|
|
46
|
-
borderRadius: "var(--ds-border-radius-200, 3px)",
|
|
47
|
-
boxShadow: '0px 1px 1px rgba(9, 30, 66, 0.25), 0px 0px 1px rgba(9, 30, 66, 0.31)',
|
|
48
|
-
color: `var(--ds-text-brand, ${B400})`,
|
|
49
|
-
padding: `${"var(--ds-space-0, 0px)"} ${"var(--ds-space-025, 2px)"}`
|
|
50
|
-
});
|
|
51
44
|
const issueCountStyles = css({
|
|
52
45
|
flex: 1,
|
|
53
46
|
fontWeight: 600
|
|
54
47
|
});
|
|
55
|
-
const smartLinkContainerStyles = css({
|
|
56
|
-
paddingLeft: "var(--ds-space-025, 2px)"
|
|
57
|
-
});
|
|
58
48
|
const getDisplayValue = (currentViewMode, itemCount) => {
|
|
59
49
|
if (currentViewMode === 'issue') {
|
|
60
50
|
return DatasourceDisplay.DATASOURCE_TABLE;
|
|
@@ -422,12 +412,9 @@ export const PlainJiraIssuesConfigModal = props => {
|
|
|
422
412
|
url: selectedJiraSiteUrl || urlBeingEdited
|
|
423
413
|
});
|
|
424
414
|
} else if (status === 'empty' || !jql || !selectedJiraSiteUrl) {
|
|
425
|
-
return jsx(
|
|
426
|
-
|
|
427
|
-
}
|
|
428
|
-
"data-testid": `jira-datasource-modal--smart-card-placeholder`,
|
|
429
|
-
css: placeholderSmartLinkStyles
|
|
430
|
-
}, jsx(FormattedMessage, modalMessages.issuesCountSmartCardPlaceholderText)));
|
|
415
|
+
return jsx(SmartCardPlaceholder, {
|
|
416
|
+
placeholderText: modalMessages.issuesCountSmartCardPlaceholderText
|
|
417
|
+
});
|
|
431
418
|
} else {
|
|
432
419
|
let url;
|
|
433
420
|
if (responseItems.length === 1 && retrieveUrlForSmartCardRender()) {
|
|
@@ -435,11 +422,9 @@ export const PlainJiraIssuesConfigModal = props => {
|
|
|
435
422
|
} else {
|
|
436
423
|
url = `${selectedJiraSiteUrl}/issues/?jql=${getBooleanFF('platform.linking-platform.datasource.enable-stricter-jql-encoding') ? encodeURIComponent(jql) : encodeURI(jql)}`;
|
|
437
424
|
}
|
|
438
|
-
return jsx(
|
|
439
|
-
css: smartLinkContainerStyles
|
|
440
|
-
}, jsx(LinkRenderType, {
|
|
425
|
+
return jsx(SmartLink, {
|
|
441
426
|
url: url
|
|
442
|
-
})
|
|
427
|
+
});
|
|
443
428
|
}
|
|
444
429
|
}, [jql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, responseItems, retrieveUrlForSmartCardRender]);
|
|
445
430
|
const renderIssuesModeContent = useCallback(() => {
|
|
@@ -501,7 +486,7 @@ export const PlainJiraIssuesConfigModal = props => {
|
|
|
501
486
|
selectedSite: selectedJiraSite,
|
|
502
487
|
testId: "jira-datasource-modal--site-selector",
|
|
503
488
|
label: siteSelectorLabel
|
|
504
|
-
})), !hasNoJiraSites && jsx(
|
|
489
|
+
})), !hasNoJiraSites && jsx(DisplayViewDropDown, {
|
|
505
490
|
onViewModeChange: handleViewModeChange,
|
|
506
491
|
viewMode: currentViewMode
|
|
507
492
|
})), jsx(ModalBody, null, !hasNoJiraSites ? jsx(Fragment, null, jsx(JiraSearchContainer, {
|
|
@@ -15,26 +15,6 @@ export const modalMessages = defineMessages({
|
|
|
15
15
|
description: 'Title for the Jira Issues modal when a user has to select a site to inserting issues from',
|
|
16
16
|
defaultMessage: 'Insert Jira issues from'
|
|
17
17
|
},
|
|
18
|
-
tableViewModeLabel: {
|
|
19
|
-
id: 'linkDataSource.jira-issues.configmodal.tableViewModeLabel',
|
|
20
|
-
description: 'Display Jira search results as a table',
|
|
21
|
-
defaultMessage: 'Table'
|
|
22
|
-
},
|
|
23
|
-
tableViewModeDescription: {
|
|
24
|
-
id: 'linkDataSource.jira-issues.configmodal.tableViewModeDescription',
|
|
25
|
-
description: 'Description for table view mode',
|
|
26
|
-
defaultMessage: 'Display Jira search results as a table'
|
|
27
|
-
},
|
|
28
|
-
inlineLinkViewModeLabel: {
|
|
29
|
-
id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeLabel',
|
|
30
|
-
description: 'Display the number of search results as an inline smart link',
|
|
31
|
-
defaultMessage: 'Inline link'
|
|
32
|
-
},
|
|
33
|
-
inlineLinkViewModeDescription: {
|
|
34
|
-
id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeDescription',
|
|
35
|
-
description: 'Description for inline link view mode',
|
|
36
|
-
defaultMessage: 'Display the number of search results or as an inline smart link'
|
|
37
|
-
},
|
|
38
18
|
issuesCountSmartCardPlaceholderText: {
|
|
39
19
|
id: 'linkDataSource.jira-issues.configmodal.placeholder.issues',
|
|
40
20
|
description: 'Placeholder text that will be placed next to a count of jira issues',
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/** @jsx jsx */
|
|
2
|
-
|
|
2
|
+
|
|
3
3
|
import { css, jsx } from '@emotion/react';
|
|
4
4
|
import { useIntl } from 'react-intl-next';
|
|
5
5
|
import { LoadingButton } from '@atlaskit/button';
|
|
6
6
|
import SearchIcon from '@atlaskit/icon/glyph/editor/search';
|
|
7
|
-
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
8
7
|
import Textfield from '@atlaskit/textfield';
|
|
9
8
|
import { useDatasourceAnalyticsEvents } from '../../../../analytics';
|
|
10
9
|
import { basicSearchInputMessages } from './messages';
|
|
@@ -39,15 +38,8 @@ export var BasicSearchInput = function BasicSearchInput(_ref) {
|
|
|
39
38
|
e.preventDefault();
|
|
40
39
|
handleSearchWithAnalytics();
|
|
41
40
|
};
|
|
42
|
-
var showBasicFilters = useMemo(function () {
|
|
43
|
-
if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
|
|
44
|
-
return true;
|
|
45
|
-
}
|
|
46
|
-
return false;
|
|
47
|
-
}, []);
|
|
48
|
-
var isFullWidth = fullWidth || !showBasicFilters;
|
|
49
41
|
return jsx("form", {
|
|
50
|
-
css:
|
|
42
|
+
css: fullWidth ? formStyles : formWithMaxWidthStyles,
|
|
51
43
|
onSubmit: handleFormSubmit
|
|
52
44
|
}, jsx(Textfield, {
|
|
53
45
|
elemAfterInput: jsx(LoadingButton, {
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/** @jsx jsx */
|
|
2
|
+
import { css, jsx } from '@emotion/react';
|
|
3
|
+
import { FormattedMessage } from 'react-intl-next';
|
|
4
|
+
import { B400, N0 } from '@atlaskit/theme/colors';
|
|
5
|
+
import LinkRenderType from '../../../issue-like-table/render-type/link';
|
|
6
|
+
var placeholderSmartLinkStyles = css({
|
|
7
|
+
backgroundColor: "var(--ds-surface-raised, ".concat(N0, ")"),
|
|
8
|
+
borderRadius: "var(--ds-border-radius-200, 3px)",
|
|
9
|
+
boxShadow: '0px 1px 1px rgba(9, 30, 66, 0.25), 0px 0px 1px rgba(9, 30, 66, 0.31)',
|
|
10
|
+
color: "var(--ds-text-brand, ".concat(B400, ")"),
|
|
11
|
+
padding: "var(--ds-space-0, 0px)".concat(" ", "var(--ds-space-025, 2px)")
|
|
12
|
+
});
|
|
13
|
+
var smartLinkContainerStyles = css({
|
|
14
|
+
paddingLeft: "var(--ds-space-025, 2px)"
|
|
15
|
+
});
|
|
16
|
+
export var SmartCardPlaceholder = function SmartCardPlaceholder(_ref) {
|
|
17
|
+
var placeholderText = _ref.placeholderText;
|
|
18
|
+
return jsx("div", {
|
|
19
|
+
css: smartLinkContainerStyles
|
|
20
|
+
}, jsx("span", {
|
|
21
|
+
"data-testid": "datasource-modal--smart-card-placeholder",
|
|
22
|
+
css: placeholderSmartLinkStyles
|
|
23
|
+
}, jsx(FormattedMessage, placeholderText)));
|
|
24
|
+
};
|
|
25
|
+
export var SmartLink = function SmartLink(_ref2) {
|
|
26
|
+
var url = _ref2.url;
|
|
27
|
+
return jsx("div", {
|
|
28
|
+
css: smartLinkContainerStyles
|
|
29
|
+
}, jsx(LinkRenderType, {
|
|
30
|
+
url: url
|
|
31
|
+
}));
|
|
32
|
+
};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/** @jsx jsx */
|
|
2
|
+
import { jsx } from '@emotion/react';
|
|
3
|
+
import { FormattedMessage, useIntl } from 'react-intl-next';
|
|
4
|
+
import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
|
|
5
|
+
import TableIcon from '@atlaskit/icon/glyph/table';
|
|
6
|
+
import { Box, xcss } from '@atlaskit/primitives';
|
|
7
|
+
import { displayViewDropDownMessages } from './messages';
|
|
8
|
+
var dropDownItemGroupStyles = xcss({
|
|
9
|
+
width: '320px',
|
|
10
|
+
height: '140px',
|
|
11
|
+
paddingTop: 'space.050',
|
|
12
|
+
paddingBottom: 'space.050',
|
|
13
|
+
borderRadius: 'border.radius'
|
|
14
|
+
});
|
|
15
|
+
var InlineIcon = jsx("svg", {
|
|
16
|
+
xmlns: "http://www.w3.org/2000/svg",
|
|
17
|
+
width: "24",
|
|
18
|
+
height: "24",
|
|
19
|
+
viewBox: "0 0 24 24",
|
|
20
|
+
fill: "none"
|
|
21
|
+
}, jsx("path", {
|
|
22
|
+
fillRule: "evenodd",
|
|
23
|
+
clipRule: "evenodd",
|
|
24
|
+
d: "M4 9C2.89543 9 2 9.67155 2 10.5V13.5C2 14.3285 2.89543 15 4 15H20C21.1046 15 22 14.3285 22 13.5V10.5C22 9.67155 21.1046 9 20 9H4ZM4.22222 11.25C4.22222 10.5 4.22222 10.5 5 10.5H7C7.55556 10.5 7.55556 10.5 7.55556 11.25V13C7.55556 13.5 7.55556 13.5 7 13.5H5C4.22222 13.5 4.22222 13.5 4.22222 13V11.25ZM9 12C9 11.7929 9.2239 11.625 9.5 11.625H19.5C19.7761 11.625 20 11.7929 20 12C20 12.2071 19.7761 12.375 19.5 12.375H9.5C9.2239 12.375 9 12.2071 9 12Z",
|
|
25
|
+
fill: 'currentColor'
|
|
26
|
+
}));
|
|
27
|
+
export var DisplayViewDropDown = function DisplayViewDropDown(_ref) {
|
|
28
|
+
var onViewModeChange = _ref.onViewModeChange,
|
|
29
|
+
viewMode = _ref.viewMode;
|
|
30
|
+
var _useIntl = useIntl(),
|
|
31
|
+
formatMessage = _useIntl.formatMessage;
|
|
32
|
+
// TODO: further refactoring in EDM-9573
|
|
33
|
+
// temporary fix. transition 'count' to 'inline', 'issue' to 'table'
|
|
34
|
+
var isJira = viewMode === 'issue' || viewMode === 'count';
|
|
35
|
+
var isTable = viewMode === 'table' || viewMode === 'issue';
|
|
36
|
+
var triggerText = isTable ? formatMessage(
|
|
37
|
+
// TODO EDM-9573, remove once EDM-9431 is merged
|
|
38
|
+
isJira ? displayViewDropDownMessages.tableViewModeLabel : displayViewDropDownMessages.tableViewModeLabelDuplicate) : formatMessage(
|
|
39
|
+
// TODO EDM-9573, remove once EDM-9431 is merged
|
|
40
|
+
isJira ? displayViewDropDownMessages.inlineLinkViewModeLabel : displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate);
|
|
41
|
+
return jsx(DropdownMenu, {
|
|
42
|
+
trigger: triggerText,
|
|
43
|
+
testId: "datasource-modal--view-drop-down"
|
|
44
|
+
}, jsx(Box, {
|
|
45
|
+
xcss: dropDownItemGroupStyles
|
|
46
|
+
}, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
|
|
47
|
+
testId: "dropdown-item-table",
|
|
48
|
+
onClick: function onClick() {
|
|
49
|
+
return onViewModeChange(isJira ? 'issue' : 'table');
|
|
50
|
+
},
|
|
51
|
+
isSelected: isTable,
|
|
52
|
+
description: formatMessage(
|
|
53
|
+
// TODO EDM-9573, remove once EDM-9431 is merged
|
|
54
|
+
isJira ? displayViewDropDownMessages.tableViewModeDescription : displayViewDropDownMessages.tableViewModeDescriptionDuplicate),
|
|
55
|
+
elemBefore: jsx(TableIcon, {
|
|
56
|
+
label: "table icon"
|
|
57
|
+
})
|
|
58
|
+
}, jsx(FormattedMessage
|
|
59
|
+
// TODO EDM-9573, remove once EDM-9431 is merged
|
|
60
|
+
, isJira ? displayViewDropDownMessages.tableViewModeLabel : displayViewDropDownMessages.tableViewModeLabelDuplicate)), jsx(DropdownItem, {
|
|
61
|
+
testId: "dropdown-item-inline-link",
|
|
62
|
+
onClick: function onClick() {
|
|
63
|
+
return onViewModeChange(isJira ? 'count' : 'inline');
|
|
64
|
+
},
|
|
65
|
+
isSelected: !isTable,
|
|
66
|
+
description: formatMessage(
|
|
67
|
+
// TODO EDM-9573, remove once EDM-9431 is merged
|
|
68
|
+
isJira ? displayViewDropDownMessages.inlineLinkViewModeDescription : displayViewDropDownMessages.inlineLinkViewModeDescriptionDuplicate),
|
|
69
|
+
elemBefore: InlineIcon
|
|
70
|
+
}, jsx(FormattedMessage
|
|
71
|
+
// TODO EDM-9573, remove once EDM-9431 is merged
|
|
72
|
+
, isJira ? displayViewDropDownMessages.inlineLinkViewModeLabel : displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate)))));
|
|
73
|
+
};
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { defineMessages } from 'react-intl-next';
|
|
2
|
+
export var displayViewDropDownMessages = defineMessages({
|
|
3
|
+
// TODO EDM-9573
|
|
4
|
+
// remove duplicate from end of key once EDM-9431 is merged
|
|
5
|
+
tableViewModeLabelDuplicate: {
|
|
6
|
+
id: 'linkDataSource.configmodal.tableViewModeLabel',
|
|
7
|
+
description: 'Display search results as a table',
|
|
8
|
+
defaultMessage: 'Table'
|
|
9
|
+
},
|
|
10
|
+
// remove duplicate from end of key once EDM-9431 is merged
|
|
11
|
+
tableViewModeDescriptionDuplicate: {
|
|
12
|
+
id: 'linkDataSource.configmodal.tableViewModeDescription',
|
|
13
|
+
description: 'Description for table view mode',
|
|
14
|
+
defaultMessage: 'Display search results as a table'
|
|
15
|
+
},
|
|
16
|
+
// remove duplicate from end of key once EDM-9431 is merged
|
|
17
|
+
inlineLinkViewModeLabelDuplicate: {
|
|
18
|
+
id: 'linkDataSource.configmodal.inlineLinkViewModeLabel',
|
|
19
|
+
description: 'Display the number of search results as an inline smart link',
|
|
20
|
+
defaultMessage: 'Inline link'
|
|
21
|
+
},
|
|
22
|
+
// remove duplicate from end of key once EDM-9431 is merged
|
|
23
|
+
inlineLinkViewModeDescriptionDuplicate: {
|
|
24
|
+
id: 'linkDataSource.configmodal.inlineLinkViewModeDescription',
|
|
25
|
+
description: 'Description for inline view mode',
|
|
26
|
+
defaultMessage: 'Display the number of search results or as an inline smart link'
|
|
27
|
+
},
|
|
28
|
+
// delete once EDM-9431 is merged
|
|
29
|
+
tableViewModeLabel: {
|
|
30
|
+
id: 'linkDataSource.jira-issues.configmodal.tableViewModeLabel',
|
|
31
|
+
description: 'Display Jira search results as a table',
|
|
32
|
+
defaultMessage: 'Table'
|
|
33
|
+
},
|
|
34
|
+
// delete once EDM-9431 is merged
|
|
35
|
+
tableViewModeDescription: {
|
|
36
|
+
id: 'linkDataSource.jira-issues.configmodal.tableViewModeDescription',
|
|
37
|
+
description: 'Description for table view mode',
|
|
38
|
+
defaultMessage: 'Display Jira search results as a table'
|
|
39
|
+
},
|
|
40
|
+
// delete once EDM-9431 is merged
|
|
41
|
+
inlineLinkViewModeLabel: {
|
|
42
|
+
id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeLabel',
|
|
43
|
+
description: 'Display the number of search results as an inline smart link',
|
|
44
|
+
defaultMessage: 'Inline link'
|
|
45
|
+
},
|
|
46
|
+
// delete once EDM-9431 is merged
|
|
47
|
+
inlineLinkViewModeDescription: {
|
|
48
|
+
id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeDescription',
|
|
49
|
+
description: 'Description for inline link view mode',
|
|
50
|
+
defaultMessage: 'Display the number of search results or as an inline smart link'
|
|
51
|
+
}
|
|
52
|
+
});
|