@atlaskit/link-datasource 1.19.1 → 1.19.2
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 +7 -0
- package/dist/cjs/analytics/constants.js +1 -1
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/buildJQL.js +6 -3
- package/dist/es2019/analytics/constants.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/buildJQL.js +4 -3
- package/dist/esm/analytics/constants.js +1 -1
- package/dist/esm/ui/jira-issues-modal/jira-search-container/buildJQL.js +6 -3
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @atlaskit/link-datasource
|
|
2
2
|
|
|
3
|
+
## 1.19.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#43713](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43713) [`2fa24eb9ab7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2fa24eb9ab7) - Update JQL generation logic to create query to search for all issues when only filter values are present.
|
|
8
|
+
- Updated dependencies
|
|
9
|
+
|
|
3
10
|
## 1.19.1
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
|
@@ -27,6 +27,9 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
|
|
|
27
27
|
orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
|
|
28
28
|
filterValues = input.filterValues;
|
|
29
29
|
var trimmedRawSearch = rawSearch.trim();
|
|
30
|
+
var hasFilterSelectionValues = filterValues && Object.values(filterValues).some(function (value) {
|
|
31
|
+
return value.length > 0;
|
|
32
|
+
});
|
|
30
33
|
if (!query) {
|
|
31
34
|
return '';
|
|
32
35
|
}
|
|
@@ -43,12 +46,12 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
|
|
|
43
46
|
var orClause = _jqlAst.creators.compoundClause(_jqlAst.creators.compoundOperator(_jqlAst.COMPOUND_OPERATOR_OR), orClauseFields);
|
|
44
47
|
query.appendClause(orClause, _jqlAst.COMPOUND_OPERATOR_AND);
|
|
45
48
|
}
|
|
46
|
-
if (
|
|
49
|
+
if (hasFilterSelectionValues) {
|
|
47
50
|
Object.entries(filterValues).forEach(function (_ref) {
|
|
48
51
|
var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
|
|
49
52
|
key = _ref2[0],
|
|
50
53
|
filterFieldValues = _ref2[1];
|
|
51
|
-
if (
|
|
54
|
+
if (filterFieldValues.length === 0) {
|
|
52
55
|
return;
|
|
53
56
|
}
|
|
54
57
|
var filterInClause = _jqlAst.creators.terminalClause(_jqlAst.creators.field(key), _jqlAst.creators.operator(_jqlAst.OPERATOR_IN), _jqlAst.creators.listOperand(filterFieldValues.map(function (filterFieldValue) {
|
|
@@ -57,7 +60,7 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
|
|
|
57
60
|
query.appendClause(filterInClause, _jqlAst.COMPOUND_OPERATOR_AND);
|
|
58
61
|
});
|
|
59
62
|
}
|
|
60
|
-
if (!trimmedRawSearch) {
|
|
63
|
+
if (!trimmedRawSearch && !hasFilterSelectionValues) {
|
|
61
64
|
var created = constructTerminalClause('created', _jqlAst.OPERATOR_GT_EQUALS, '-30d');
|
|
62
65
|
query.appendClause(created, _jqlAst.COMPOUND_OPERATOR_AND);
|
|
63
66
|
}
|
|
@@ -19,6 +19,7 @@ export const buildJQL = input => {
|
|
|
19
19
|
filterValues
|
|
20
20
|
} = input;
|
|
21
21
|
const trimmedRawSearch = rawSearch.trim();
|
|
22
|
+
const hasFilterSelectionValues = filterValues && Object.values(filterValues).some(value => value.length > 0);
|
|
22
23
|
if (!query) {
|
|
23
24
|
return '';
|
|
24
25
|
}
|
|
@@ -35,16 +36,16 @@ export const buildJQL = input => {
|
|
|
35
36
|
const orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
|
|
36
37
|
query.appendClause(orClause, COMPOUND_OPERATOR_AND);
|
|
37
38
|
}
|
|
38
|
-
if (
|
|
39
|
+
if (hasFilterSelectionValues) {
|
|
39
40
|
Object.entries(filterValues).forEach(([key, filterFieldValues]) => {
|
|
40
|
-
if (
|
|
41
|
+
if (filterFieldValues.length === 0) {
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
43
44
|
const filterInClause = creators.terminalClause(creators.field(key), creators.operator(OPERATOR_IN), creators.listOperand(filterFieldValues.map(filterFieldValue => creators.valueOperand(filterFieldValue.value))));
|
|
44
45
|
query.appendClause(filterInClause, COMPOUND_OPERATOR_AND);
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
|
-
if (!trimmedRawSearch) {
|
|
48
|
+
if (!trimmedRawSearch && !hasFilterSelectionValues) {
|
|
48
49
|
const created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
|
|
49
50
|
query.appendClause(created, COMPOUND_OPERATOR_AND);
|
|
50
51
|
}
|
|
@@ -20,6 +20,9 @@ export var buildJQL = function buildJQL(input) {
|
|
|
20
20
|
orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
|
|
21
21
|
filterValues = input.filterValues;
|
|
22
22
|
var trimmedRawSearch = rawSearch.trim();
|
|
23
|
+
var hasFilterSelectionValues = filterValues && Object.values(filterValues).some(function (value) {
|
|
24
|
+
return value.length > 0;
|
|
25
|
+
});
|
|
23
26
|
if (!query) {
|
|
24
27
|
return '';
|
|
25
28
|
}
|
|
@@ -36,12 +39,12 @@ export var buildJQL = function buildJQL(input) {
|
|
|
36
39
|
var orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
|
|
37
40
|
query.appendClause(orClause, COMPOUND_OPERATOR_AND);
|
|
38
41
|
}
|
|
39
|
-
if (
|
|
42
|
+
if (hasFilterSelectionValues) {
|
|
40
43
|
Object.entries(filterValues).forEach(function (_ref) {
|
|
41
44
|
var _ref2 = _slicedToArray(_ref, 2),
|
|
42
45
|
key = _ref2[0],
|
|
43
46
|
filterFieldValues = _ref2[1];
|
|
44
|
-
if (
|
|
47
|
+
if (filterFieldValues.length === 0) {
|
|
45
48
|
return;
|
|
46
49
|
}
|
|
47
50
|
var filterInClause = creators.terminalClause(creators.field(key), creators.operator(OPERATOR_IN), creators.listOperand(filterFieldValues.map(function (filterFieldValue) {
|
|
@@ -50,7 +53,7 @@ export var buildJQL = function buildJQL(input) {
|
|
|
50
53
|
query.appendClause(filterInClause, COMPOUND_OPERATOR_AND);
|
|
51
54
|
});
|
|
52
55
|
}
|
|
53
|
-
if (!trimmedRawSearch) {
|
|
56
|
+
if (!trimmedRawSearch && !hasFilterSelectionValues) {
|
|
54
57
|
var created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
|
|
55
58
|
query.appendClause(created, COMPOUND_OPERATOR_AND);
|
|
56
59
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/link-datasource",
|
|
3
|
-
"version": "1.19.
|
|
3
|
+
"version": "1.19.2",
|
|
4
4
|
"description": "UI Components to support linking platform dataset feature",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"@atlaskit/jql-ast": "^3.0.0",
|
|
47
47
|
"@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
|
|
48
48
|
"@atlaskit/link-client-extension": "^1.8.0",
|
|
49
|
-
"@atlaskit/linking-common": "^4.
|
|
49
|
+
"@atlaskit/linking-common": "^4.20.0",
|
|
50
50
|
"@atlaskit/linking-types": "^8.5.0",
|
|
51
51
|
"@atlaskit/lozenge": "^11.4.0",
|
|
52
52
|
"@atlaskit/modal-dialog": "^12.8.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"@atlaskit/tag": "^12.0.0",
|
|
63
63
|
"@atlaskit/textfield": "6.0.0",
|
|
64
64
|
"@atlaskit/theme": "^12.6.0",
|
|
65
|
-
"@atlaskit/tokens": "^1.
|
|
65
|
+
"@atlaskit/tokens": "^1.29.0",
|
|
66
66
|
"@atlaskit/tooltip": "^18.0.0",
|
|
67
67
|
"@atlaskit/ufo": "^0.2.4",
|
|
68
68
|
"@atlassianlabs/jql-editor": "^2.0.1",
|