@atlaskit/link-datasource 4.5.0 → 4.7.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 +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/search-container/object-schema-select/index.js +7 -2
- 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/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/search-count/index.js +9 -3
- 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 +5 -1
- 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 +5 -1
- 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/search-container/object-schema-select/index.js +5 -2
- 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/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/search-count/index.js +7 -2
- 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 +5 -1
- 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 +5 -1
- 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/search-container/object-schema-select/index.js +7 -2
- 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/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/search-count/index.js +9 -3
- 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 +5 -1
- 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 +5 -1
- 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/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/common/modal/search-count/index.d.ts +6 -1
- package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.d.ts +25 -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/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/common/modal/search-count/index.d.ts +6 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.d.ts +25 -0
- package/package.json +5 -5
|
@@ -3,13 +3,17 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
3
3
|
import "./footer.compiled.css";
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
5
|
import React from 'react';
|
|
6
|
+
import { cx } from '@compiled/react';
|
|
6
7
|
import { FormattedMessage } from 'react-intl-next';
|
|
8
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
9
|
import { Flex, Inline } from '@atlaskit/primitives/compiled';
|
|
8
10
|
import { N40 } from '@atlaskit/theme/colors';
|
|
9
11
|
import { asyncPopupSelectMessages } from './messages';
|
|
10
12
|
var styles = {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
footerContainerStylesOld: "_ca0q1b66 _n3td1b66 _uwhke4h9 _15a5nqa1 _1i53b5v6",
|
|
14
|
+
footerContainerStyles: "_ca0qutpp _n3tdutpp _19bvpxbi _u5f3pxbi _uwhke4h9 _15a5nqa1 _1i53b5v6",
|
|
15
|
+
footerPaginationInfoStylesOld: "_1mouu2gc _195gutpp _syaz131l",
|
|
16
|
+
footerPaginationInfoStyles: "_syaz131l"
|
|
13
17
|
};
|
|
14
18
|
var PopupFooter = function PopupFooter(_ref) {
|
|
15
19
|
var currentDisplayCount = _ref.currentDisplayCount,
|
|
@@ -20,9 +24,9 @@ var PopupFooter = function PopupFooter(_ref) {
|
|
|
20
24
|
direction: "row",
|
|
21
25
|
alignItems: "center",
|
|
22
26
|
justifyContent: "end",
|
|
23
|
-
xcss: styles.footerContainerStyles
|
|
27
|
+
xcss: cx(fg('platform-linking-visual-refresh-sllv') ? styles.footerContainerStyles : styles.footerContainerStylesOld)
|
|
24
28
|
}, /*#__PURE__*/React.createElement(Inline, {
|
|
25
|
-
xcss: styles.footerPaginationInfoStyles
|
|
29
|
+
xcss: cx(fg('platform-linking-visual-refresh-sllv') ? styles.footerPaginationInfoStyles : styles.footerPaginationInfoStylesOld)
|
|
26
30
|
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, asyncPopupSelectMessages.paginationDetails, {
|
|
27
31
|
values: {
|
|
28
32
|
currentDisplayCount: currentDisplayCount,
|
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
3
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
4
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
4
5
|
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
5
6
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
6
7
|
var _excluded = ["isOpen"];
|
|
8
|
+
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; }
|
|
9
|
+
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; }
|
|
7
10
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
8
11
|
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
9
12
|
import isEqual from 'lodash/isEqual';
|
|
10
13
|
import { useIntl } from 'react-intl-next';
|
|
14
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
15
|
import { CheckboxOption, PopupSelect } from '@atlaskit/select';
|
|
12
16
|
import { useDatasourceAnalyticsEvents } from '../../../../analytics';
|
|
17
|
+
import { CheckboxOptionVisualRefreshSllv } from './checkbox-option-visual-refresh-sllv';
|
|
13
18
|
import CustomControl from './control';
|
|
14
19
|
import CustomDropdownIndicator from './dropdownIndicator';
|
|
15
20
|
import PopupFooter from './footer';
|
|
@@ -27,6 +32,7 @@ export var FilterPopupSelect = function FilterPopupSelect(_ref) {
|
|
|
27
32
|
totalCount = _ref$totalCount === void 0 ? 0 : _ref$totalCount,
|
|
28
33
|
status = _ref.status,
|
|
29
34
|
buttonLabel = _ref.buttonLabel,
|
|
35
|
+
searchPlaceholder = _ref.searchPlaceholder,
|
|
30
36
|
_ref$showLoading = _ref.showLoading,
|
|
31
37
|
showLoading = _ref$showLoading === void 0 ? false : _ref$showLoading,
|
|
32
38
|
_ref$isDisabled = _ref.isDisabled,
|
|
@@ -174,17 +180,33 @@ export var FilterPopupSelect = function FilterPopupSelect(_ref) {
|
|
|
174
180
|
shouldCloseMenuOnTab: false,
|
|
175
181
|
hideSelectedOptions: false,
|
|
176
182
|
isLoading: showLoading,
|
|
177
|
-
placeholder: formatMessage(asyncPopupSelectMessages.selectPlaceholder)
|
|
183
|
+
placeholder: searchPlaceholder && fg('platform-linking-visual-refresh-sllv') ? searchPlaceholder : formatMessage(asyncPopupSelectMessages.selectPlaceholder)
|
|
178
184
|
// @ts-ignore - https://product-fabric.atlassian.net/browse/DSP-21000
|
|
179
185
|
,
|
|
180
186
|
menuListProps: menuListProps,
|
|
181
187
|
components: {
|
|
182
|
-
Option: CheckboxOption,
|
|
188
|
+
Option: fg('platform-linking-visual-refresh-sllv') ? CheckboxOptionVisualRefreshSllv : CheckboxOption,
|
|
183
189
|
Control: CustomControl,
|
|
184
190
|
MenuList: CustomMenuList,
|
|
185
191
|
DropdownIndicator: CustomDropdownIndicator,
|
|
186
192
|
LoadingIndicator: undefined // disables the three ... indicator in the searchbox when picker is loading
|
|
187
|
-
}
|
|
193
|
+
}
|
|
194
|
+
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
|
|
195
|
+
,
|
|
196
|
+
styles: fg('platform-linking-visual-refresh-sllv') ? {
|
|
197
|
+
container: function container(base) {
|
|
198
|
+
return _objectSpread(_objectSpread({}, base), {}, {
|
|
199
|
+
paddingTop: "var(--ds-space-075, 6px)",
|
|
200
|
+
paddingBottom: 0
|
|
201
|
+
});
|
|
202
|
+
},
|
|
203
|
+
menuList: function menuList(base) {
|
|
204
|
+
return _objectSpread(_objectSpread({}, base), {}, {
|
|
205
|
+
paddingTop: "var(--ds-space-050, 4px)",
|
|
206
|
+
paddingBottom: 0
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
} : undefined,
|
|
188
210
|
options: sortedOptions,
|
|
189
211
|
value: selectedOptions,
|
|
190
212
|
filterOption: noFilterOptions,
|
|
@@ -7,6 +7,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
|
|
|
7
7
|
import { N500 } from '@atlaskit/theme/colors';
|
|
8
8
|
import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
|
|
9
9
|
import { SpotError } from '../../../../../common/ui/spot/error-state/error';
|
|
10
|
+
import { SpotErrorOld } from '../../../../../common/ui/spot/error-state/error-old';
|
|
10
11
|
import { SEARCH_DEBOUNCE_MS } from '../constants';
|
|
11
12
|
import { asyncPopupSelectMessages } from './messages';
|
|
12
13
|
import CustomSelectMessage from './selectMessage';
|
|
@@ -51,15 +52,19 @@ var CustomErrorMessage = function CustomErrorMessage(_ref3) {
|
|
|
51
52
|
},
|
|
52
53
|
formatMessage = _ref4.formatMessage;
|
|
53
54
|
return /*#__PURE__*/React.createElement(CustomSelectMessage, {
|
|
54
|
-
icon: fg('
|
|
55
|
-
size:
|
|
55
|
+
icon: fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(SpotError, {
|
|
56
|
+
size: "large",
|
|
56
57
|
alt: formatMessage(asyncPopupSelectMessages.errorMessage)
|
|
58
|
+
}) : fg('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(SpotErrorOld, {
|
|
59
|
+
size: 'medium',
|
|
60
|
+
alt: formatMessage(asyncPopupSelectMessages.errorMessageOld)
|
|
57
61
|
}) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ErrorIcon, {
|
|
58
62
|
primaryColor: "var(--ds-icon, ".concat(N500, ")"),
|
|
59
63
|
label: "",
|
|
60
64
|
size: "xlarge"
|
|
61
65
|
})),
|
|
62
|
-
message: asyncPopupSelectMessages.errorMessage,
|
|
66
|
+
message: fg('platform-linking-visual-refresh-sllv') ? asyncPopupSelectMessages.errorMessage : asyncPopupSelectMessages.errorMessageOld,
|
|
67
|
+
description: fg('platform-linking-visual-refresh-sllv') ? asyncPopupSelectMessages.errorDescription : undefined,
|
|
63
68
|
testId: "".concat(filterName, "--error-message")
|
|
64
69
|
});
|
|
65
70
|
};
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
._19bv12x7{padding-left:var(--ds-space-075,6px)}
|
|
2
|
+
._19bvpxbi{padding-left:var(--ds-space-200,1pc)}
|
|
2
3
|
._ca0q12x7{padding-top:var(--ds-space-075,6px)}
|
|
3
|
-
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
4
|
+
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
5
|
+
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
6
|
+
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
@@ -4,6 +4,8 @@ var _excluded = ["children"];
|
|
|
4
4
|
import "./index.compiled.css";
|
|
5
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
6
6
|
import React from 'react';
|
|
7
|
+
import { cx } from '@compiled/react';
|
|
8
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
9
|
import { Box, Flex } from '@atlaskit/primitives/compiled';
|
|
8
10
|
import { components } from '@atlaskit/select';
|
|
9
11
|
import Spinner from '@atlaskit/spinner';
|
|
@@ -13,7 +15,8 @@ import CustomNoOptionsMessage from './noOptionsMessage';
|
|
|
13
15
|
import ShowMoreButton from './showMoreButton';
|
|
14
16
|
var styles = {
|
|
15
17
|
inlineSpinnerStyles: "_ca0q12x7",
|
|
16
|
-
|
|
18
|
+
showMoreButtonBoxStylesOld: "_19bv12x7 _ca0qu2gc",
|
|
19
|
+
showMoreButtonBoxStyles: "_ca0qu2gc _u5f3u2gc _n3tdu2gc _19bvpxbi"
|
|
17
20
|
};
|
|
18
21
|
var CustomMenuList = function CustomMenuList(_ref) {
|
|
19
22
|
var children = _ref.children,
|
|
@@ -57,7 +60,7 @@ var CustomMenuList = function CustomMenuList(_ref) {
|
|
|
57
60
|
});
|
|
58
61
|
}
|
|
59
62
|
return /*#__PURE__*/React.createElement(React.Fragment, null, children, shouldDisplayShowMore && handleShowMore && /*#__PURE__*/React.createElement(Box, {
|
|
60
|
-
xcss: styles.showMoreButtonBoxStyles
|
|
63
|
+
xcss: cx(fg('platform-linking-visual-refresh-sllv') ? styles.showMoreButtonBoxStyles : styles.showMoreButtonBoxStylesOld)
|
|
61
64
|
}, /*#__PURE__*/React.createElement(ShowMoreButton, {
|
|
62
65
|
onShowMore: handleShowMore,
|
|
63
66
|
filterName: filterName
|
|
@@ -7,14 +7,34 @@ export var asyncPopupSelectMessages = defineMessages({
|
|
|
7
7
|
},
|
|
8
8
|
noOptionsMessage: {
|
|
9
9
|
id: 'linkDataSource.basic-filter.no-options-message',
|
|
10
|
+
defaultMessage: "We couldn't find anything matching your search",
|
|
11
|
+
description: 'The text for when no matches are found in dropdown'
|
|
12
|
+
},
|
|
13
|
+
noOptionsMessageOld: {
|
|
14
|
+
id: 'linkDataSource.basic-filter.no-options-message-old',
|
|
10
15
|
defaultMessage: 'No matches found',
|
|
11
16
|
description: 'The text for when no matches are found in dropdown'
|
|
12
17
|
},
|
|
18
|
+
noOptionsDescription: {
|
|
19
|
+
id: 'linkDataSource.basic-filter.no-options-description',
|
|
20
|
+
defaultMessage: 'Try again with a different term.',
|
|
21
|
+
description: 'The helper text for when no matches are found in dropdown'
|
|
22
|
+
},
|
|
13
23
|
errorMessage: {
|
|
14
|
-
id: 'linkDataSource.basic-filter.
|
|
24
|
+
id: 'linkDataSource.basic-filter.errorMessage',
|
|
25
|
+
defaultMessage: 'We ran into an issue trying to load results',
|
|
26
|
+
description: 'The text for when an error occurs when loading options'
|
|
27
|
+
},
|
|
28
|
+
errorMessageOld: {
|
|
29
|
+
id: 'linkDataSource.basic-filter.errorMessageOld',
|
|
15
30
|
defaultMessage: 'Something went wrong',
|
|
16
31
|
description: 'The text for when an error occurs when loading options'
|
|
17
32
|
},
|
|
33
|
+
errorDescription: {
|
|
34
|
+
id: 'linkDataSource.basic-filter.error-description',
|
|
35
|
+
defaultMessage: 'Check your connection and refresh',
|
|
36
|
+
description: 'The helper text for when no matches are found in dropdown'
|
|
37
|
+
},
|
|
18
38
|
showMoreMessage: {
|
|
19
39
|
id: 'linkDataSource.basic-filter.showMoreButton',
|
|
20
40
|
defaultMessage: 'Show more',
|
|
@@ -40,14 +40,15 @@ var CustomNoOptionsMessage = function CustomNoOptionsMessage(_ref) {
|
|
|
40
40
|
formatMessage = _ref2.formatMessage;
|
|
41
41
|
return /*#__PURE__*/React.createElement(CustomSelectMessage, {
|
|
42
42
|
icon: fg('bandicoots-update-sllv-icons') ? /*#__PURE__*/React.createElement(SpotSearchNoResult, {
|
|
43
|
-
size: 'medium',
|
|
44
|
-
alt: formatMessage(asyncPopupSelectMessages.noOptionsMessage)
|
|
43
|
+
size: fg('platform-linking-visual-refresh-sllv') ? 'large' : 'medium',
|
|
44
|
+
alt: formatMessage(fg('platform-linking-visual-refresh-sllv') ? asyncPopupSelectMessages.noOptionsMessage : asyncPopupSelectMessages.noOptionsMessageOld)
|
|
45
45
|
}) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QuestionCircleIcon, {
|
|
46
46
|
primaryColor: "var(--ds-icon, ".concat(N500, ")"),
|
|
47
47
|
size: "xlarge",
|
|
48
48
|
label: ""
|
|
49
49
|
})),
|
|
50
|
-
message: asyncPopupSelectMessages.noOptionsMessage,
|
|
50
|
+
message: fg('platform-linking-visual-refresh-sllv') ? asyncPopupSelectMessages.noOptionsMessage : asyncPopupSelectMessages.noOptionsMessageOld,
|
|
51
|
+
description: fg('platform-linking-visual-refresh-sllv') ? asyncPopupSelectMessages.noOptionsDescription : undefined,
|
|
51
52
|
testId: "".concat(filterName, "--no-options-message")
|
|
52
53
|
});
|
|
53
54
|
};
|
|
@@ -1,6 +1,13 @@
|
|
|
1
|
+
|
|
2
|
+
._zulppxbi{gap:var(--ds-space-200,1pc)}._19bvoahv{padding-left:var(--ds-space-600,3pc)}
|
|
1
3
|
._19bvutpp{padding-left:var(--ds-space-150,9pt)}
|
|
4
|
+
._4t3i16xz{height:6pc}
|
|
2
5
|
._4t3ivbgk{height:4pc}
|
|
6
|
+
._ca0q1jfw{padding-top:var(--ds-space-500,40px)}
|
|
3
7
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
8
|
+
._n3td1jfw{padding-bottom:var(--ds-space-500,40px)}
|
|
4
9
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
5
10
|
._otyrpxbi{margin-bottom:var(--ds-space-200,1pc)}
|
|
6
|
-
.
|
|
11
|
+
._u5f3oahv{padding-right:var(--ds-space-600,3pc)}
|
|
12
|
+
._u5f3utpp{padding-right:var(--ds-space-150,9pt)}
|
|
13
|
+
._y3gn1h6o{text-align:center}
|
|
@@ -4,21 +4,40 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { FormattedMessage } from 'react-intl-next';
|
|
6
6
|
import Heading from '@atlaskit/heading';
|
|
7
|
-
import {
|
|
7
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
|
+
import { Flex, Stack, Text } from '@atlaskit/primitives/compiled';
|
|
8
9
|
var styles = {
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
boxStylesOld: "_4t3ivbgk _otyrpxbi",
|
|
11
|
+
boxStyles: "_4t3i16xz",
|
|
12
|
+
stackStylesOld: "_ca0qu2gc _n3tdu2gc _19bvutpp _u5f3utpp",
|
|
13
|
+
stackStyles: "_zulppxbi _ca0q1jfw _n3td1jfw _19bvoahv _u5f3oahv _y3gn1h6o"
|
|
11
14
|
};
|
|
12
15
|
var CustomSelectMessage = function CustomSelectMessage(_ref) {
|
|
13
16
|
var icon = _ref.icon,
|
|
14
17
|
message = _ref.message,
|
|
18
|
+
description = _ref.description,
|
|
15
19
|
testId = _ref.testId;
|
|
20
|
+
if (fg('platform-linking-visual-refresh-sllv')) {
|
|
21
|
+
return /*#__PURE__*/React.createElement(Stack, {
|
|
22
|
+
xcss: styles.stackStyles,
|
|
23
|
+
testId: testId,
|
|
24
|
+
alignInline: "center"
|
|
25
|
+
}, /*#__PURE__*/React.createElement(Flex, {
|
|
26
|
+
xcss: styles.boxStyles,
|
|
27
|
+
alignItems: "center",
|
|
28
|
+
justifyContent: "center"
|
|
29
|
+
}, icon), /*#__PURE__*/React.createElement(Heading, {
|
|
30
|
+
size: "small"
|
|
31
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, message)), description && /*#__PURE__*/React.createElement(Text, {
|
|
32
|
+
size: "medium"
|
|
33
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, description)));
|
|
34
|
+
}
|
|
16
35
|
return /*#__PURE__*/React.createElement(Stack, {
|
|
17
|
-
xcss: styles.
|
|
36
|
+
xcss: styles.stackStylesOld,
|
|
18
37
|
testId: testId,
|
|
19
38
|
alignInline: "center"
|
|
20
39
|
}, /*#__PURE__*/React.createElement(Flex, {
|
|
21
|
-
xcss: styles.
|
|
40
|
+
xcss: styles.boxStylesOld,
|
|
22
41
|
alignItems: "center",
|
|
23
42
|
justifyContent: "center"
|
|
24
43
|
}, icon), /*#__PURE__*/React.createElement(Heading, {
|
|
@@ -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"
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
2
|
import _extends from "@babel/runtime/helpers/extends";
|
|
3
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
4
|
import "./index.compiled.css";
|
|
4
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
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
|
+
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; }
|
|
5
8
|
import React from 'react';
|
|
6
9
|
import { FormattedMessage, FormattedNumber } from 'react-intl-next';
|
|
7
10
|
import Heading from '@atlaskit/heading';
|
|
@@ -16,6 +19,7 @@ var styles = {
|
|
|
16
19
|
};
|
|
17
20
|
var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
18
21
|
var url = _ref.url,
|
|
22
|
+
additionalStyles = _ref.styles,
|
|
19
23
|
children = _ref.children,
|
|
20
24
|
testId = _ref.testId;
|
|
21
25
|
return /*#__PURE__*/React.createElement(Flex, {
|
|
@@ -28,10 +32,10 @@ var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
|
28
32
|
testId: "item-count-url"
|
|
29
33
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
30
34
|
,
|
|
31
|
-
style: {
|
|
35
|
+
style: _objectSpread({
|
|
32
36
|
color: fg('platform-linking-visual-refresh-sllv') ? "var(--ds-text-subtlest, #626F86)" : "var(--ds-text-accent-gray, ".concat(N800, ")"),
|
|
33
37
|
textDecoration: !url ? 'none' : ''
|
|
34
|
-
}
|
|
38
|
+
}, fg('platform-linking-visual-refresh-sllv') && additionalStyles)
|
|
35
39
|
}, fg('platform-linking-visual-refresh-sllv') ? children : /*#__PURE__*/React.createElement(Heading, {
|
|
36
40
|
size: "xxsmall"
|
|
37
41
|
}, children)));
|
|
@@ -57,6 +61,7 @@ export var AssetsItemCount = function AssetsItemCount(_ref2) {
|
|
|
57
61
|
var TableSearchCount = function TableSearchCount(_ref3) {
|
|
58
62
|
var url = _ref3.url,
|
|
59
63
|
searchCount = _ref3.searchCount,
|
|
64
|
+
additionalStyles = _ref3.styles,
|
|
60
65
|
_ref3$testId = _ref3.testId,
|
|
61
66
|
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
62
67
|
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
@@ -65,7 +70,8 @@ var TableSearchCount = function TableSearchCount(_ref3) {
|
|
|
65
70
|
var messageKey = isIssue && fg('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : "".concat(prefixTextType, "CountText");
|
|
66
71
|
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
67
72
|
testId: testId,
|
|
68
|
-
url: url
|
|
73
|
+
url: url,
|
|
74
|
+
styles: additionalStyles
|
|
69
75
|
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[messageKey], {
|
|
70
76
|
values: {
|
|
71
77
|
searchCount: searchCount
|
|
@@ -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;
|
|
@@ -353,7 +353,11 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
|
|
|
353
353
|
searchCount: totalCount,
|
|
354
354
|
url: confluenceSearchUrl,
|
|
355
355
|
prefixTextType: "result",
|
|
356
|
-
testId: "confluence-search-datasource-modal-total-results-count"
|
|
356
|
+
testId: "confluence-search-datasource-modal-total-results-count",
|
|
357
|
+
styles: fg('platform-linking-visual-refresh-sllv') ? {
|
|
358
|
+
color: "var(--ds-text, #172B4D)",
|
|
359
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
360
|
+
} : undefined
|
|
357
361
|
}), /*#__PURE__*/React.createElement(CancelButton, {
|
|
358
362
|
onCancel: onCancel,
|
|
359
363
|
getAnalyticsPayload: getButtonAnalyticsPayload,
|
|
@@ -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
|
});
|