@atlaskit/link-datasource 7.3.5 → 7.5.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 +20 -0
- package/compass.yml +7 -10
- package/dist/cjs/ui/assets-modal/search-container/aql-search-input/index.js +2 -2
- package/dist/cjs/ui/assets-modal/search-container/index.js +4 -4
- package/dist/cjs/ui/common/error-state/access-required.js +2 -2
- package/dist/cjs/ui/common/error-state/loading-error.js +7 -5
- package/dist/cjs/ui/common/error-state/modal-loading-error.js +6 -5
- package/dist/cjs/ui/common/error-state/no-instances.js +5 -4
- package/dist/cjs/ui/common/error-state/no-results.js +7 -6
- package/dist/cjs/ui/common/modal/basic-search-input/index.js +2 -2
- package/dist/cjs/ui/common/modal/content-container/index.js +2 -2
- package/dist/cjs/ui/common/modal/count-view-smart-link/smart-card-placeholder.js +3 -3
- package/dist/cjs/ui/common/modal/count-view-smart-link/smart-link.js +2 -2
- package/dist/cjs/ui/common/modal/display-view-dropdown/display-view-drop-down.js +2 -2
- package/dist/cjs/ui/common/modal/popup-select/CustomControl.js +2 -2
- package/dist/cjs/ui/common/modal/popup-select/dropdownIndicator.js +2 -2
- package/dist/cjs/ui/common/modal/popup-select/footer.js +4 -3
- package/dist/cjs/ui/common/modal/popup-select/formatOptionLabel.js +6 -5
- package/dist/cjs/ui/common/modal/popup-select/menu-list/index.js +4 -3
- package/dist/cjs/ui/common/modal/popup-select/menu-list/selectMessage.js +6 -4
- package/dist/cjs/ui/common/modal/popup-select/trigger.js +5 -4
- package/dist/cjs/ui/common/modal/search-count/ItemCountWrapper.js +2 -2
- package/dist/cjs/ui/common/modal/site-selector/index.js +2 -2
- package/dist/cjs/ui/confluence-search-modal/basic-filters/index.js +2 -2
- package/dist/cjs/ui/confluence-search-modal/confluence-search-container/index.js +6 -4
- package/dist/cjs/ui/datasource-table-view/datasourceTableView.js +25 -1
- package/dist/cjs/ui/issue-like-table/render-type/link/index.js +9 -9
- package/dist/cjs/ui/issue-like-table/shared-components/avatar/index.js +3 -3
- package/dist/cjs/ui/issue-like-table/shared-components/icon/index.js +6 -4
- package/dist/cjs/ui/issue-like-table/table-cell-content/get-linked-cell-content.js +2 -2
- package/dist/cjs/ui/issue-like-table/table-cell-content/inline-edit.js +2 -2
- package/dist/cjs/ui/issue-like-table/table-cell-content/linked-cell-content-wrapped.js +2 -2
- package/dist/cjs/ui/issue-like-table/table-settings-menu/TableSettingsMenu.js +5 -4
- package/dist/cjs/ui/jira-issues-modal/basic-filters/hooks/useHydrateJqlQuery.js +2 -2
- package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/index.js +2 -2
- package/dist/cjs/ui/jira-issues-modal/basic-filters/utils/extractValuesFromNonComplexJQL.js +13 -10
- package/dist/cjs/ui/jira-issues-modal/basic-filters/utils/index.js +2 -2
- package/dist/cjs/ui/jira-issues-modal/basic-filters/utils/isClauseTooComplex.js +5 -4
- package/dist/cjs/ui/jira-issues-modal/basic-filters/utils/isQueryTooComplex.js +16 -13
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/buildJQL.js +20 -15
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +7 -5
- package/dist/cjs/ui/table-footer/index.js +9 -7
- package/dist/cjs/ui/table-footer/powered-by-jsm-assets/index.js +5 -5
- package/dist/cjs/ui/table-footer/provider-link/index.js +6 -5
- package/dist/es2019/ui/assets-modal/search-container/aql-search-input/index.js +1 -1
- package/dist/es2019/ui/assets-modal/search-container/index.js +1 -1
- package/dist/es2019/ui/common/error-state/access-required.js +1 -1
- package/dist/es2019/ui/common/error-state/loading-error.js +3 -1
- package/dist/es2019/ui/common/error-state/modal-loading-error.js +2 -1
- package/dist/es2019/ui/common/error-state/no-instances.js +2 -1
- package/dist/es2019/ui/common/error-state/no-results.js +2 -1
- package/dist/es2019/ui/common/modal/basic-search-input/index.js +1 -1
- package/dist/es2019/ui/common/modal/content-container/index.js +1 -1
- package/dist/es2019/ui/common/modal/count-view-smart-link/smart-card-placeholder.js +1 -1
- package/dist/es2019/ui/common/modal/count-view-smart-link/smart-link.js +1 -1
- package/dist/es2019/ui/common/modal/display-view-dropdown/display-view-drop-down.js +1 -1
- package/dist/es2019/ui/common/modal/popup-select/CustomControl.js +1 -1
- package/dist/es2019/ui/common/modal/popup-select/dropdownIndicator.js +1 -1
- package/dist/es2019/ui/common/modal/popup-select/footer.js +2 -1
- package/dist/es2019/ui/common/modal/popup-select/formatOptionLabel.js +2 -1
- package/dist/es2019/ui/common/modal/popup-select/menu-list/index.js +2 -1
- package/dist/es2019/ui/common/modal/popup-select/menu-list/selectMessage.js +3 -1
- package/dist/es2019/ui/common/modal/popup-select/trigger.js +2 -1
- package/dist/es2019/ui/common/modal/search-count/ItemCountWrapper.js +1 -1
- package/dist/es2019/ui/common/modal/site-selector/index.js +1 -1
- package/dist/es2019/ui/confluence-search-modal/basic-filters/index.js +1 -1
- package/dist/es2019/ui/confluence-search-modal/confluence-search-container/index.js +3 -1
- package/dist/es2019/ui/datasource-table-view/datasourceTableView.js +25 -1
- package/dist/es2019/ui/issue-like-table/render-type/link/index.js +3 -3
- package/dist/es2019/ui/issue-like-table/shared-components/avatar/index.js +1 -1
- package/dist/es2019/ui/issue-like-table/shared-components/icon/index.js +3 -1
- package/dist/es2019/ui/issue-like-table/table-cell-content/get-linked-cell-content.js +1 -1
- package/dist/es2019/ui/issue-like-table/table-cell-content/inline-edit.js +1 -1
- package/dist/es2019/ui/issue-like-table/table-cell-content/linked-cell-content-wrapped.js +1 -1
- package/dist/es2019/ui/issue-like-table/table-settings-menu/TableSettingsMenu.js +2 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/hooks/useHydrateJqlQuery.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/index.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/utils/extractValuesFromNonComplexJQL.js +4 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/utils/index.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/utils/isClauseTooComplex.js +2 -1
- package/dist/es2019/ui/jira-issues-modal/basic-filters/utils/isQueryTooComplex.js +4 -1
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/buildJQL.js +6 -1
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +3 -1
- package/dist/es2019/ui/table-footer/index.js +3 -1
- package/dist/es2019/ui/table-footer/powered-by-jsm-assets/index.js +2 -2
- package/dist/es2019/ui/table-footer/provider-link/index.js +3 -2
- package/dist/esm/ui/assets-modal/search-container/aql-search-input/index.js +1 -1
- package/dist/esm/ui/assets-modal/search-container/index.js +1 -1
- package/dist/esm/ui/common/error-state/access-required.js +1 -1
- package/dist/esm/ui/common/error-state/loading-error.js +3 -1
- package/dist/esm/ui/common/error-state/modal-loading-error.js +2 -1
- package/dist/esm/ui/common/error-state/no-instances.js +2 -1
- package/dist/esm/ui/common/error-state/no-results.js +2 -1
- package/dist/esm/ui/common/modal/basic-search-input/index.js +1 -1
- package/dist/esm/ui/common/modal/content-container/index.js +1 -1
- package/dist/esm/ui/common/modal/count-view-smart-link/smart-card-placeholder.js +1 -1
- package/dist/esm/ui/common/modal/count-view-smart-link/smart-link.js +1 -1
- package/dist/esm/ui/common/modal/display-view-dropdown/display-view-drop-down.js +1 -1
- package/dist/esm/ui/common/modal/popup-select/CustomControl.js +1 -1
- package/dist/esm/ui/common/modal/popup-select/dropdownIndicator.js +1 -1
- package/dist/esm/ui/common/modal/popup-select/footer.js +2 -1
- package/dist/esm/ui/common/modal/popup-select/formatOptionLabel.js +2 -1
- package/dist/esm/ui/common/modal/popup-select/menu-list/index.js +2 -1
- package/dist/esm/ui/common/modal/popup-select/menu-list/selectMessage.js +3 -1
- package/dist/esm/ui/common/modal/popup-select/trigger.js +2 -1
- package/dist/esm/ui/common/modal/search-count/ItemCountWrapper.js +1 -1
- package/dist/esm/ui/common/modal/site-selector/index.js +1 -1
- package/dist/esm/ui/confluence-search-modal/basic-filters/index.js +1 -1
- package/dist/esm/ui/confluence-search-modal/confluence-search-container/index.js +3 -1
- package/dist/esm/ui/datasource-table-view/datasourceTableView.js +25 -1
- package/dist/esm/ui/issue-like-table/render-type/link/index.js +3 -3
- package/dist/esm/ui/issue-like-table/shared-components/avatar/index.js +1 -1
- package/dist/esm/ui/issue-like-table/shared-components/icon/index.js +3 -1
- package/dist/esm/ui/issue-like-table/table-cell-content/get-linked-cell-content.js +1 -1
- package/dist/esm/ui/issue-like-table/table-cell-content/inline-edit.js +1 -1
- package/dist/esm/ui/issue-like-table/table-cell-content/linked-cell-content-wrapped.js +1 -1
- package/dist/esm/ui/issue-like-table/table-settings-menu/TableSettingsMenu.js +2 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/hooks/useHydrateJqlQuery.js +1 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/ui/index.js +1 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/utils/extractValuesFromNonComplexJQL.js +4 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/utils/index.js +1 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/utils/isClauseTooComplex.js +2 -1
- package/dist/esm/ui/jira-issues-modal/basic-filters/utils/isQueryTooComplex.js +4 -1
- package/dist/esm/ui/jira-issues-modal/jira-search-container/buildJQL.js +6 -1
- package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +3 -1
- package/dist/esm/ui/table-footer/index.js +3 -1
- package/dist/esm/ui/table-footer/powered-by-jsm-assets/index.js +2 -2
- package/dist/esm/ui/table-footer/provider-link/index.js +3 -2
- package/dist/types/ui/datasource-table-view/datasourceTableView.d.ts +3 -0
- package/dist/types/ui/datasource-table-view/types.d.ts +13 -0
- package/dist/types/ui/jira-issues-modal/basic-filters/utils/isClauseTooComplex.d.ts +1 -1
- package/dist/types/ui/jira-issues-modal/jql-editor/index.d.ts +1 -1
- package/examples-helpers/fakeModalDialogContainer.tsx +1 -1
- package/package.json +12 -9
|
@@ -11,7 +11,7 @@ var _runtime = require("@compiled/react/runtime");
|
|
|
11
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
13
|
var _react = _interopRequireDefault(require("react"));
|
|
14
|
-
var
|
|
14
|
+
var _flex = require("@atlaskit/primitives/compiled/flex");
|
|
15
15
|
var _dateRangePicker = require("./filters/date-range-picker");
|
|
16
16
|
var _editedOrCreatedBy = _interopRequireDefault(require("./filters/edited-or-created-by"));
|
|
17
17
|
var _types = require("./types");
|
|
@@ -38,7 +38,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
|
|
|
38
38
|
label: updatedOption.value
|
|
39
39
|
}, updatedOption));
|
|
40
40
|
};
|
|
41
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
41
|
+
return /*#__PURE__*/_react.default.createElement(_flex.Flex, {
|
|
42
42
|
xcss: styles.basicFilterContainerStyles,
|
|
43
43
|
gap: "space.100",
|
|
44
44
|
testId: "clol-basic-filter-container"
|
|
@@ -14,7 +14,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
14
14
|
var _react = _interopRequireWildcard(require("react"));
|
|
15
15
|
var _reactIntl = require("react-intl");
|
|
16
16
|
var _useDebounce = require("use-debounce");
|
|
17
|
-
var
|
|
17
|
+
var _box = require("@atlaskit/primitives/compiled/box");
|
|
18
|
+
var _flex = require("@atlaskit/primitives/compiled/flex");
|
|
19
|
+
var _text = require("@atlaskit/primitives/compiled/text");
|
|
18
20
|
var _basicSearchInput = require("../../common/modal/basic-search-input");
|
|
19
21
|
var _constants = require("../../common/modal/popup-select/constants");
|
|
20
22
|
var _basicFilters = _interopRequireDefault(require("../basic-filters"));
|
|
@@ -112,9 +114,9 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
|
|
|
112
114
|
});
|
|
113
115
|
}
|
|
114
116
|
}, [users, status, filterSelections.lastModified]);
|
|
115
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
117
|
+
return /*#__PURE__*/_react.default.createElement(_box.Box, {
|
|
116
118
|
xcss: styles.basicSearchInputBoxStyles
|
|
117
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
119
|
+
}, /*#__PURE__*/_react.default.createElement(_flex.Flex, {
|
|
118
120
|
alignItems: "center",
|
|
119
121
|
xcss: styles.basicSearchInputContainerStyles
|
|
120
122
|
}, /*#__PURE__*/_react.default.createElement(_basicSearchInput.BasicSearchInput, {
|
|
@@ -130,7 +132,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
|
|
|
130
132
|
selections: filterSelections,
|
|
131
133
|
onChange: handleBasicFilterSelectionChange,
|
|
132
134
|
isHydrating: status === 'loading'
|
|
133
|
-
})), /*#__PURE__*/_react.default.createElement(
|
|
135
|
+
})), /*#__PURE__*/_react.default.createElement(_text.Text, {
|
|
134
136
|
size: "small",
|
|
135
137
|
color: "color.text.subtlest",
|
|
136
138
|
testId: "confluence-search-placeholder"
|
|
@@ -54,7 +54,8 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
54
54
|
onWrappedColumnChange = _ref.onWrappedColumnChange,
|
|
55
55
|
onWrappedColumnsChange = _ref.onWrappedColumnsChange,
|
|
56
56
|
_ref$scrollableContai = _ref.scrollableContainerHeight,
|
|
57
|
-
scrollableContainerHeight = _ref$scrollableContai === void 0 ? DefaultScrollableContainerHeight : _ref$scrollableContai
|
|
57
|
+
scrollableContainerHeight = _ref$scrollableContai === void 0 ? DefaultScrollableContainerHeight : _ref$scrollableContai,
|
|
58
|
+
onRequestSettled = _ref.onRequestSettled;
|
|
58
59
|
// Local copy lets us apply in-session sort mutations without mutating external parameters.
|
|
59
60
|
var _useState = (0, _react.useState)(parameters),
|
|
60
61
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
@@ -144,6 +145,29 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
144
145
|
});
|
|
145
146
|
}
|
|
146
147
|
}, [totalCount, fireEvent, status, extensionKey, destinationObjectTypes, isDataReady]);
|
|
148
|
+
|
|
149
|
+
// Last outcome reported to `onRequestSettled`, cleared while a request is in flight so every
|
|
150
|
+
// settled request is reported exactly once.
|
|
151
|
+
var lastSettledResultRef = (0, _react.useRef)(null);
|
|
152
|
+
(0, _react.useEffect)(function () {
|
|
153
|
+
if (!(0, _fg.fg)('platform_lp_sllv_on_request_settled')) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
if (status !== 'resolved' && status !== 'rejected' && status !== 'unauthorized' && status !== 'forbidden') {
|
|
157
|
+
lastSettledResultRef.current = null;
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
var result = {
|
|
161
|
+
itemCount: responseItems.length,
|
|
162
|
+
status: status,
|
|
163
|
+
totalCount: totalCount
|
|
164
|
+
};
|
|
165
|
+
if ((0, _isEqual.default)(lastSettledResultRef.current, result)) {
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
lastSettledResultRef.current = result;
|
|
169
|
+
onRequestSettled === null || onRequestSettled === void 0 || onRequestSettled(result);
|
|
170
|
+
}, [status, responseItems.length, totalCount, onRequestSettled]);
|
|
147
171
|
(0, _react.useEffect)(function () {
|
|
148
172
|
var shouldStartUfoExperience = datasourceId && parameters && visibleColumnKeys && status === 'loading';
|
|
149
173
|
if (shouldStartUfoExperience) {
|
|
@@ -9,10 +9,10 @@ exports.default = exports.LINK_TYPE_TEST_ID = void 0;
|
|
|
9
9
|
var _react = _interopRequireWildcard(require("react"));
|
|
10
10
|
var _reactIntl = require("react-intl");
|
|
11
11
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
12
|
-
var
|
|
12
|
+
var _lazy = require("@atlaskit/smart-card/card/lazy");
|
|
13
13
|
var _useSmartLinkDestinationUrl = require("@atlaskit/smart-card/hook/use-smart-link-destination-url");
|
|
14
|
-
var
|
|
15
|
-
var
|
|
14
|
+
var _hover = require("@atlaskit/smart-card/hover");
|
|
15
|
+
var _link = _interopRequireDefault(require("@atlaskit/smart-card/link"));
|
|
16
16
|
var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden/visually-hidden"));
|
|
17
17
|
var _messages = require("./messages");
|
|
18
18
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
@@ -34,7 +34,7 @@ var SmartCard = function SmartCard(_ref) {
|
|
|
34
34
|
event.preventDefault();
|
|
35
35
|
window.open(crossProductUrl, '_blank', 'noopener, noreferrer');
|
|
36
36
|
};
|
|
37
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
37
|
+
return /*#__PURE__*/_react.default.createElement(_lazy.Card, {
|
|
38
38
|
appearance: "inline",
|
|
39
39
|
onClick: handleClick,
|
|
40
40
|
url: url,
|
|
@@ -57,9 +57,9 @@ var LinkRenderTypeWithXpcWrappingUrl = function LinkRenderTypeWithXpcWrappingUrl
|
|
|
57
57
|
}, [style]);
|
|
58
58
|
var destinationUrl = (0, _useSmartLinkDestinationUrl.useSmartLinkDestinationUrl)(url);
|
|
59
59
|
var anchor = (0, _react.useMemo)(function () {
|
|
60
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
60
|
+
return /*#__PURE__*/_react.default.createElement(_hover.HoverCard, {
|
|
61
61
|
url: url
|
|
62
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
62
|
+
}, /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
63
63
|
href: destinationUrl
|
|
64
64
|
// NOTE: This will no longer apply styles to `@atlaskit/link`.
|
|
65
65
|
// Wrap `@atlaskit/link` in a Text component to provide font styles to Link
|
|
@@ -94,9 +94,9 @@ var LinkRenderType = function LinkRenderType(_ref3) {
|
|
|
94
94
|
return (style === null || style === void 0 ? void 0 : style.appearance) && linkStyles[style.appearance] || {};
|
|
95
95
|
}, [style]);
|
|
96
96
|
var anchor = (0, _react.useMemo)(function () {
|
|
97
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
97
|
+
return /*#__PURE__*/_react.default.createElement(_hover.HoverCard, {
|
|
98
98
|
url: url
|
|
99
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
99
|
+
}, /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
100
100
|
href: url
|
|
101
101
|
// NOTE: This will no longer apply styles to `@atlaskit/link`.
|
|
102
102
|
// Wrap `@atlaskit/link` in a Text component to provide font styles to Link
|
|
@@ -112,7 +112,7 @@ var LinkRenderType = function LinkRenderType(_ref3) {
|
|
|
112
112
|
e.preventDefault();
|
|
113
113
|
window.open(url, '_blank', 'noopener, noreferrer');
|
|
114
114
|
};
|
|
115
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
115
|
+
return /*#__PURE__*/_react.default.createElement(_lazy.Card, {
|
|
116
116
|
appearance: "inline",
|
|
117
117
|
onClick: handleClick,
|
|
118
118
|
url: url,
|
|
@@ -11,7 +11,7 @@ var _runtime = require("@compiled/react/runtime");
|
|
|
11
11
|
var _react = _interopRequireDefault(require("react"));
|
|
12
12
|
var _reactIntl = require("react-intl");
|
|
13
13
|
var _avatar = _interopRequireDefault(require("@atlaskit/avatar/avatar"));
|
|
14
|
-
var
|
|
14
|
+
var _box = require("@atlaskit/primitives/compiled/box");
|
|
15
15
|
var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
|
|
16
16
|
var _user = require("../../render-type/user");
|
|
17
17
|
var _messages = require("../../render-type/user/messages");
|
|
@@ -23,10 +23,10 @@ var EmptyAvatar = exports.EmptyAvatar = function EmptyAvatar() {
|
|
|
23
23
|
var intl = (0, _reactIntl.useIntl)();
|
|
24
24
|
return /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
|
|
25
25
|
content: intl.formatMessage(_messages.userTypeMessages.userDefaultdisplayNameValue)
|
|
26
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
26
|
+
}, /*#__PURE__*/_react.default.createElement(_box.Box, {
|
|
27
27
|
xcss: styles.emptyAvatarWrapperStyles,
|
|
28
28
|
testId: _user.USER_TYPE_TEST_ID
|
|
29
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
29
|
+
}, /*#__PURE__*/_react.default.createElement(_box.Box, {
|
|
30
30
|
xcss: styles.avatarWrapperStyles
|
|
31
31
|
}, /*#__PURE__*/_react.default.createElement(_avatar.default, {
|
|
32
32
|
appearance: "circle",
|
|
@@ -9,7 +9,9 @@ exports.SharedIconComponent = SharedIconComponent;
|
|
|
9
9
|
require("./index.compiled.css");
|
|
10
10
|
var React = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _runtime = require("@compiled/react/runtime");
|
|
12
|
-
var
|
|
12
|
+
var _box = require("@atlaskit/primitives/compiled/box");
|
|
13
|
+
var _flex = require("@atlaskit/primitives/compiled/flex");
|
|
14
|
+
var _inline = require("@atlaskit/primitives/compiled/inline");
|
|
13
15
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
14
16
|
var styles = {
|
|
15
17
|
labelStyles: "_1reo15vq _18m915vq _1bto1l2s _1bsb1osq",
|
|
@@ -25,15 +27,15 @@ function SharedIconComponent(_ref) {
|
|
|
25
27
|
label = _ref$label === void 0 ? '' : _ref$label,
|
|
26
28
|
text = _ref.text,
|
|
27
29
|
testId = _ref.testId;
|
|
28
|
-
return /*#__PURE__*/React.createElement(
|
|
30
|
+
return /*#__PURE__*/React.createElement(_flex.Flex, {
|
|
29
31
|
gap: "space.100",
|
|
30
32
|
alignItems: "center",
|
|
31
33
|
testId: testId
|
|
32
|
-
}, /*#__PURE__*/React.createElement(
|
|
34
|
+
}, /*#__PURE__*/React.createElement(_inline.Inline, null, /*#__PURE__*/React.createElement("img", {
|
|
33
35
|
src: iconUrl,
|
|
34
36
|
alt: (label === null || label === void 0 ? void 0 : label.toLowerCase()) !== (text === null || text === void 0 ? void 0 : text.toLowerCase()) ? label : '',
|
|
35
37
|
className: (0, _runtime.ax)([styles.iconStyles])
|
|
36
|
-
})), text && /*#__PURE__*/React.createElement(
|
|
38
|
+
})), text && /*#__PURE__*/React.createElement(_box.Box, {
|
|
37
39
|
xcss: styles.labelStyles,
|
|
38
40
|
testId: "".concat(testId, "-text")
|
|
39
41
|
}, text));
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.getLinkedCellContent = void 0;
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
var
|
|
9
|
+
var _link = _interopRequireDefault(require("@atlaskit/smart-card/link"));
|
|
10
10
|
/**
|
|
11
11
|
* Wraps the given cell `children` in a `LinkUrl` pointing at the issue URL,
|
|
12
12
|
* making the cell's contents (e.g. the issue type icon) act as a link to the
|
|
@@ -19,7 +19,7 @@ var getLinkedCellContent = exports.getLinkedCellContent = function getLinkedCell
|
|
|
19
19
|
if (!issueLinkData) {
|
|
20
20
|
return children;
|
|
21
21
|
}
|
|
22
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
22
|
+
return /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
23
23
|
href: issueLinkData.url,
|
|
24
24
|
target: "_blank",
|
|
25
25
|
"aria-label": issueLinkData.text || issueLinkData.url,
|
|
@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
17
17
|
var _reactIntl = require("react-intl");
|
|
18
18
|
var _inlineEdit = _interopRequireDefault(require("@atlaskit/inline-edit/inline-edit"));
|
|
19
19
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
20
|
-
var
|
|
20
|
+
var _useSmartLinkReload = require("@atlaskit/smart-card/hook/use-smart-link-reload");
|
|
21
21
|
var _analytics = require("../../../analytics");
|
|
22
22
|
var _startUfoExperience = require("../../../analytics/ufoExperiences/startUfoExperience");
|
|
23
23
|
var _useDatasourceExperienceId = require("../../../contexts/datasource-experience-id/use-datasource-experience-id");
|
|
@@ -89,7 +89,7 @@ var useRefreshDatasourceItem = function useRefreshDatasourceItem(item) {
|
|
|
89
89
|
var url = item === null || item === void 0 || (_item$data = item.data) === null || _item$data === void 0 || (_item$data = _item$data.key) === null || _item$data === void 0 || (_item$data = _item$data.data) === null || _item$data === void 0 ? void 0 : _item$data.url;
|
|
90
90
|
|
|
91
91
|
// passing empty string to the hook isn't ideal, but the alternatives are too much effort for this small fix.
|
|
92
|
-
var reloadSmartLinkAction = (0,
|
|
92
|
+
var reloadSmartLinkAction = (0, _useSmartLinkReload.useSmartLinkReload)({
|
|
93
93
|
url: url || ''
|
|
94
94
|
});
|
|
95
95
|
return (0, _react.useCallback)(function () {
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.LinkedCellContentWrapped = void 0;
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
var
|
|
9
|
+
var _link = _interopRequireDefault(require("@atlaskit/smart-card/link"));
|
|
10
10
|
var _useDatasourceCrossProductAttribution = require("../../../analytics/xpc/useDatasourceCrossProductAttribution");
|
|
11
11
|
var LinkedCellContentWrapped = exports.LinkedCellContentWrapped = function LinkedCellContentWrapped(_ref) {
|
|
12
12
|
var children = _ref.children,
|
|
@@ -16,7 +16,7 @@ var LinkedCellContentWrapped = exports.LinkedCellContentWrapped = function Linke
|
|
|
16
16
|
if (!issueLinkData) {
|
|
17
17
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
|
|
18
18
|
}
|
|
19
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
19
|
+
return /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
20
20
|
href: wrapCrossProductUrl(issueLinkData.url),
|
|
21
21
|
target: "_blank",
|
|
22
22
|
"aria-label": issueLinkData.text || issueLinkData.url,
|
|
@@ -16,7 +16,8 @@ var _reactIntl = require("react-intl");
|
|
|
16
16
|
var _button = _interopRequireDefault(require("@atlaskit/button/icon/button"));
|
|
17
17
|
var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
|
|
18
18
|
var _popup = require("@atlaskit/popup/popup");
|
|
19
|
-
var
|
|
19
|
+
var _box = require("@atlaskit/primitives/compiled/box");
|
|
20
|
+
var _inline = require("@atlaskit/primitives/compiled/inline");
|
|
20
21
|
var _constants = require("@atlaskit/theme/constants");
|
|
21
22
|
var _toggle = _interopRequireDefault(require("@atlaskit/toggle/toggle"));
|
|
22
23
|
var _hasAvailableTableSettings = require("./hasAvailableTableSettings");
|
|
@@ -71,11 +72,11 @@ var TableSettingsMenu = exports.TableSettingsMenu = function TableSettingsMenu(p
|
|
|
71
72
|
},
|
|
72
73
|
content: function content(_ref) {
|
|
73
74
|
var setInitialFocusRef = _ref.setInitialFocusRef;
|
|
74
|
-
return /*#__PURE__*/React.createElement(
|
|
75
|
+
return /*#__PURE__*/React.createElement(_box.Box, {
|
|
75
76
|
xcss: styles.menu
|
|
76
|
-
}, wrapTextSetting && /*#__PURE__*/React.createElement(
|
|
77
|
+
}, wrapTextSetting && /*#__PURE__*/React.createElement(_box.Box, {
|
|
77
78
|
xcss: styles.setting
|
|
78
|
-
}, /*#__PURE__*/React.createElement(
|
|
79
|
+
}, /*#__PURE__*/React.createElement(_inline.Inline, {
|
|
79
80
|
alignBlock: "center",
|
|
80
81
|
spread: "space-between"
|
|
81
82
|
}, /*#__PURE__*/React.createElement("label", {
|
|
@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
13
13
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
14
14
|
var _react = require("react");
|
|
15
15
|
var _reactIntl = require("react-intl");
|
|
16
|
-
var
|
|
16
|
+
var _operand = require("@atlaskit/jql-ast/operand");
|
|
17
17
|
var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
|
|
18
18
|
var _extractValuesFromNonComplexJQL = require("../utils/extractValuesFromNonComplexJQL");
|
|
19
19
|
var _mapHydrateResponseData = require("../utils/mapHydrateResponseData");
|
|
@@ -68,7 +68,7 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
|
|
|
68
68
|
/**
|
|
69
69
|
* Special handling for assignee as we need to inject Unassigned value if JQL contains EMPTY keyword for assignee
|
|
70
70
|
*/
|
|
71
|
-
assignee: [].concat((0, _toConsumableArray2.default)(mappedHydratedAssigneeValue || []), (0, _toConsumableArray2.default)(extractedAssigneeValue !== null && extractedAssigneeValue !== void 0 && extractedAssigneeValue.includes(
|
|
71
|
+
assignee: [].concat((0, _toConsumableArray2.default)(mappedHydratedAssigneeValue || []), (0, _toConsumableArray2.default)(extractedAssigneeValue !== null && extractedAssigneeValue !== void 0 && extractedAssigneeValue.includes(_operand.OPERAND_EMPTY) // checks and adds EMPTY filter option if extracted assignee values from jql contains EMPTY
|
|
72
72
|
? [(0, _getAssigneeUnassignedFilterOption.getAssigneeUnassignedFilterOption)(formatMessage)] : []))
|
|
73
73
|
}, textFieldValue ? {
|
|
74
74
|
basicInputTextValue: (0, _removeFuzzyCharacter.removeFuzzyCharacter)(textFieldValue)
|
|
@@ -10,7 +10,7 @@ exports.default = exports.availableBasicFilterTypes = void 0;
|
|
|
10
10
|
require("./index.compiled.css");
|
|
11
11
|
var _runtime = require("@compiled/react/runtime");
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
|
-
var
|
|
13
|
+
var _flex = require("@atlaskit/primitives/compiled/flex");
|
|
14
14
|
var _extractValuesFromNonComplexJQL = require("../utils/extractValuesFromNonComplexJQL");
|
|
15
15
|
var _asyncPopupSelect = _interopRequireDefault(require("./async-popup-select"));
|
|
16
16
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
@@ -29,7 +29,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
|
|
|
29
29
|
}, [isJQLHydrating, jql]);
|
|
30
30
|
var _ref2 = site || {},
|
|
31
31
|
cloudId = _ref2.cloudId;
|
|
32
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
32
|
+
return /*#__PURE__*/_react.default.createElement(_flex.Flex, {
|
|
33
33
|
xcss: styles.basicFilterContainerStyles,
|
|
34
34
|
gap: "space.100",
|
|
35
35
|
testId: "jlol-basic-filter-container"
|
|
@@ -12,7 +12,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
12
12
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
13
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
14
|
var _mergeWith = _interopRequireDefault(require("lodash/mergeWith"));
|
|
15
|
-
var
|
|
15
|
+
var _abstractJastVisitor = require("@atlaskit/jql-ast/abstract-jast-visitor");
|
|
16
|
+
var _jastBuilder = require("@atlaskit/jql-ast/jast-builder");
|
|
17
|
+
var _node = require("@atlaskit/jql-ast/node");
|
|
18
|
+
var _operand = require("@atlaskit/jql-ast/operand");
|
|
16
19
|
var _isQueryTooComplex = require("./isQueryTooComplex");
|
|
17
20
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
18
21
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
@@ -20,24 +23,24 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
20
23
|
|
|
21
24
|
var getFieldValues = function getFieldValues(operand) {
|
|
22
25
|
var mapValuesFromList = function mapValuesFromList(value) {
|
|
23
|
-
if (value.operandType ===
|
|
26
|
+
if (value.operandType === _operand.OPERAND_TYPE_VALUE) {
|
|
24
27
|
return value.value;
|
|
25
28
|
}
|
|
26
29
|
// we only support EMPTY keyword atm, hence making sure if operandType is a KEYWORD, then its an EMPTY keyword
|
|
27
|
-
if (value.operandType ===
|
|
30
|
+
if (value.operandType === _operand.OPERAND_TYPE_KEYWORD && value.value === _operand.OPERAND_EMPTY) {
|
|
28
31
|
return value.value;
|
|
29
32
|
}
|
|
30
33
|
return undefined;
|
|
31
34
|
};
|
|
32
35
|
switch (operand.operandType) {
|
|
33
|
-
case
|
|
36
|
+
case _operand.OPERAND_TYPE_LIST:
|
|
34
37
|
return operand.values.map(mapValuesFromList).filter(function (value) {
|
|
35
38
|
return !!value;
|
|
36
39
|
});
|
|
37
|
-
case
|
|
40
|
+
case _operand.OPERAND_TYPE_VALUE:
|
|
38
41
|
return operand.value ? [operand.value] : [];
|
|
39
|
-
case
|
|
40
|
-
return operand.value ===
|
|
42
|
+
case _operand.OPERAND_TYPE_KEYWORD:
|
|
43
|
+
return operand.value === _operand.OPERAND_EMPTY ? [operand.value] : [];
|
|
41
44
|
default:
|
|
42
45
|
return [];
|
|
43
46
|
}
|
|
@@ -62,7 +65,7 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
|
|
|
62
65
|
|
|
63
66
|
// we do not want to parse and store the order by field+value
|
|
64
67
|
var fieldGrandParent = fieldParent.parent;
|
|
65
|
-
if (fieldGrandParent.type ===
|
|
68
|
+
if (fieldGrandParent.type === _node.NODE_TYPE_ORDER_BY) {
|
|
66
69
|
return;
|
|
67
70
|
}
|
|
68
71
|
var operand = fieldParent.operand;
|
|
@@ -85,12 +88,12 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
|
|
|
85
88
|
return {};
|
|
86
89
|
}
|
|
87
90
|
}]);
|
|
88
|
-
}(
|
|
91
|
+
}(_abstractJastVisitor.AbstractJastVisitor);
|
|
89
92
|
var extractValuesFromNonComplexJQL = exports.extractValuesFromNonComplexJQL = function extractValuesFromNonComplexJQL(jql) {
|
|
90
93
|
if ((0, _isQueryTooComplex.isQueryTooComplex)(jql)) {
|
|
91
94
|
return {};
|
|
92
95
|
}
|
|
93
|
-
var jast = new
|
|
96
|
+
var jast = new _jastBuilder.JastBuilder().build(jql);
|
|
94
97
|
var jqlClauseCollectingVisitor = new JqlClauseCollectingVisitor();
|
|
95
98
|
var mappedValues = jast.query ? jast.query.accept(jqlClauseCollectingVisitor) || {} : {}; // jast.query is defined as void | Query, hence the fallback
|
|
96
99
|
|
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.isValidJql = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _jastBuilder = require("@atlaskit/jql-ast/jast-builder");
|
|
8
8
|
var isValidJql = exports.isValidJql = function isValidJql(jql) {
|
|
9
9
|
var _jast$errors;
|
|
10
|
-
var jast = new
|
|
10
|
+
var jast = new _jastBuilder.JastBuilder().build(jql);
|
|
11
11
|
return (jast === null || jast === void 0 || (_jast$errors = jast.errors) === null || _jast$errors === void 0 ? void 0 : _jast$errors.length) === 0;
|
|
12
12
|
};
|
|
@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.isClauseTooComplex = void 0;
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
|
-
var
|
|
9
|
+
var _clause = require("@atlaskit/jql-ast/clause");
|
|
10
|
+
var _operand = require("@atlaskit/jql-ast/operand");
|
|
10
11
|
var _removeFuzzyCharacter = require("./removeFuzzyCharacter");
|
|
11
12
|
var getValueFromTerminalClause = function getValueFromTerminalClause(clause) {
|
|
12
13
|
var operand = clause.operand;
|
|
13
|
-
return operand !== undefined && operand.operandType ===
|
|
14
|
+
return operand !== undefined && operand.operandType === _operand.OPERAND_TYPE_VALUE && (0, _removeFuzzyCharacter.removeFuzzyCharacter)(operand.value) || undefined;
|
|
14
15
|
};
|
|
15
16
|
var areClauseFieldValuesEqual = function areClauseFieldValuesEqual(clauseA, clauseB, clauseC) {
|
|
16
17
|
var valueA = clauseA && getValueFromTerminalClause(clauseA);
|
|
@@ -34,14 +35,14 @@ var areClauseFieldKeysAllowed = function areClauseFieldKeysAllowed(clauseA, clau
|
|
|
34
35
|
};
|
|
35
36
|
var doesCompoundClauseContainAllTerminalClauses = function doesCompoundClauseContainAllTerminalClauses(clauses) {
|
|
36
37
|
return clauses.every(function (clauses) {
|
|
37
|
-
return clauses.clauseType ===
|
|
38
|
+
return clauses.clauseType === _clause.CLAUSE_TYPE_TERMINAL;
|
|
38
39
|
});
|
|
39
40
|
};
|
|
40
41
|
var isClauseTooComplex = exports.isClauseTooComplex = function isClauseTooComplex(clauses, key) {
|
|
41
42
|
if (key === 'text') {
|
|
42
43
|
var _clauses = (0, _slicedToArray2.default)(clauses, 1),
|
|
43
44
|
clause = _clauses[0];
|
|
44
|
-
if (clause.clauseType ===
|
|
45
|
+
if (clause.clauseType === _clause.CLAUSE_TYPE_COMPOUND) {
|
|
45
46
|
var textClauses = clause.clauses;
|
|
46
47
|
|
|
47
48
|
/**
|
|
@@ -14,7 +14,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
14
14
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
15
|
var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
|
|
16
16
|
var _mergeWith = _interopRequireDefault(require("lodash/mergeWith"));
|
|
17
|
-
var
|
|
17
|
+
var _abstractJastVisitor = require("@atlaskit/jql-ast/abstract-jast-visitor");
|
|
18
|
+
var _compound = require("@atlaskit/jql-ast/compound");
|
|
19
|
+
var _jastBuilder = require("@atlaskit/jql-ast/jast-builder");
|
|
20
|
+
var _operator = require("@atlaskit/jql-ast/operator");
|
|
18
21
|
var _jiraSearchContainer = require("../../jira-search-container");
|
|
19
22
|
var _index = require("./index");
|
|
20
23
|
var _isClauseTooComplex = require("./isClauseTooComplex");
|
|
@@ -27,15 +30,15 @@ var allowedFields = [
|
|
|
27
30
|
'assignee', 'type', 'project', 'status',
|
|
28
31
|
// search input fields
|
|
29
32
|
'text', 'summary', 'key'];
|
|
30
|
-
var fallbackOperators = [
|
|
33
|
+
var fallbackOperators = [_operator.OPERATOR_IN];
|
|
31
34
|
var fieldSpecificOperators = {
|
|
32
|
-
text: [
|
|
33
|
-
summary: [
|
|
34
|
-
key: [
|
|
35
|
-
project: [
|
|
36
|
-
type: [
|
|
37
|
-
status: [
|
|
38
|
-
assignee: [
|
|
35
|
+
text: [_operator.OPERATOR_LIKE, _operator.OPERATOR_EQUALS],
|
|
36
|
+
summary: [_operator.OPERATOR_LIKE, _operator.OPERATOR_EQUALS],
|
|
37
|
+
key: [_operator.OPERATOR_EQUALS],
|
|
38
|
+
project: [_operator.OPERATOR_IN, _operator.OPERATOR_EQUALS],
|
|
39
|
+
type: [_operator.OPERATOR_IN, _operator.OPERATOR_EQUALS],
|
|
40
|
+
status: [_operator.OPERATOR_IN, _operator.OPERATOR_EQUALS],
|
|
41
|
+
assignee: [_operator.OPERATOR_IN, _operator.OPERATOR_EQUALS]
|
|
39
42
|
};
|
|
40
43
|
var JqlClauseCollectingVisitorError = /*#__PURE__*/function (_Error) {
|
|
41
44
|
function JqlClauseCollectingVisitorError() {
|
|
@@ -70,12 +73,12 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
|
|
|
70
73
|
(0, _defineProperty2.default)(_this, "visitCompoundClause", function (compoundClause) {
|
|
71
74
|
var clauseMap = {};
|
|
72
75
|
var operator = compoundClause.operator.value;
|
|
73
|
-
if (operator ===
|
|
76
|
+
if (operator === _compound.COMPOUND_OPERATOR_AND) {
|
|
74
77
|
return compoundClause.clauses.reduce(function (result, clause) {
|
|
75
78
|
return _this.aggregateResult(clause.accept(_this), result);
|
|
76
79
|
}, clauseMap);
|
|
77
80
|
}
|
|
78
|
-
if (operator ===
|
|
81
|
+
if (operator === _compound.COMPOUND_OPERATOR_OR) {
|
|
79
82
|
// this is delt with in isClauseTooComplex
|
|
80
83
|
return _this.aggregateResult({
|
|
81
84
|
text: [compoundClause]
|
|
@@ -112,7 +115,7 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
|
|
|
112
115
|
return {};
|
|
113
116
|
}
|
|
114
117
|
}]);
|
|
115
|
-
}(
|
|
118
|
+
}(_abstractJastVisitor.AbstractJastVisitor);
|
|
116
119
|
var isQueryTooComplex = exports.isQueryTooComplex = function isQueryTooComplex(jql) {
|
|
117
120
|
if (!jql) {
|
|
118
121
|
return false;
|
|
@@ -120,7 +123,7 @@ var isQueryTooComplex = exports.isQueryTooComplex = function isQueryTooComplex(j
|
|
|
120
123
|
if (!(0, _index.isValidJql)(jql)) {
|
|
121
124
|
return true;
|
|
122
125
|
}
|
|
123
|
-
var jast = new
|
|
126
|
+
var jast = new _jastBuilder.JastBuilder().build(jql);
|
|
124
127
|
try {
|
|
125
128
|
var jqlClauseCollectingVisitor = new JqlClauseCollectingVisitor();
|
|
126
129
|
var clauseMap = jast.query ? jast.query.accept(jqlClauseCollectingVisitor) : {}; // jast.query is defined as void | Query, hence the fallback
|
|
@@ -6,24 +6,29 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.fuzzyCharacter = exports.buildJQL = void 0;
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
|
-
var
|
|
9
|
+
var _compound = require("@atlaskit/jql-ast/compound");
|
|
10
|
+
var _creators = _interopRequireDefault(require("@atlaskit/jql-ast/creators"));
|
|
11
|
+
var _jastBuilder = require("@atlaskit/jql-ast/jast-builder");
|
|
12
|
+
var _operator = require("@atlaskit/jql-ast/operator");
|
|
13
|
+
var _orderBy = require("@atlaskit/jql-ast/order-by");
|
|
14
|
+
var _printers = require("@atlaskit/jql-ast/printers");
|
|
10
15
|
var _ui = require("../basic-filters/ui");
|
|
11
16
|
var fuzzySearchRegExp = /^"(.+)"$/;
|
|
12
17
|
var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
|
|
13
18
|
var fuzzyCharacter = exports.fuzzyCharacter = '*';
|
|
14
19
|
var constructTerminalClause = function constructTerminalClause(field, operator, value) {
|
|
15
|
-
return
|
|
20
|
+
return _creators.default.terminalClause(_creators.default.field(field), _creators.default.operator(operator), _creators.default.valueOperand(value));
|
|
16
21
|
};
|
|
17
22
|
var buildJQL = exports.buildJQL = function buildJQL(input) {
|
|
18
23
|
/**
|
|
19
24
|
* Jql ast - Transforming the ast
|
|
20
25
|
* https://atlaskit.atlassian.com/packages/jql/jql-ast/docs/transforming-the-ast
|
|
21
26
|
*/
|
|
22
|
-
var jast = new
|
|
27
|
+
var jast = new _jastBuilder.JastBuilder().build('');
|
|
23
28
|
var query = jast.query;
|
|
24
29
|
var rawSearch = input.rawSearch,
|
|
25
30
|
_input$orderDirection = input.orderDirection,
|
|
26
|
-
orderDirection = _input$orderDirection === void 0 ?
|
|
31
|
+
orderDirection = _input$orderDirection === void 0 ? _orderBy.ORDER_BY_DIRECTION_DESC : _input$orderDirection,
|
|
27
32
|
_input$orderKey = input.orderKey,
|
|
28
33
|
orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
|
|
29
34
|
filterValues = input.filterValues;
|
|
@@ -45,15 +50,15 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
|
|
|
45
50
|
if (trimmedRawSearch) {
|
|
46
51
|
var fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? fuzzyCharacter : '';
|
|
47
52
|
var basicSearch = trimmedRawSearch.replace(/['"?*]+/g, '');
|
|
48
|
-
var text = constructTerminalClause('text',
|
|
49
|
-
var summary = constructTerminalClause('summary',
|
|
53
|
+
var text = constructTerminalClause('text', _operator.OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
|
|
54
|
+
var summary = constructTerminalClause('summary', _operator.OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
|
|
50
55
|
var orClauseFields = [text, summary];
|
|
51
56
|
if (jiraIssueKeyRegExp.test(trimmedRawSearch.toUpperCase())) {
|
|
52
|
-
var key = constructTerminalClause('key',
|
|
57
|
+
var key = constructTerminalClause('key', _operator.OPERATOR_EQUALS, basicSearch);
|
|
53
58
|
orClauseFields.push(key);
|
|
54
59
|
}
|
|
55
|
-
var orClause =
|
|
56
|
-
query.appendClause(orClause,
|
|
60
|
+
var orClause = _creators.default.compoundClause(_creators.default.compoundOperator(_compound.COMPOUND_OPERATOR_OR), orClauseFields);
|
|
61
|
+
query.appendClause(orClause, _compound.COMPOUND_OPERATOR_AND);
|
|
57
62
|
}
|
|
58
63
|
if (hasValidFilterSelectionAndValues) {
|
|
59
64
|
Object.entries(filterValues).forEach(function (_ref3) {
|
|
@@ -63,16 +68,16 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
|
|
|
63
68
|
if (filterFieldValues.length === 0) {
|
|
64
69
|
return;
|
|
65
70
|
}
|
|
66
|
-
var filterInClause =
|
|
67
|
-
return
|
|
71
|
+
var filterInClause = _creators.default.terminalClause(_creators.default.field(key), _creators.default.operator(_operator.OPERATOR_IN), _creators.default.listOperand(filterFieldValues.map(function (filterFieldValue) {
|
|
72
|
+
return _creators.default.valueOperand(filterFieldValue.value);
|
|
68
73
|
})));
|
|
69
|
-
query.appendClause(filterInClause,
|
|
74
|
+
query.appendClause(filterInClause, _compound.COMPOUND_OPERATOR_AND);
|
|
70
75
|
});
|
|
71
76
|
}
|
|
72
|
-
var orderField =
|
|
77
|
+
var orderField = _creators.default.orderByField(_creators.default.field(orderKey));
|
|
73
78
|
query.prependOrderField(orderField);
|
|
74
|
-
query.setOrderDirection(
|
|
75
|
-
return (0,
|
|
79
|
+
query.setOrderDirection(_creators.default.orderByDirection(orderDirection.toLowerCase() === 'asc' ? _orderBy.ORDER_BY_DIRECTION_ASC : _orderBy.ORDER_BY_DIRECTION_DESC));
|
|
80
|
+
return (0, _printers.print)(jast, {
|
|
76
81
|
printWidth: null // this ensures jql string is not broken to new line
|
|
77
82
|
});
|
|
78
83
|
};
|
|
@@ -16,7 +16,9 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
16
16
|
var _reactIntl = require("react-intl");
|
|
17
17
|
var _useDebounce = require("use-debounce");
|
|
18
18
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
19
|
-
var
|
|
19
|
+
var _box = require("@atlaskit/primitives/compiled/box");
|
|
20
|
+
var _flex = require("@atlaskit/primitives/compiled/flex");
|
|
21
|
+
var _text = require("@atlaskit/primitives/compiled/text");
|
|
20
22
|
var _analytics = require("../../../analytics");
|
|
21
23
|
var _basicSearchInput = require("../../common/modal/basic-search-input");
|
|
22
24
|
var _messages = require("../../common/modal/basic-search-input/messages");
|
|
@@ -214,9 +216,9 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
|
|
|
214
216
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
215
217
|
"data-testid": "jira-search-container",
|
|
216
218
|
className: (0, _runtime.ax)([styles.inputContainerStyles])
|
|
217
|
-
}, currentSearchMethod === 'basic' && /*#__PURE__*/_react.default.createElement(
|
|
219
|
+
}, currentSearchMethod === 'basic' && /*#__PURE__*/_react.default.createElement(_box.Box, {
|
|
218
220
|
xcss: styles.basicSearchInputBoxStyles
|
|
219
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
221
|
+
}, /*#__PURE__*/_react.default.createElement(_flex.Flex, {
|
|
220
222
|
alignItems: "center",
|
|
221
223
|
xcss: (0, _fg.fg)('platform_lp_jira_searchbar_wrap_a11y') ? styles.basicSearchInputContainerWrapStyles : styles.basicSearchInputContainerStyles
|
|
222
224
|
}, /*#__PURE__*/_react.default.createElement(_basicSearchInput.BasicSearchInput, {
|
|
@@ -233,7 +235,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
|
|
|
233
235
|
onChange: handleBasicFilterSelectionChange,
|
|
234
236
|
selections: filterSelections,
|
|
235
237
|
isJQLHydrating: basicFilterHydrationStatus === 'loading'
|
|
236
|
-
})), currentSearchMethod === 'basic' && /*#__PURE__*/_react.default.createElement(
|
|
238
|
+
})), currentSearchMethod === 'basic' && /*#__PURE__*/_react.default.createElement(_text.Text, {
|
|
237
239
|
size: "small",
|
|
238
240
|
color: "color.text.subtlest",
|
|
239
241
|
testId: "jira-search-placeholder"
|
|
@@ -243,7 +245,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
|
|
|
243
245
|
onChange: onQueryChange,
|
|
244
246
|
onSearch: handleSearch,
|
|
245
247
|
query: searchBarJql
|
|
246
|
-
}), /*#__PURE__*/_react.default.createElement(
|
|
248
|
+
}), /*#__PURE__*/_react.default.createElement(_box.Box, {
|
|
247
249
|
xcss: styles.modeSwitcherContainerStyles
|
|
248
250
|
}, /*#__PURE__*/_react.default.createElement(_ModeSwitcher.ModeSwitcher, {
|
|
249
251
|
onOptionValueChange: onSearchMethodChange,
|