@atlaskit/link-datasource 4.4.0 → 4.6.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 +33 -0
- package/dist/cjs/common/ui/spot/error-state/error/assets/dark.svg +7 -4
- package/dist/cjs/common/ui/spot/error-state/error/assets/light.svg +7 -4
- package/dist/cjs/common/ui/spot/error-state/error-old/assets/dark.svg +5 -0
- package/dist/cjs/common/ui/spot/error-state/error-old/assets/light.svg +5 -0
- package/dist/cjs/common/ui/spot/error-state/error-old/index.js +18 -0
- package/dist/cjs/common/utils/withFeatureFlaggedComponent.js +23 -0
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/index.compiled.css +10 -0
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +14 -5
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js +12 -2
- package/dist/cjs/ui/assets-modal/search-container/object-schema-select/index.js +7 -2
- package/dist/cjs/ui/common/error-state/access-required.compiled.css +3 -0
- package/dist/cjs/ui/common/error-state/access-required.js +5 -3
- package/dist/cjs/ui/common/error-state/messages.js +23 -3
- package/dist/cjs/ui/common/error-state/modal-loading-error.compiled.css +8 -1
- package/dist/cjs/ui/common/error-state/modal-loading-error.js +24 -7
- package/dist/cjs/ui/common/error-state/no-results.compiled.css +8 -1
- package/dist/cjs/ui/common/error-state/no-results.js +157 -6
- package/dist/cjs/ui/common/initial-state-view/index.compiled.css +7 -2
- package/dist/cjs/ui/common/initial-state-view/index.js +11 -4
- package/dist/cjs/ui/common/initial-state-view/messages.js +11 -1
- package/dist/cjs/ui/common/modal/basic-search-input/index.compiled.css +1 -0
- package/dist/cjs/ui/common/modal/basic-search-input/index.js +6 -4
- package/dist/cjs/ui/common/modal/content-container/index.compiled.css +1 -0
- package/dist/cjs/ui/common/modal/content-container/index.js +4 -2
- package/dist/cjs/ui/common/modal/display-view-dropdown/display-view-drop-down.js +46 -6
- package/dist/cjs/ui/common/modal/mode-switcher/index.compiled.css +16 -0
- package/dist/cjs/ui/common/modal/mode-switcher/index.js +24 -2
- package/dist/cjs/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.compiled.css +15 -0
- package/dist/cjs/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.js +30 -0
- package/dist/cjs/ui/common/modal/popup-select/control.compiled.css +4 -0
- package/dist/cjs/ui/common/modal/popup-select/control.js +34 -7
- package/dist/cjs/ui/common/modal/popup-select/dropdownIndicator.js +19 -10
- package/dist/cjs/ui/common/modal/popup-select/footer.compiled.css +4 -0
- package/dist/cjs/ui/common/modal/popup-select/footer.js +8 -4
- package/dist/cjs/ui/common/modal/popup-select/index.js +25 -3
- package/dist/cjs/ui/common/modal/popup-select/menu-list/errorMessage.js +8 -3
- package/dist/cjs/ui/common/modal/popup-select/menu-list/index.compiled.css +4 -1
- package/dist/cjs/ui/common/modal/popup-select/menu-list/index.js +5 -2
- package/dist/cjs/ui/common/modal/popup-select/menu-list/messages.js +21 -1
- package/dist/cjs/ui/common/modal/popup-select/menu-list/noOptionsMessage.js +4 -3
- package/dist/cjs/ui/common/modal/popup-select/menu-list/selectMessage.compiled.css +8 -1
- package/dist/cjs/ui/common/modal/popup-select/menu-list/selectMessage.js +23 -4
- package/dist/cjs/ui/common/modal/popup-select/menu-list/showMoreButton.js +10 -0
- package/dist/cjs/ui/common/modal/popup-select/trigger.compiled.css +1 -0
- package/dist/cjs/ui/common/modal/popup-select/trigger.js +26 -5
- package/dist/cjs/ui/common/modal/site-selector/index.js +7 -2
- package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js +18 -2
- package/dist/cjs/ui/confluence-search-modal/confluence-search-container/index.compiled.css +2 -1
- package/dist/cjs/ui/confluence-search-modal/confluence-search-container/index.js +14 -2
- package/dist/cjs/ui/confluence-search-modal/modal/index.js +20 -1
- package/dist/cjs/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js +3 -1
- package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js +25 -0
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.compiled.css +4 -1
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +49 -2
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +27 -2
- package/dist/cjs/ui/jira-issues-modal/modal/messages.js +10 -0
- package/dist/es2019/common/ui/spot/error-state/error/assets/dark.svg +7 -4
- package/dist/es2019/common/ui/spot/error-state/error/assets/light.svg +7 -4
- package/dist/es2019/common/ui/spot/error-state/error-old/assets/dark.svg +5 -0
- package/dist/es2019/common/ui/spot/error-state/error-old/assets/light.svg +5 -0
- package/dist/es2019/common/ui/spot/error-state/error-old/index.js +11 -0
- package/dist/es2019/common/utils/withFeatureFlaggedComponent.js +17 -0
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.compiled.css +10 -0
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +13 -5
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js +12 -2
- package/dist/es2019/ui/assets-modal/search-container/object-schema-select/index.js +5 -2
- package/dist/es2019/ui/common/error-state/access-required.compiled.css +3 -0
- package/dist/es2019/ui/common/error-state/access-required.js +5 -3
- package/dist/es2019/ui/common/error-state/messages.js +23 -3
- package/dist/es2019/ui/common/error-state/modal-loading-error.compiled.css +8 -1
- package/dist/es2019/ui/common/error-state/modal-loading-error.js +23 -7
- package/dist/es2019/ui/common/error-state/no-results.compiled.css +8 -1
- package/dist/es2019/ui/common/error-state/no-results.js +157 -6
- package/dist/es2019/ui/common/initial-state-view/index.compiled.css +4 -0
- package/dist/es2019/ui/common/initial-state-view/index.js +11 -4
- package/dist/es2019/ui/common/initial-state-view/messages.js +11 -1
- package/dist/es2019/ui/common/modal/basic-search-input/index.compiled.css +1 -0
- package/dist/es2019/ui/common/modal/basic-search-input/index.js +6 -4
- package/dist/es2019/ui/common/modal/content-container/index.compiled.css +1 -0
- package/dist/es2019/ui/common/modal/content-container/index.js +4 -2
- package/dist/es2019/ui/common/modal/display-view-dropdown/display-view-drop-down.js +37 -6
- package/dist/es2019/ui/common/modal/mode-switcher/index.compiled.css +16 -0
- package/dist/es2019/ui/common/modal/mode-switcher/index.js +19 -2
- package/dist/es2019/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.compiled.css +15 -0
- package/dist/es2019/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.js +19 -0
- package/dist/es2019/ui/common/modal/popup-select/control.compiled.css +4 -0
- package/dist/es2019/ui/common/modal/popup-select/control.js +26 -5
- package/dist/es2019/ui/common/modal/popup-select/dropdownIndicator.js +20 -11
- package/dist/es2019/ui/common/modal/popup-select/footer.compiled.css +4 -0
- package/dist/es2019/ui/common/modal/popup-select/footer.js +8 -4
- package/dist/es2019/ui/common/modal/popup-select/index.js +20 -3
- package/dist/es2019/ui/common/modal/popup-select/menu-list/errorMessage.js +8 -3
- package/dist/es2019/ui/common/modal/popup-select/menu-list/index.compiled.css +4 -1
- package/dist/es2019/ui/common/modal/popup-select/menu-list/index.js +5 -2
- package/dist/es2019/ui/common/modal/popup-select/menu-list/messages.js +21 -1
- package/dist/es2019/ui/common/modal/popup-select/menu-list/noOptionsMessage.js +4 -3
- package/dist/es2019/ui/common/modal/popup-select/menu-list/selectMessage.compiled.css +8 -1
- package/dist/es2019/ui/common/modal/popup-select/menu-list/selectMessage.js +24 -5
- package/dist/es2019/ui/common/modal/popup-select/menu-list/showMoreButton.js +12 -2
- package/dist/es2019/ui/common/modal/popup-select/trigger.compiled.css +1 -0
- package/dist/es2019/ui/common/modal/popup-select/trigger.js +24 -5
- package/dist/es2019/ui/common/modal/site-selector/index.js +5 -2
- package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js +16 -2
- package/dist/es2019/ui/confluence-search-modal/confluence-search-container/index.compiled.css +2 -1
- package/dist/es2019/ui/confluence-search-modal/confluence-search-container/index.js +16 -3
- package/dist/es2019/ui/confluence-search-modal/modal/index.js +16 -1
- package/dist/es2019/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js +3 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js +25 -0
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.compiled.css +4 -1
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +50 -3
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +23 -2
- package/dist/es2019/ui/jira-issues-modal/modal/messages.js +10 -0
- package/dist/esm/common/ui/spot/error-state/error/assets/dark.svg +7 -4
- package/dist/esm/common/ui/spot/error-state/error/assets/light.svg +7 -4
- package/dist/esm/common/ui/spot/error-state/error-old/assets/dark.svg +5 -0
- package/dist/esm/common/ui/spot/error-state/error-old/assets/light.svg +5 -0
- package/dist/esm/common/ui/spot/error-state/error-old/index.js +11 -0
- package/dist/esm/common/utils/withFeatureFlaggedComponent.js +17 -0
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/index.compiled.css +10 -0
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +13 -5
- package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.js +12 -2
- package/dist/esm/ui/assets-modal/search-container/object-schema-select/index.js +7 -2
- package/dist/esm/ui/common/error-state/access-required.compiled.css +3 -0
- package/dist/esm/ui/common/error-state/access-required.js +5 -3
- package/dist/esm/ui/common/error-state/messages.js +23 -3
- package/dist/esm/ui/common/error-state/modal-loading-error.compiled.css +8 -1
- package/dist/esm/ui/common/error-state/modal-loading-error.js +23 -7
- package/dist/esm/ui/common/error-state/no-results.compiled.css +8 -1
- package/dist/esm/ui/common/error-state/no-results.js +157 -6
- package/dist/esm/ui/common/initial-state-view/index.compiled.css +7 -2
- package/dist/esm/ui/common/initial-state-view/index.js +11 -4
- package/dist/esm/ui/common/initial-state-view/messages.js +11 -1
- package/dist/esm/ui/common/modal/basic-search-input/index.compiled.css +1 -0
- package/dist/esm/ui/common/modal/basic-search-input/index.js +6 -4
- package/dist/esm/ui/common/modal/content-container/index.compiled.css +1 -0
- package/dist/esm/ui/common/modal/content-container/index.js +4 -2
- package/dist/esm/ui/common/modal/display-view-dropdown/display-view-drop-down.js +46 -6
- package/dist/esm/ui/common/modal/mode-switcher/index.compiled.css +16 -0
- package/dist/esm/ui/common/modal/mode-switcher/index.js +24 -2
- package/dist/esm/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.compiled.css +15 -0
- package/dist/esm/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.js +20 -0
- package/dist/esm/ui/common/modal/popup-select/control.compiled.css +4 -0
- package/dist/esm/ui/common/modal/popup-select/control.js +33 -6
- package/dist/esm/ui/common/modal/popup-select/dropdownIndicator.js +20 -11
- package/dist/esm/ui/common/modal/popup-select/footer.compiled.css +4 -0
- package/dist/esm/ui/common/modal/popup-select/footer.js +8 -4
- package/dist/esm/ui/common/modal/popup-select/index.js +25 -3
- package/dist/esm/ui/common/modal/popup-select/menu-list/errorMessage.js +8 -3
- package/dist/esm/ui/common/modal/popup-select/menu-list/index.compiled.css +4 -1
- package/dist/esm/ui/common/modal/popup-select/menu-list/index.js +5 -2
- package/dist/esm/ui/common/modal/popup-select/menu-list/messages.js +21 -1
- package/dist/esm/ui/common/modal/popup-select/menu-list/noOptionsMessage.js +4 -3
- package/dist/esm/ui/common/modal/popup-select/menu-list/selectMessage.compiled.css +8 -1
- package/dist/esm/ui/common/modal/popup-select/menu-list/selectMessage.js +24 -5
- package/dist/esm/ui/common/modal/popup-select/menu-list/showMoreButton.js +12 -2
- package/dist/esm/ui/common/modal/popup-select/trigger.compiled.css +1 -0
- package/dist/esm/ui/common/modal/popup-select/trigger.js +26 -5
- package/dist/esm/ui/common/modal/site-selector/index.js +7 -2
- package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js +18 -2
- package/dist/esm/ui/confluence-search-modal/confluence-search-container/index.compiled.css +2 -1
- package/dist/esm/ui/confluence-search-modal/confluence-search-container/index.js +15 -3
- package/dist/esm/ui/confluence-search-modal/modal/index.js +20 -1
- package/dist/esm/ui/confluence-search-modal/modal/messages.js +5 -0
- package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js +3 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js +25 -0
- package/dist/esm/ui/jira-issues-modal/jira-search-container/index.compiled.css +4 -1
- package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +50 -3
- package/dist/esm/ui/jira-issues-modal/modal/index.js +27 -2
- package/dist/esm/ui/jira-issues-modal/modal/messages.js +10 -0
- package/dist/types/common/ui/spot/error-state/error-old/index.d.ts +3 -0
- package/dist/types/common/utils/withFeatureFlaggedComponent.d.ts +9 -0
- package/dist/types/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.d.ts +10 -0
- package/dist/types/ui/common/error-state/messages.d.ts +20 -0
- package/dist/types/ui/common/error-state/modal-loading-error.d.ts +6 -1
- package/dist/types/ui/common/initial-state-view/messages.d.ts +10 -0
- package/dist/types/ui/common/modal/basic-search-input/index.d.ts +6 -1
- package/dist/types/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.d.ts +4 -0
- package/dist/types/ui/common/modal/popup-select/control.d.ts +3 -1
- package/dist/types/ui/common/modal/popup-select/index.d.ts +6 -1
- package/dist/types/ui/common/modal/popup-select/menu-list/messages.d.ts +20 -0
- package/dist/types/ui/common/modal/popup-select/menu-list/selectMessage.d.ts +6 -1
- package/dist/types/ui/confluence-search-modal/modal/messages.d.ts +5 -0
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.d.ts +25 -0
- package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +10 -0
- package/dist/types-ts4.5/common/ui/spot/error-state/error-old/index.d.ts +3 -0
- package/dist/types-ts4.5/common/utils/withFeatureFlaggedComponent.d.ts +9 -0
- package/dist/types-ts4.5/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/common/error-state/messages.d.ts +20 -0
- package/dist/types-ts4.5/ui/common/error-state/modal-loading-error.d.ts +6 -1
- package/dist/types-ts4.5/ui/common/initial-state-view/messages.d.ts +10 -0
- package/dist/types-ts4.5/ui/common/modal/basic-search-input/index.d.ts +6 -1
- package/dist/types-ts4.5/ui/common/modal/popup-select/checkbox-option-visual-refresh-sllv.d.ts +4 -0
- package/dist/types-ts4.5/ui/common/modal/popup-select/control.d.ts +3 -1
- package/dist/types-ts4.5/ui/common/modal/popup-select/index.d.ts +6 -1
- package/dist/types-ts4.5/ui/common/modal/popup-select/menu-list/messages.d.ts +20 -0
- package/dist/types-ts4.5/ui/common/modal/popup-select/menu-list/selectMessage.d.ts +6 -1
- package/dist/types-ts4.5/ui/confluence-search-modal/modal/messages.d.ts +5 -0
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.d.ts +25 -0
- package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +10 -0
- package/package.json +5 -5
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import React, { useCallback } from 'react';
|
|
2
2
|
import { useIntl } from 'react-intl-next';
|
|
3
|
-
import
|
|
3
|
+
import ButtonOld from '@atlaskit/button';
|
|
4
|
+
import Button from '@atlaskit/button/new';
|
|
5
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
4
6
|
import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
|
|
5
7
|
import { asyncPopupSelectMessages } from './messages';
|
|
6
8
|
var ShowMoreButton = function ShowMoreButton(_ref) {
|
|
@@ -17,7 +19,15 @@ var ShowMoreButton = function ShowMoreButton(_ref) {
|
|
|
17
19
|
});
|
|
18
20
|
onShowMore();
|
|
19
21
|
}, [filterName, fireEvent, onShowMore]);
|
|
20
|
-
|
|
22
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
23
|
+
return /*#__PURE__*/React.createElement(Button, {
|
|
24
|
+
onClick: handleShowMore,
|
|
25
|
+
appearance: "subtle",
|
|
26
|
+
testId: "".concat(filterName, "--show-more-button"),
|
|
27
|
+
spacing: "compact"
|
|
28
|
+
}, formatMessage(asyncPopupSelectMessages.showMoreMessage));
|
|
29
|
+
}
|
|
30
|
+
return /*#__PURE__*/React.createElement(ButtonOld, {
|
|
21
31
|
onClick: handleShowMore,
|
|
22
32
|
appearance: "link",
|
|
23
33
|
testId: "".concat(filterName, "--show-more-button")
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
._y44vkmg5{animation:flickerAnimation 2s infinite}._18m915vq{overflow-y:hidden}
|
|
3
3
|
._18u01b66{margin-left:var(--ds-space-050,4px)}
|
|
4
|
+
._18u0utpp{margin-left:var(--ds-space-150,9pt)}
|
|
4
5
|
._1bto1l2s{text-overflow:ellipsis}
|
|
5
6
|
._1reo15vq{overflow-x:hidden}
|
|
6
7
|
._kqswh2mm{position:relative}
|
|
@@ -7,13 +7,17 @@ import "./trigger.compiled.css";
|
|
|
7
7
|
import { ax, ix } from "@compiled/react/runtime";
|
|
8
8
|
import React, { forwardRef, useCallback } from 'react';
|
|
9
9
|
import Badge from '@atlaskit/badge';
|
|
10
|
+
import NewButton from '@atlaskit/button/new';
|
|
10
11
|
import Button from '@atlaskit/button/standard-button';
|
|
11
|
-
import ChevronDownIcon from '@atlaskit/icon/utility/
|
|
12
|
+
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
13
|
+
import ChevronDownIconOld from '@atlaskit/icon/utility/migration/chevron-down';
|
|
14
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
15
|
import { Box, Flex } from '@atlaskit/primitives/compiled';
|
|
13
16
|
import Spinner from '@atlaskit/spinner';
|
|
14
17
|
var styles = {
|
|
15
18
|
triggerButtonLabelStyles: "_1reo15vq _18m915vq _1bto1l2s",
|
|
16
|
-
|
|
19
|
+
badgeStylesOld: "_18u01b66",
|
|
20
|
+
badgeStyles: "_18u0utpp"
|
|
17
21
|
};
|
|
18
22
|
|
|
19
23
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled
|
|
@@ -53,11 +57,28 @@ var PopupTrigger = /*#__PURE__*/forwardRef(function (_ref2, ref) {
|
|
|
53
57
|
}, label));
|
|
54
58
|
}, [label, triggerButtonTestId]);
|
|
55
59
|
var DefaultButton = useCallback(function () {
|
|
56
|
-
return /*#__PURE__*/React.createElement(
|
|
60
|
+
return fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(NewButton, {
|
|
61
|
+
isSelected: isSelected || hasOptions,
|
|
62
|
+
isDisabled: isDisabled,
|
|
63
|
+
iconAfter: function iconAfter() {
|
|
64
|
+
return /*#__PURE__*/React.createElement(ChevronDownIcon, {
|
|
65
|
+
label: "",
|
|
66
|
+
color: "currentColor"
|
|
67
|
+
});
|
|
68
|
+
},
|
|
69
|
+
testId: "".concat(triggerButtonTestId, "--button")
|
|
70
|
+
}, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Box, {
|
|
71
|
+
xcss: styles.triggerButtonLabelStyles
|
|
72
|
+
}, label, firstOption && /*#__PURE__*/React.createElement(React.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/React.createElement(Flex, {
|
|
73
|
+
xcss: styles.badgeStyles,
|
|
74
|
+
alignItems: "center"
|
|
75
|
+
}, /*#__PURE__*/React.createElement(Badge, {
|
|
76
|
+
appearance: "primary"
|
|
77
|
+
}, "+", selectedOptions.length - 1)))) : /*#__PURE__*/React.createElement(Button, {
|
|
57
78
|
appearance: "default",
|
|
58
79
|
isSelected: isSelected || hasOptions,
|
|
59
80
|
isDisabled: isDisabled,
|
|
60
|
-
iconAfter: /*#__PURE__*/React.createElement(
|
|
81
|
+
iconAfter: /*#__PURE__*/React.createElement(ChevronDownIconOld, {
|
|
61
82
|
label: "",
|
|
62
83
|
color: "currentColor"
|
|
63
84
|
}),
|
|
@@ -65,7 +86,7 @@ var PopupTrigger = /*#__PURE__*/forwardRef(function (_ref2, ref) {
|
|
|
65
86
|
}, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Box, {
|
|
66
87
|
xcss: styles.triggerButtonLabelStyles
|
|
67
88
|
}, label, firstOption && /*#__PURE__*/React.createElement(React.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/React.createElement(Flex, {
|
|
68
|
-
xcss: styles.
|
|
89
|
+
xcss: styles.badgeStylesOld,
|
|
69
90
|
alignItems: "center"
|
|
70
91
|
}, /*#__PURE__*/React.createElement(Badge, {
|
|
71
92
|
appearance: "primary"
|
|
@@ -14,7 +14,7 @@ import { useMemo } from 'react';
|
|
|
14
14
|
import { useIntl } from 'react-intl-next';
|
|
15
15
|
import Button from '@atlaskit/button/new';
|
|
16
16
|
import Heading from '@atlaskit/heading';
|
|
17
|
-
import ChevronDownIcon from '@atlaskit/icon/utility/
|
|
17
|
+
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
18
18
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
19
19
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
20
20
|
import Select, { PopupSelect } from '@atlaskit/select';
|
|
@@ -73,7 +73,12 @@ export var SiteSelector = function SiteSelector(props) {
|
|
|
73
73
|
triggerProps = _objectWithoutProperties(_ref, _excluded);
|
|
74
74
|
return /*#__PURE__*/React.createElement(Button, _extends({}, triggerProps, {
|
|
75
75
|
isSelected: isOpen,
|
|
76
|
-
iconAfter:
|
|
76
|
+
iconAfter: function iconAfter() {
|
|
77
|
+
return /*#__PURE__*/React.createElement(ChevronDownIcon, {
|
|
78
|
+
label: "",
|
|
79
|
+
color: "currentColor"
|
|
80
|
+
});
|
|
81
|
+
},
|
|
77
82
|
testId: "".concat(testId, "__control")
|
|
78
83
|
}), (selectedSiteOption === null || selectedSiteOption === void 0 ? void 0 : selectedSiteOption.label) || formatMessage(siteSelectorMessages.chooseSite));
|
|
79
84
|
}
|
package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js
CHANGED
|
@@ -1,13 +1,29 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import React from 'react';
|
|
3
|
+
import NewButton from '@atlaskit/button/new';
|
|
3
4
|
import Button from '@atlaskit/button/standard-button';
|
|
4
|
-
import ChevronDownIcon from '@atlaskit/icon/utility/
|
|
5
|
+
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
6
|
+
import ChevronDownIconOld from '@atlaskit/icon/utility/migration/chevron-down';
|
|
7
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
8
|
export var PopupTrigger = function PopupTrigger(_ref) {
|
|
6
9
|
var triggerProps = _ref.triggerProps,
|
|
7
10
|
isSelected = _ref.isSelected,
|
|
8
11
|
labelPrefix = _ref.labelPrefix,
|
|
9
12
|
selectedLabel = _ref.selectedLabel,
|
|
10
13
|
onClick = _ref.onClick;
|
|
14
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
15
|
+
return /*#__PURE__*/React.createElement(NewButton, _extends({}, triggerProps, {
|
|
16
|
+
testId: 'confluence-search-modal--date-range-button',
|
|
17
|
+
onClick: onClick,
|
|
18
|
+
isSelected: isSelected,
|
|
19
|
+
iconAfter: function iconAfter() {
|
|
20
|
+
return /*#__PURE__*/React.createElement(ChevronDownIcon, {
|
|
21
|
+
label: "",
|
|
22
|
+
color: "currentColor"
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}), labelPrefix, selectedLabel ? ": ".concat(selectedLabel) : '');
|
|
26
|
+
}
|
|
11
27
|
return /*#__PURE__*/React.createElement(Button, _extends({}, triggerProps, {
|
|
12
28
|
testId: 'confluence-search-modal--date-range-button',
|
|
13
29
|
onClick: onClick,
|
|
@@ -20,7 +36,7 @@ export var PopupTrigger = function PopupTrigger(_ref) {
|
|
|
20
36
|
display: 'flex',
|
|
21
37
|
alignItems: 'center'
|
|
22
38
|
}
|
|
23
|
-
}, /*#__PURE__*/React.createElement(
|
|
39
|
+
}, /*#__PURE__*/React.createElement(ChevronDownIconOld, {
|
|
24
40
|
LEGACY_size: "medium",
|
|
25
41
|
label: "",
|
|
26
42
|
color: "currentColor"
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
._16jlkb7n{flex-grow:1}
|
|
1
|
+
._16jlkb7n{flex-grow:1}
|
|
2
|
+
._1bsb1osq{width:100%}
|
|
@@ -6,8 +6,10 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
6
6
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
7
7
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
8
8
|
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
9
|
+
import { useIntl } from 'react-intl-next';
|
|
9
10
|
import { useDebouncedCallback } from 'use-debounce';
|
|
10
|
-
import {
|
|
11
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
|
+
import { Box, Flex, Text } from '@atlaskit/primitives/compiled';
|
|
11
13
|
import { BasicSearchInput } from '../../common/modal/basic-search-input';
|
|
12
14
|
import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
|
|
13
15
|
import BasicFilters from '../basic-filters';
|
|
@@ -15,6 +17,7 @@ import { useBasicFilterHydration } from '../basic-filters/hooks/useBasicFilterHy
|
|
|
15
17
|
import { CLOLBasicFilters } from '../basic-filters/types';
|
|
16
18
|
import { searchMessages } from './messages';
|
|
17
19
|
var styles = {
|
|
20
|
+
basicSearchInputBoxStyles: "_1bsb1osq",
|
|
18
21
|
basicSearchInputContainerStyles: "_16jlkb7n"
|
|
19
22
|
};
|
|
20
23
|
var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
|
|
@@ -55,6 +58,8 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
|
|
|
55
58
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
56
59
|
filterSelections = _useState6[0],
|
|
57
60
|
setFilterSelections = _useState6[1];
|
|
61
|
+
var _useIntl = useIntl(),
|
|
62
|
+
formatMessage = _useIntl.formatMessage;
|
|
58
63
|
var handleSearchChange = useCallback(function (e) {
|
|
59
64
|
var rawSearch = e.currentTarget.value;
|
|
60
65
|
setSearchBarSearchString(rawSearch);
|
|
@@ -99,7 +104,9 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
|
|
|
99
104
|
});
|
|
100
105
|
}
|
|
101
106
|
}, [users, status, filterSelections.lastModified]);
|
|
102
|
-
return /*#__PURE__*/React.createElement(
|
|
107
|
+
return /*#__PURE__*/React.createElement(Box, {
|
|
108
|
+
xcss: styles.basicSearchInputBoxStyles
|
|
109
|
+
}, /*#__PURE__*/React.createElement(Flex, {
|
|
103
110
|
alignItems: "center",
|
|
104
111
|
xcss: styles.basicSearchInputContainerStyles
|
|
105
112
|
}, /*#__PURE__*/React.createElement(BasicSearchInput, {
|
|
@@ -109,12 +116,17 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
|
|
|
109
116
|
onSearch: onSearch,
|
|
110
117
|
searchTerm: searchBarSearchString,
|
|
111
118
|
placeholder: searchMessages.searchLabel,
|
|
119
|
+
ariaLabel: searchMessages.searchLabel,
|
|
112
120
|
fullWidth: false
|
|
113
121
|
}), /*#__PURE__*/React.createElement(BasicFilters, {
|
|
114
122
|
cloudId: cloudId,
|
|
115
123
|
selections: filterSelections,
|
|
116
124
|
onChange: handleBasicFilterSelectionChange,
|
|
117
125
|
isHydrating: status === 'loading'
|
|
118
|
-
}))
|
|
126
|
+
})), fg('platform-linking-visual-refresh-sllv') && /*#__PURE__*/React.createElement(Text, {
|
|
127
|
+
size: "small",
|
|
128
|
+
color: "color.text.subtlest",
|
|
129
|
+
testId: "confluence-search-placeholder"
|
|
130
|
+
}, formatMessage(searchMessages.searchLabel)));
|
|
119
131
|
};
|
|
120
132
|
export default ConfluenceSearchContainer;
|
|
@@ -9,6 +9,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
9
9
|
import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
|
|
10
10
|
import { FormattedMessage, useIntl } from 'react-intl-next';
|
|
11
11
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
12
|
+
import LinkComponent from '@atlaskit/link';
|
|
12
13
|
import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
|
|
13
14
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
14
15
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
@@ -213,6 +214,24 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
|
|
|
213
214
|
}, [currentViewMode, fireInlineViewedEvent, fireTableViewedEvent, status]);
|
|
214
215
|
var renderTableModalContent = useCallback(function () {
|
|
215
216
|
if (status === 'rejected') {
|
|
217
|
+
if (selectedConfluenceSite && fg('platform-linking-visual-refresh-sllv')) {
|
|
218
|
+
return /*#__PURE__*/React.createElement(ModalLoadingError, {
|
|
219
|
+
errorMessage: /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, confluenceSearchModalMessages.checkConnectionWithSource, {
|
|
220
|
+
values: {
|
|
221
|
+
a: function a(urlText) {
|
|
222
|
+
return /*#__PURE__*/React.createElement(LinkComponent, {
|
|
223
|
+
href: selectedConfluenceSite.url
|
|
224
|
+
}, urlText);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
})),
|
|
228
|
+
onRefresh: function onRefresh() {
|
|
229
|
+
return reset({
|
|
230
|
+
shouldForceRequest: true
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
});
|
|
234
|
+
}
|
|
216
235
|
return /*#__PURE__*/React.createElement(ModalLoadingError, null);
|
|
217
236
|
} else if (status === 'unauthorized') {
|
|
218
237
|
return /*#__PURE__*/React.createElement(AccessRequired, {
|
|
@@ -241,7 +260,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
|
|
|
241
260
|
}, /*#__PURE__*/React.createElement(DatasourcesTableInModalPreview, {
|
|
242
261
|
testId: "confluence-search-datasource-table"
|
|
243
262
|
}));
|
|
244
|
-
}, [status, resolvedWithNoResults, columns.length, selectedConfluenceSiteUrl, urlBeingEdited, hasConfluenceSearchParams, formatMessage]);
|
|
263
|
+
}, [status, resolvedWithNoResults, columns.length, selectedConfluenceSiteUrl, urlBeingEdited, hasConfluenceSearchParams, formatMessage, reset, selectedConfluenceSite]);
|
|
245
264
|
var renderInlineLinkModalContent = useCallback(function () {
|
|
246
265
|
if (status === 'unauthorized') {
|
|
247
266
|
return /*#__PURE__*/React.createElement(AccessRequired, {
|
|
@@ -44,5 +44,10 @@ export var confluenceSearchModalMessages = defineMessages({
|
|
|
44
44
|
id: 'linkDataSource.confluence-search.configmodal.placeholder.issues',
|
|
45
45
|
description: 'Placeholder text that will be placed next to a count of confluence search results',
|
|
46
46
|
defaultMessage: '### Results'
|
|
47
|
+
},
|
|
48
|
+
checkConnectionWithSource: {
|
|
49
|
+
id: 'linkDataSource.confluence-search.checkConnectionWithSource',
|
|
50
|
+
description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
|
|
51
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this project in Confluence</a> to review.'
|
|
47
52
|
}
|
|
48
53
|
});
|
|
@@ -5,6 +5,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
|
5
5
|
import isEqual from 'lodash/isEqual';
|
|
6
6
|
import { useIntl } from 'react-intl-next';
|
|
7
7
|
import { useDebouncedCallback } from 'use-debounce';
|
|
8
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
9
|
import { FilterPopupSelect } from '../../../../common/modal/popup-select';
|
|
9
10
|
import { SEARCH_DEBOUNCE_MS } from '../../../../common/modal/popup-select/constants';
|
|
10
11
|
import { useFilterOptions } from '../../hooks/useFilterOptions';
|
|
@@ -107,7 +108,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
|
|
|
107
108
|
var filterName = "jlol-basic-filter-".concat(filterType);
|
|
108
109
|
var shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptionsLength > 0; // footer should not disappear when there is an inline spinner for loading more data
|
|
109
110
|
var shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
|
|
110
|
-
var triggerButtonLabel = formatMessage(asyncPopupSelectMessages["".concat(filterType, "Label")]);
|
|
111
|
+
var triggerButtonLabel = formatMessage(!fg('platform-linking-visual-refresh-sllv') && filterType === 'type' ? asyncPopupSelectMessages.typeLabelOld : asyncPopupSelectMessages["".concat(filterType, "Label")]);
|
|
111
112
|
return /*#__PURE__*/React.createElement(FilterPopupSelect, {
|
|
112
113
|
filterName: filterName,
|
|
113
114
|
status: status,
|
|
@@ -119,6 +120,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
|
|
|
119
120
|
selectedOptions: selectedOptions,
|
|
120
121
|
options: popupSelectOptions,
|
|
121
122
|
buttonLabel: triggerButtonLabel,
|
|
123
|
+
searchPlaceholder: fg('platform-linking-visual-refresh-sllv') ? formatMessage(asyncPopupSelectMessages["".concat(filterType, "SearchPlaceholder")]) : undefined,
|
|
122
124
|
onInputChange: handleInputChange,
|
|
123
125
|
onSelectionChange: handleOptionSelection,
|
|
124
126
|
onMenuOpen: handleMenuOpen,
|
|
@@ -13,11 +13,36 @@ export var asyncPopupSelectMessages = defineMessages({
|
|
|
13
13
|
typeLabel: {
|
|
14
14
|
id: 'linkDataSource.basic-filter.type.label',
|
|
15
15
|
description: 'Label to be displayed for type filter dropdown button.',
|
|
16
|
+
defaultMessage: 'Work type'
|
|
17
|
+
},
|
|
18
|
+
typeLabelOld: {
|
|
19
|
+
id: 'linkDataSource.basic-filter.type.labelOld',
|
|
20
|
+
description: 'Label to be displayed for type filter dropdown button.',
|
|
16
21
|
defaultMessage: 'Type'
|
|
17
22
|
},
|
|
18
23
|
assigneeLabel: {
|
|
19
24
|
id: 'linkDataSource.basic-filter.assignee.label',
|
|
20
25
|
description: 'Label to be displayed for assignee filter dropdown button.',
|
|
21
26
|
defaultMessage: 'Assignee'
|
|
27
|
+
},
|
|
28
|
+
projectSearchPlaceholder: {
|
|
29
|
+
id: 'linkDataSource.basic-filter.project.searchPlaceholder',
|
|
30
|
+
description: 'Placeholder to be displayed for project filter dropdown search input.',
|
|
31
|
+
defaultMessage: 'Search for projects'
|
|
32
|
+
},
|
|
33
|
+
statusSearchPlaceholder: {
|
|
34
|
+
id: 'linkDataSource.basic-filter.status.searchPlaceholder',
|
|
35
|
+
description: 'Placeholder to be displayed for status filter dropdown search input.',
|
|
36
|
+
defaultMessage: 'Search for status'
|
|
37
|
+
},
|
|
38
|
+
typeSearchPlaceholder: {
|
|
39
|
+
id: 'linkDataSource.basic-filter.type.searchPlaceholder',
|
|
40
|
+
description: 'Placeholder to be displayed for work type filter dropdown search input.',
|
|
41
|
+
defaultMessage: 'Search for work type'
|
|
42
|
+
},
|
|
43
|
+
assigneeSearchPlaceholder: {
|
|
44
|
+
id: 'linkDataSource.basic-filter.assignee.searchPlaceholder',
|
|
45
|
+
description: 'Placeholder to be displayed for assignee filter dropdown search input.',
|
|
46
|
+
defaultMessage: 'Search for assignee'
|
|
22
47
|
}
|
|
23
48
|
});
|
|
@@ -10,7 +10,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
10
10
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
11
11
|
import { useIntl } from 'react-intl-next';
|
|
12
12
|
import { useDebouncedCallback } from 'use-debounce';
|
|
13
|
-
import {
|
|
13
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
14
|
+
import { Box, Flex, Text } from '@atlaskit/primitives/compiled';
|
|
14
15
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
15
16
|
import { BasicSearchInput } from '../../common/modal/basic-search-input';
|
|
16
17
|
import { basicSearchInputMessages } from '../../common/modal/basic-search-input/messages';
|
|
@@ -23,8 +24,11 @@ import { JiraJQLEditor } from '../jql-editor';
|
|
|
23
24
|
import { buildJQL } from './buildJQL';
|
|
24
25
|
import { modeSwitcherMessages } from './messages';
|
|
25
26
|
var styles = {
|
|
27
|
+
basicSearchInputBoxStyles: "_1bsb1osq",
|
|
26
28
|
basicSearchInputContainerStyles: "_16jlkb7n",
|
|
27
|
-
|
|
29
|
+
inputContainerStylesOld: "_4cvr1q9y _1e0c1txw _1tket9kd",
|
|
30
|
+
inputContainerStyles: "_4cvr1y6m _1e0c1txw _1tket9kd",
|
|
31
|
+
modeSwitcherContainerStyles: "_19pk1b66"
|
|
28
32
|
};
|
|
29
33
|
export var DEFAULT_JQL_QUERY = 'ORDER BY created DESC';
|
|
30
34
|
export var ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
|
|
@@ -196,9 +200,51 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
196
200
|
setCloudId(currentCloudId);
|
|
197
201
|
}
|
|
198
202
|
}, [currentCloudId, cloudId, setSearchBarJql]);
|
|
203
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
204
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
205
|
+
"data-testid": "jira-search-container",
|
|
206
|
+
className: ax([styles.inputContainerStyles])
|
|
207
|
+
}, currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Box, {
|
|
208
|
+
xcss: styles.basicSearchInputBoxStyles
|
|
209
|
+
}, /*#__PURE__*/React.createElement(Flex, {
|
|
210
|
+
alignItems: "center",
|
|
211
|
+
xcss: styles.basicSearchInputContainerStyles
|
|
212
|
+
}, /*#__PURE__*/React.createElement(BasicSearchInput, {
|
|
213
|
+
isSearching: isSearching,
|
|
214
|
+
onChange: handleBasicSearchChange,
|
|
215
|
+
onSearch: handleSearch,
|
|
216
|
+
searchTerm: basicSearchTerm,
|
|
217
|
+
placeholder: basicSearchInputMessages.basicTextSearchLabel,
|
|
218
|
+
ariaLabel: basicSearchInputMessages.basicTextSearchLabel,
|
|
219
|
+
testId: "jira-datasource-modal",
|
|
220
|
+
fullWidth: false
|
|
221
|
+
}), /*#__PURE__*/React.createElement(BasicFilters, {
|
|
222
|
+
jql: searchBarJql,
|
|
223
|
+
site: site,
|
|
224
|
+
onChange: handleBasicFilterSelectionChange,
|
|
225
|
+
selections: filterSelections,
|
|
226
|
+
isJQLHydrating: basicFilterHydrationStatus === 'loading'
|
|
227
|
+
})), currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Text, {
|
|
228
|
+
size: "small",
|
|
229
|
+
color: "color.text.subtlest",
|
|
230
|
+
testId: "jira-search-placeholder"
|
|
231
|
+
}, formatMessage(basicSearchInputMessages.basicTextSearchLabel))), currentSearchMethod === 'jql' && /*#__PURE__*/React.createElement(JiraJQLEditor, {
|
|
232
|
+
cloudId: cloudId || '',
|
|
233
|
+
isSearching: isSearching,
|
|
234
|
+
onChange: onQueryChange,
|
|
235
|
+
onSearch: handleSearch,
|
|
236
|
+
query: searchBarJql
|
|
237
|
+
}), /*#__PURE__*/React.createElement(Box, {
|
|
238
|
+
xcss: styles.modeSwitcherContainerStyles
|
|
239
|
+
}, /*#__PURE__*/React.createElement(ModeSwitcher, {
|
|
240
|
+
onOptionValueChange: onSearchMethodChange,
|
|
241
|
+
selectedOptionValue: currentSearchMethod,
|
|
242
|
+
options: modeSwitcherOptions
|
|
243
|
+
})));
|
|
244
|
+
}
|
|
199
245
|
return /*#__PURE__*/React.createElement("div", {
|
|
200
246
|
"data-testid": "jira-search-container",
|
|
201
|
-
className: ax([styles.
|
|
247
|
+
className: ax([styles.inputContainerStylesOld])
|
|
202
248
|
}, currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Flex, {
|
|
203
249
|
alignItems: "center",
|
|
204
250
|
xcss: styles.basicSearchInputContainerStyles
|
|
@@ -208,6 +254,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
208
254
|
onSearch: handleSearch,
|
|
209
255
|
searchTerm: basicSearchTerm,
|
|
210
256
|
placeholder: basicSearchInputMessages.basicTextSearchLabel,
|
|
257
|
+
ariaLabel: basicSearchInputMessages.basicTextSearchLabel,
|
|
211
258
|
testId: "jira-datasource-modal",
|
|
212
259
|
fullWidth: false
|
|
213
260
|
}), /*#__PURE__*/React.createElement(BasicFilters, {
|
|
@@ -8,6 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
8
8
|
import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
9
9
|
import { FormattedMessage, useIntl } from 'react-intl-next';
|
|
10
10
|
import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
|
|
11
|
+
import LinkComponent from '@atlaskit/link';
|
|
11
12
|
import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
|
|
12
13
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
14
|
import { useDatasourceAnalyticsEvents } from '../../../analytics';
|
|
@@ -271,12 +272,33 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
271
272
|
var renderIssuesModeContent = useCallback(function () {
|
|
272
273
|
var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
|
|
273
274
|
var getDescriptionMessage = function getDescriptionMessage() {
|
|
275
|
+
if (currentSearchMethod === 'basic' && fg('platform-linking-visual-refresh-sllv')) {
|
|
276
|
+
return initialStateViewMessages.searchDescriptionForBasicSearchVisualRefreshSllv;
|
|
277
|
+
}
|
|
274
278
|
if (fg('confluence-issue-terminology-refresh')) {
|
|
275
279
|
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
|
|
276
280
|
}
|
|
277
281
|
return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch;
|
|
278
282
|
};
|
|
279
283
|
if (status === 'rejected' && jqlUrl) {
|
|
284
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
285
|
+
return /*#__PURE__*/React.createElement(ModalLoadingError, {
|
|
286
|
+
errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
|
|
287
|
+
values: {
|
|
288
|
+
a: function a(urlText) {
|
|
289
|
+
return /*#__PURE__*/React.createElement(LinkComponent, {
|
|
290
|
+
href: jqlUrl
|
|
291
|
+
}, urlText);
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
})) : undefined,
|
|
295
|
+
onRefresh: function onRefresh() {
|
|
296
|
+
return reset({
|
|
297
|
+
shouldForceRequest: true
|
|
298
|
+
});
|
|
299
|
+
}
|
|
300
|
+
});
|
|
301
|
+
}
|
|
280
302
|
return /*#__PURE__*/React.createElement(ModalLoadingError, {
|
|
281
303
|
errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSource, {
|
|
282
304
|
values: {
|
|
@@ -308,6 +330,9 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
308
330
|
title: fg('confluence-issue-terminology-refresh') ? modalMessages.searchJiraTitleIssueTermRefresh : modalMessages.searchJiraTitle,
|
|
309
331
|
description: getDescriptionMessage(),
|
|
310
332
|
learnMoreLink: currentSearchMethod === 'jql' ? {
|
|
333
|
+
href: jqlSupportDocumentLink,
|
|
334
|
+
text: initialStateViewMessages.learnMoreLinkOld
|
|
335
|
+
} : fg('platform-linking-visual-refresh-sllv') ? {
|
|
311
336
|
href: jqlSupportDocumentLink,
|
|
312
337
|
text: initialStateViewMessages.learnMoreLink
|
|
313
338
|
} : undefined
|
|
@@ -318,7 +343,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
318
343
|
}, /*#__PURE__*/React.createElement(DatasourcesTableInModalPreview, {
|
|
319
344
|
testId: "jira-datasource-table"
|
|
320
345
|
}));
|
|
321
|
-
}, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
|
|
346
|
+
}, [columns.length, currentSearchMethod, formatMessage, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, reset]);
|
|
322
347
|
var siteSelectorLabel = useMemo(function () {
|
|
323
348
|
if (fg('confluence-issue-terminology-refresh')) {
|
|
324
349
|
return availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySitesIssueTermRefresh : modalMessages.insertIssuesTitleIssueTermRefresh;
|
|
@@ -390,7 +415,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
390
415
|
testId: "jira-datasource-modal--insert-button",
|
|
391
416
|
url: urlToInsert,
|
|
392
417
|
getAnalyticsPayload: getInsertButtonAnalyticsPayload
|
|
393
|
-
}, fg('confluence-issue-terminology-refresh') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
418
|
+
}, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv) : fg('confluence-issue-terminology-refresh') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonText))))));
|
|
394
419
|
};
|
|
395
420
|
var ConnectedJiraIssueConfigModal = createDatasourceModal({
|
|
396
421
|
isValidParameters: isValidParameters,
|
|
@@ -91,11 +91,21 @@ export var modalMessages = defineMessages({
|
|
|
91
91
|
description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
|
|
92
92
|
defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
|
|
93
93
|
},
|
|
94
|
+
checkConnectionWithSourceVisualRefreshSllv: {
|
|
95
|
+
id: 'linkDataSource.jira-issues.checkConnectionWithSource.visual-refresh-sllv',
|
|
96
|
+
description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
|
|
97
|
+
defaultMessage: 'Check your connection and refresh, or <a>open this project in Jira</a> to review.'
|
|
98
|
+
},
|
|
94
99
|
insertIssuesButtonTextIssueTermRefresh: {
|
|
95
100
|
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
|
|
96
101
|
description: 'Button text to insert the displayed content',
|
|
97
102
|
defaultMessage: 'Insert work items'
|
|
98
103
|
},
|
|
104
|
+
insertIssuesButtonTextIssueTermSllv: {
|
|
105
|
+
id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-sllv',
|
|
106
|
+
description: 'Button text to insert the displayed content',
|
|
107
|
+
defaultMessage: 'Insert results'
|
|
108
|
+
},
|
|
99
109
|
insertIssuesTitleIssueTermRefresh: {
|
|
100
110
|
id: 'linkDataSource.jira-issues.configmodal.insertIssuesTitle-issue-term-refresh',
|
|
101
111
|
description: 'Title for the Jira Issues Datasource config modal',
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
/**
|
|
3
|
+
* This function is used to switch between two components based on a feature flag
|
|
4
|
+
* @param ComponentOld
|
|
5
|
+
* @param ComponentNext
|
|
6
|
+
* @param featureFlagFn function that returns a boolean value to switch to the next component, e.g. () => fg('my_flag_name')
|
|
7
|
+
* @returns
|
|
8
|
+
*/
|
|
9
|
+
export declare const withFeatureFlaggedComponent: <P extends object>(ComponentOld: React.ComponentType<P>, ComponentNext: React.ComponentType<P>, featureFlagFn: () => boolean) => (props: P) => React.JSX.Element;
|
package/dist/types/ui/assets-modal/modal/render-assets-content/initial-state-view/messages.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
export declare const initialStateViewMessages: {
|
|
2
|
+
searchTitleOld: {
|
|
3
|
+
id: string;
|
|
4
|
+
description: string;
|
|
5
|
+
defaultMessage: string;
|
|
6
|
+
};
|
|
2
7
|
searchTitle: {
|
|
3
8
|
id: string;
|
|
4
9
|
description: string;
|
|
@@ -9,6 +14,11 @@ export declare const initialStateViewMessages: {
|
|
|
9
14
|
description: string;
|
|
10
15
|
defaultMessage: string;
|
|
11
16
|
};
|
|
17
|
+
learnMoreLinkOld: {
|
|
18
|
+
id: string;
|
|
19
|
+
description: string;
|
|
20
|
+
defaultMessage: string;
|
|
21
|
+
};
|
|
12
22
|
learnMoreLink: {
|
|
13
23
|
id: string;
|
|
14
24
|
description: string;
|
|
@@ -24,6 +24,11 @@ export declare const loadingErrorMessages: {
|
|
|
24
24
|
description: string;
|
|
25
25
|
defaultMessage: string;
|
|
26
26
|
};
|
|
27
|
+
accessRequiredWithSiteOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
27
32
|
accessRequiredWithSite: {
|
|
28
33
|
id: string;
|
|
29
34
|
description: string;
|
|
@@ -54,11 +59,21 @@ export declare const loadingErrorMessages: {
|
|
|
54
59
|
description: string;
|
|
55
60
|
defaultMessage: string;
|
|
56
61
|
};
|
|
62
|
+
noResultsFoundOld: {
|
|
63
|
+
id: string;
|
|
64
|
+
description: string;
|
|
65
|
+
defaultMessage: string;
|
|
66
|
+
};
|
|
57
67
|
noResultsFound: {
|
|
58
68
|
id: string;
|
|
59
69
|
description: string;
|
|
60
70
|
defaultMessage: string;
|
|
61
71
|
};
|
|
72
|
+
noResultsFoundDescription: {
|
|
73
|
+
id: string;
|
|
74
|
+
description: string;
|
|
75
|
+
defaultMessage: string;
|
|
76
|
+
};
|
|
62
77
|
refreshDuplicate: {
|
|
63
78
|
id: string;
|
|
64
79
|
description: string;
|
|
@@ -84,6 +99,11 @@ export declare const loadingErrorMessages: {
|
|
|
84
99
|
description: string;
|
|
85
100
|
defaultMessage: string;
|
|
86
101
|
};
|
|
102
|
+
unableToLoadResultsOld: {
|
|
103
|
+
id: string;
|
|
104
|
+
description: string;
|
|
105
|
+
defaultMessage: string;
|
|
106
|
+
};
|
|
87
107
|
unableToLoadResults: {
|
|
88
108
|
id: string;
|
|
89
109
|
description: string;
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
interface ModalLoadingErrorProps {
|
|
3
3
|
errorMessage?: React.ReactNode;
|
|
4
|
+
/**
|
|
5
|
+
* This callback function is only consumed when the
|
|
6
|
+
* ff `platform-linking-visual-refresh-sllv` is enabled.
|
|
7
|
+
*/
|
|
8
|
+
onRefresh?: () => void;
|
|
4
9
|
}
|
|
5
|
-
export declare const ModalLoadingError: ({ errorMessage, }: ModalLoadingErrorProps) => JSX.Element;
|
|
10
|
+
export declare const ModalLoadingError: ({ errorMessage, onRefresh, }: ModalLoadingErrorProps) => JSX.Element;
|
|
6
11
|
export {};
|
|
@@ -24,6 +24,11 @@ export declare const initialStateViewMessages: {
|
|
|
24
24
|
description: string;
|
|
25
25
|
defaultMessage: string;
|
|
26
26
|
};
|
|
27
|
+
learnMoreLinkOld: {
|
|
28
|
+
id: string;
|
|
29
|
+
description: string;
|
|
30
|
+
defaultMessage: string;
|
|
31
|
+
};
|
|
27
32
|
learnMoreLink: {
|
|
28
33
|
id: string;
|
|
29
34
|
description: string;
|
|
@@ -39,4 +44,9 @@ export declare const initialStateViewMessages: {
|
|
|
39
44
|
description: string;
|
|
40
45
|
defaultMessage: string;
|
|
41
46
|
};
|
|
47
|
+
searchDescriptionForBasicSearchVisualRefreshSllv: {
|
|
48
|
+
id: string;
|
|
49
|
+
description: string;
|
|
50
|
+
defaultMessage: string;
|
|
51
|
+
};
|
|
42
52
|
};
|