@adaptabletools/adaptable 17.0.0-canary.7 → 17.0.0-canary.8
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/base.css +14 -0
- package/base.css.map +1 -1
- package/bundle.cjs.js +123 -123
- package/index.css +16 -0
- package/index.css.map +1 -1
- package/package.json +1 -1
- package/publishTimestamp.d.ts +1 -1
- package/publishTimestamp.js +1 -1
- package/src/Api/Internal/LayoutInternalApi.d.ts +2 -2
- package/src/Api/Internal/LayoutInternalApi.js +4 -4
- package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js +6 -0
- package/src/View/Components/Selectors/PermittedValuesSelector.d.ts +5 -4
- package/src/View/Components/Selectors/PermittedValuesSelector.js +25 -3
- package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.d.ts +6 -0
- package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.js +7 -1
- package/src/components/ExpressionEditor/QueryBuilder/QueryPredicateBuilder.js +14 -2
- package/src/components/ExpressionEditor/QueryBuilder/booleanExpressions.js +1 -0
- package/src/components/ExpressionEditor/QueryBuilder/utils.js +1 -1
- package/src/components/Select/Select.js +45 -20
- package/src/metamodel/adaptable.metamodel.d.ts +1 -1
- package/src/metamodel/adaptable.metamodel.js +1 -1
- package/src/parser/src/predicate/mapQlPredicateToExpression.js +5 -2
- package/src/parser/src/predicate/types.d.ts +1 -1
- package/src/parser/src/types.d.ts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
|
@@ -37,7 +37,7 @@ function mapQlPredicateToExpression(predicate) {
|
|
|
37
37
|
}
|
|
38
38
|
return `"${arg}"`;
|
|
39
39
|
}
|
|
40
|
-
if (typeof arg === 'object') {
|
|
40
|
+
if (typeof arg === 'object' && 'operator' in arg) {
|
|
41
41
|
if ((0, types_1.isQlLogicalOperator)(arg.operator)) {
|
|
42
42
|
return `(${mapQlPredicateToExpression(arg)})`;
|
|
43
43
|
}
|
|
@@ -48,7 +48,7 @@ function mapQlPredicateToExpression(predicate) {
|
|
|
48
48
|
}
|
|
49
49
|
return arg;
|
|
50
50
|
});
|
|
51
|
-
if (typeof firstArg === 'object') {
|
|
51
|
+
if (typeof firstArg === 'object' && 'operator' in firstArg) {
|
|
52
52
|
firstArg = mapQlPredicateToExpression(firstArg);
|
|
53
53
|
}
|
|
54
54
|
if ((0, types_1.isQlLogicalOperator)(operator)) {
|
|
@@ -61,6 +61,9 @@ function mapQlPredicateToExpression(predicate) {
|
|
|
61
61
|
if (operator === 'BETWEEN') {
|
|
62
62
|
return `${firstArg} ${operatorSymbol} (${mappedArgs})`;
|
|
63
63
|
}
|
|
64
|
+
if (operator === 'IN') {
|
|
65
|
+
return `${firstArg} ${operatorSymbol} (${mappedArgs.join(', ')})`;
|
|
66
|
+
}
|
|
64
67
|
return `${firstArg} ${operatorSymbol} ${mappedArgs.join(', ')}`;
|
|
65
68
|
}
|
|
66
69
|
if (predicateType === 'FUNCTION') {
|
|
@@ -4,7 +4,7 @@ export type QlPredicateError = {
|
|
|
4
4
|
};
|
|
5
5
|
export interface QlPredicate {
|
|
6
6
|
operator: BooleanFunctionName;
|
|
7
|
-
args?: (QlPredicate | boolean | number | string)[];
|
|
7
|
+
args?: (QlPredicate | boolean | number | string | string[] | number[] | Date[])[];
|
|
8
8
|
}
|
|
9
9
|
export type QlLogicalOperator = 'AND' | 'OR';
|
|
10
10
|
export declare const isQlLogicalOperator: (operator: string) => operator is QlLogicalOperator;
|
|
@@ -96,7 +96,7 @@ export interface ExpressionFunction {
|
|
|
96
96
|
/**
|
|
97
97
|
* Data Types of Inputs used by Expression (test, number, date, boolean)
|
|
98
98
|
*/
|
|
99
|
-
export type ExpressionFunctionInputType = 'text' | 'number' | 'date' | 'boolean';
|
|
99
|
+
export type ExpressionFunctionInputType = 'text' | 'number' | 'date' | 'boolean' | 'number[]' | 'date[]' | 'text[]';
|
|
100
100
|
/**
|
|
101
101
|
* Categories for Expression Functions
|
|
102
102
|
*/
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "17.0.0-canary.
|
|
1
|
+
declare const _default: "17.0.0-canary.8";
|
|
2
2
|
export default _default;
|
package/version.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.default = '17.0.0-canary.
|
|
3
|
+
exports.default = '17.0.0-canary.8'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
|