@genesislcap/foundation-ui 14.289.1 → 14.290.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/dist/custom-elements.json +1504 -1504
- package/dist/dts/expression-builder/expressions-shared-helpers.d.ts.map +1 -1
- package/dist/dts/expression-builder/rule-expression-builder.d.ts +2 -0
- package/dist/dts/expression-builder/rule-expression-builder.d.ts.map +1 -1
- package/dist/dts/expression-builder/types.d.ts +3 -0
- package/dist/dts/expression-builder/types.d.ts.map +1 -1
- package/dist/esm/expression-builder/expressions-shared-helpers.js +14 -11
- package/dist/esm/expression-builder/rule-expression-builder.js +53 -0
- package/dist/esm/expression-builder/types.js +2 -1
- package/package.json +18 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions-shared-helpers.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/expressions-shared-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,QAAQ,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAA6B,CAAC;AACzF,eAAO,MAAM,UAAU,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAA6B,CAAC;AAC3F,eAAO,MAAM,WAAW,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAiC,CAAC;AAChG,eAAO,MAAM,SAAS,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAA0B,CAAC;AACvF,eAAO,MAAM,WAAW,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAuB,CAAC;AACtF,eAAO,MAAM,YAAY,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"expressions-shared-helpers.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/expressions-shared-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,QAAQ,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAA6B,CAAC;AACzF,eAAO,MAAM,UAAU,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAA6B,CAAC;AAC3F,eAAO,MAAM,WAAW,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAiC,CAAC;AAChG,eAAO,MAAM,SAAS,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAA0B,CAAC;AACvF,eAAO,MAAM,WAAW,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAuB,CAAC;AACtF,eAAO,MAAM,YAAY,EAAE,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAgB,CAAC;AAKhF;;;;;GAKG;AAEH;;GAEG;AAEH,MAAM,MAAM,eAAe,GACvB,cAAc,CAAC,YAAY,GAC3B,cAAc,CAAC,YAAY,GAC3B,cAAc,CAAC,WAAW,CAAC;AAE/B;;;;IAII;AACJ,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,sBAAsB,CAAC,IAAI,GAChC,eAAe,CAAC,MAAM,CAAC,CAgBzB;AAED;;;;;IAKI;AACJ,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,sBAAsB,CAAC,IAAI,EACjC,SAAS,EAAE,cAAc,CAAC,SAAS,EACnC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,GAC5B,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,IAAI,CActD;AAED;;;;;;;;;IASI;AACJ,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,sBAAsB,CAAC,IAAI,EACjC,SAAS,EAAE,cAAc,CAAC,SAAS,EACnC,KAAK,EAAE,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,GAC5D,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAUtD;AAED;;;;;;IAMI;AACJ,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,sBAAsB,CAAC,IAAI,EACjC,MAAM,EAAE,cAAc,CAAC,UAAU,EACjC,UAAU,GAAE,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAM,GAC3E,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAatD;AAED,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC;;;;;;;;;;;IAWI;AACJ,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,sBAAsB,CAAC,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAyBjG;AAED;;;;IAII;AACJ,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,sBAAsB,CAAC,KAAK,EACnC,oBAAoB,EAAE,CACpB,SAAS,EAAE,sBAAsB,CAAC,IAAI,KACnC,cAAc,CAAC,UAAU,CAAC,MAAM,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,GACrE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAUlD;AAED;;GAEG;AAEH;;;;;;;;;;;IAWI;AACJ,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,EAChD,GAAG,EAAE,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,GAC1D,sBAAsB,CAAC,IAAI,CAsB7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-expression-builder.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/rule-expression-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAoB,MAAM,iCAAiC,CAAC;AAetF,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAqBjE;;;;IAII;AACJ,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"rule-expression-builder.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/rule-expression-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAoB,MAAM,iCAAiC,CAAC;AAetF,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAqBjE;;;;IAII;AACJ,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;CAoB3B,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,OAAO,eAAe,CAAC;AA2I9C;;;;;;;;;;;;IAYI;AACJ,wBAAgB,iCAAiC,CAAC,EAAE,EAAE,SAAS,GAAG,cAAc,CAAC,SAAS,CAazF;AAED;;;;IAII;AACJ,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,sBAAsB,CAAC,IAAI,EACjC,YAAY,EAAE,cAAc,CAAC,SAAS,GACrC,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAyC/C;AAED;;;;;;;;IAQI;AACJ,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,sBAAsB,CAAC,IAAI,GACrC,cAAc,CAAC,UAAU,CAAC,MAAM,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAiCnE;AAED;;;;;;;;;;;;IAYI;AACJ,wBAAgB,iCAAiC,CAC/C,EAAE,EAAE,cAAc,CAAC,SAAS,EAC5B,gBAAgB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,GAC3D,SAAS,CAgBX;AAED;;;;;;;IAOI;AACJ,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,EAC5D,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GACrD,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAmB5C;AAED;;;;;IAKI;AACJ,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,sBAAsB,CAAC,KAAK,EAAE,EACtC,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GACrD,sBAAsB,CAAC,IAAI,CAa7B;AAID;;;;;;IAMI;AACJ,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,sBAAsB,CAAC,KAAK,EAAE,EACtC,UAAU,EAAE,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GACxD,sBAAsB,CAAC,IAAI,CA8C7B;AAED;;;;IAII;AACJ,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,sBAAsB,CAAC,KAAK,EAAE,EACtC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC,GACrD,sBAAsB,CAAC,KAAK,CAa9B;AAED;;;;;;GAMG;AACH,qBAKa,+BAAgC,SAAQ,iBAAiB;IACxD,UAAU,EAAE,sBAAsB,CAAC,UAAU,CAAC;IAE1D,iBAAiB,CACf,CAAC,EAAE,sBAAsB,CAAC,UAAU,EACpC,SAAS,EAAE,sBAAsB,CAAC,UAAU;IAgBrC,aAAa,CACpB,SAAS,EAAE,sBAAsB,CAAC,MAAM,EACxC,SAAS,EAAE,sBAAsB,CAAC,MAAM,GACvC,IAAI;IAUE,mBAAmB,CAAC,KAAK,EAAE,sBAAsB,CAAC,KAAK;CAWjE"}
|
|
@@ -83,6 +83,7 @@ export declare namespace RuleExpression {
|
|
|
83
83
|
readonly TRIM: "TRIM";
|
|
84
84
|
readonly LONG_TO_DATE: "LONG_TO_DATE";
|
|
85
85
|
readonly LONG_TO_DATE_TIME: "LONG_TO_DATE_TIME";
|
|
86
|
+
readonly DATE_TIME_IS_IN_RANGE: "DATE_TIME_IS_IN_RANGE";
|
|
86
87
|
};
|
|
87
88
|
type MethodCall = keyof typeof methodCall;
|
|
88
89
|
const logicalOperations: {
|
|
@@ -103,6 +104,8 @@ export declare namespace RuleExpression {
|
|
|
103
104
|
readonly BITWISE_AND: "BITWISE_AND";
|
|
104
105
|
readonly BITWISE_OR: "BITWISE_OR";
|
|
105
106
|
readonly ASSIGNMENT: "ASSIGNMENT";
|
|
107
|
+
readonly IS_CURRENT: "IS_CURRENT";
|
|
108
|
+
readonly IS_PREVIOUS: "IS_PREVIOUS";
|
|
106
109
|
readonly AND: "AND";
|
|
107
110
|
readonly OR: "OR";
|
|
108
111
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAoB,MAAM,iCAAiC,CAAC;AAElF,OAAO,QAAQ,iCAAiC,CAAC;IAG/C,UAAU,KAAK,CAAC;QACd,KAAY,UAAU,GAAG,IAAI,CAC3B,KAAK,CAAC,MAAM,EACZ,QAAQ,GAAG,YAAY,GAAG,8BAA8B,CACzD,GAAG;YACF,KAAK,CAAC,EAAE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;SAC1D,CAAC;QAEF,KAAY,WAAW,GAAG,IAAI,CAC5B,KAAK,CAAC,MAAM,EACZ,QAAQ,GAAG,YAAY,GAAG,8BAA8B,CACzD,GAAG;YACF,KAAK,CAAC,EACF,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAC7C,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;SACnD,CAAC;KACH;CACF;AAED,OAAO,EAAE,KAAK,IAAI,sBAAsB,EAAE,MAAM,IAAI,uBAAuB,EAAE,CAAC;AAE9E,eAAO,MAAM,qBAAqB;;;CAGjC,CAAC;AAEF;;GAEG;AACH,yBAAiB,cAAc,CAAC;IAC9B,KAAY,YAAY,GAAG;QACzB,KAAK,EAAE,OAAO,CAAC;QACf,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC;IAEF,KAAY,KAAK,GAAG;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,OAAO,CAAC;KACf,CAAC;IAEF,KAAY,YAAY,GAAG;QACzB,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,QAAQ,CAAC;KAChB,CAAC;IAEF,KAAY,WAAW,GAAG;QACxB,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,QAAQ,CAAC;KAChB,CAAC;IAEF,KAAY,WAAW,GAAG;QACxB,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,aAAa,CAAC;KACrB,CAAC;IAEF,KAAY,SAAS,GAAG;QACtB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,KAAY,cAAc,GAAG;QAC3B,UAAU,EAAE,SAAS,EAAE,CAAC;KACzB,CAAC;IAEF,KAAY,gBAAgB,GAAG;QAC7B,WAAW,EAAE,UAAU,EAAE,CAAC;KAC3B,CAAC;IAEF,KAAY,SAAS,GAAG;QACtB,IAAI,EAAE,UAAU,CAAC,kBAAkB,CAAC,CAAC;QACrC,SAAS,EAAE,SAAS,CAAC;QACrB,KAAK,EAAE,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC;KACrC,CAAC;IAEF,KAAY,UAAU,GAAG;QACvB,KAAK,EAAE,KAAK,CAAC;QACb,KAAK,EAAE,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC;KACrC,CAAC;IAEF,KAAY,UAAU,GAAG;QACvB,gBAAgB,EAAE,YAAY,GAAG,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC;QAC9F,gBAAgB,EAAE;YAChB,IAAI,EAAE,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC;YACnC,SAAS,EAAE,SAAS,CAAC;YACrB,KAAK,EAAE,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC;YACpC,IAAI,EAAE,mBAAmB,CAAC;SAC3B,CAAC;QACF,gBAAgB,EAAE;YAChB,MAAM,EAAE,UAAU,CAAC;YACnB,UAAU,EAAE,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC7C,IAAI,EAAE,mBAAmB,CAAC;SAC3B,CAAC;QACF,mBAAmB,EAAE;YACnB,IAAI,EAAE,sBAAsB,CAAC;YAC7B,SAAS,EAAE,gBAAgB,CAAC;YAC5B,WAAW,EAAE,UAAU,CAAC,MAAM,UAAU,CAAC,EAAE,CAAC;SAC7C,CAAC;KACH,CAAC;IAEK,MAAM,UAAU
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,14 @@ export const numberTypes = [...intTypes, ...floatTypes];
|
|
|
5
5
|
export const dateTypes = ['date', 'date-time'];
|
|
6
6
|
export const stringTypes = ['string', 'enum'];
|
|
7
7
|
export const booleanTypes = ['boolean'];
|
|
8
|
+
const getFieldType = (context) => { var _a, _b, _c; return (_c = (_b = (_a = context.operator) === null || _a === void 0 ? void 0 : _a.valueType) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : context.field.type; };
|
|
8
9
|
/**
|
|
9
10
|
* Converts a client field type to a server expression type
|
|
10
11
|
*
|
|
11
12
|
* @internal
|
|
12
13
|
**/
|
|
13
14
|
export function mapFieldTypeToRuleExpressionType(rule) {
|
|
14
|
-
switch (rule
|
|
15
|
+
switch (getFieldType(rule)) {
|
|
15
16
|
case 'int':
|
|
16
17
|
case 'long':
|
|
17
18
|
case 'double':
|
|
@@ -107,15 +108,16 @@ export const MILLIS_TO_SECONDS = 1000;
|
|
|
107
108
|
**/
|
|
108
109
|
export function transformRuleValue(rule) {
|
|
109
110
|
const transform = (value) => {
|
|
110
|
-
|
|
111
|
+
const fieldType = getFieldType(rule);
|
|
112
|
+
if (stringTypes.includes(fieldType))
|
|
111
113
|
return value;
|
|
112
|
-
if (numberTypes.includes(
|
|
114
|
+
if (numberTypes.includes(fieldType))
|
|
113
115
|
return value.toString(); // Handle as bigdecimal
|
|
114
|
-
if (booleanTypes.includes(
|
|
116
|
+
if (booleanTypes.includes(fieldType))
|
|
115
117
|
return value;
|
|
116
118
|
if (Array.isArray(value))
|
|
117
119
|
throw new Error(`Not implemented TernararyOperator or VariadicOperator args in rule value transformer`);
|
|
118
|
-
if (dateTypes.includes(
|
|
120
|
+
if (dateTypes.includes(fieldType)) {
|
|
119
121
|
return (new Date(value).getTime() / MILLIS_TO_SECONDS).toString(); // Handle as bigdecimal
|
|
120
122
|
}
|
|
121
123
|
throw new Error('Unhandled transformRuleValue case');
|
|
@@ -156,17 +158,18 @@ export function groupToRuleExpression(group, ruleToRuleExpression) {
|
|
|
156
158
|
**/
|
|
157
159
|
export function rebuildRuleValue(rule, rhs) {
|
|
158
160
|
const transform = (value) => {
|
|
159
|
-
|
|
161
|
+
const fieldType = getFieldType(rule);
|
|
162
|
+
if (stringTypes.includes(fieldType))
|
|
160
163
|
return value;
|
|
161
|
-
if (intTypes.includes(
|
|
164
|
+
if (intTypes.includes(fieldType))
|
|
162
165
|
return parseInt(value);
|
|
163
|
-
if (floatTypes.includes(
|
|
166
|
+
if (floatTypes.includes(fieldType))
|
|
164
167
|
return parseFloat(value);
|
|
165
|
-
if (booleanTypes.includes(
|
|
168
|
+
if (booleanTypes.includes(fieldType))
|
|
166
169
|
return value;
|
|
167
|
-
if (dateTypes.includes(
|
|
170
|
+
if (dateTypes.includes(fieldType)) {
|
|
168
171
|
const dateObj = new Date(parseInt(value) * MILLIS_TO_SECONDS);
|
|
169
|
-
return
|
|
172
|
+
return fieldType === 'date' ? formatDateString(dateObj) : formatDateTimeString(dateObj);
|
|
170
173
|
}
|
|
171
174
|
throw new Error('Unhandled rebuildRuleValue case');
|
|
172
175
|
};
|
|
@@ -43,6 +43,19 @@ export const clientOperators = {
|
|
|
43
43
|
IS_AFTER: 'IS_AFTER',
|
|
44
44
|
ON_OR_BEFORE: 'ON_OR_BEFORE',
|
|
45
45
|
ON_OR_AFTER: 'ON_OR_AFTER',
|
|
46
|
+
IS_CURRENT: RuleExpression.operations.IS_CURRENT,
|
|
47
|
+
IS_PREVIOUS: RuleExpression.operations.IS_PREVIOUS,
|
|
48
|
+
};
|
|
49
|
+
const dateRangeValueType = {
|
|
50
|
+
type: 'enum',
|
|
51
|
+
input: 'select',
|
|
52
|
+
values: {
|
|
53
|
+
HOUR: 'HOUR',
|
|
54
|
+
DAY: 'DAY',
|
|
55
|
+
WEEK: 'WEEK',
|
|
56
|
+
MONTH: 'MONTH',
|
|
57
|
+
YEAR: 'YEAR',
|
|
58
|
+
},
|
|
46
59
|
};
|
|
47
60
|
/**
|
|
48
61
|
* Operators for the server expression
|
|
@@ -151,6 +164,20 @@ const logicalOperators = [
|
|
|
151
164
|
applyTo: [...dateTypes],
|
|
152
165
|
tooltip: 'Check if the field is on or after a specified date/time',
|
|
153
166
|
},
|
|
167
|
+
{
|
|
168
|
+
type: clientOperators.IS_CURRENT,
|
|
169
|
+
nbInputs: 1,
|
|
170
|
+
applyTo: [...dateTypes],
|
|
171
|
+
tooltip: 'Check whether the current date/time matches the current hour/day/week/month/year',
|
|
172
|
+
valueType: dateRangeValueType,
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
type: clientOperators.IS_PREVIOUS,
|
|
176
|
+
nbInputs: 1,
|
|
177
|
+
applyTo: [...dateTypes],
|
|
178
|
+
tooltip: 'Check whether the current date/time matches the previous hour/day/week/month/year',
|
|
179
|
+
valueType: dateRangeValueType,
|
|
180
|
+
},
|
|
154
181
|
];
|
|
155
182
|
/**
|
|
156
183
|
* Converts a client operator name to a server operator name
|
|
@@ -204,6 +231,19 @@ export function ruleToRuleMethodExpression(rule, operatorName) {
|
|
|
204
231
|
if (!('value' in rule) || !Array.isArray(rule.value) || rule.value.length !== 2)
|
|
205
232
|
throw new Error('Invalid shape for CONTAINS_WORDS_STARTING_SPLIT_DELIMITER');
|
|
206
233
|
return toMethodExpression(rule, RuleExpression.methodCall.CONTAINS_WORDS_STARTING_WITH_IGNORE_CASE, rule.value.map((v) => ({ TYPE: 'STRING', VALUE: v })));
|
|
234
|
+
case clientOperators.IS_CURRENT:
|
|
235
|
+
case clientOperators.IS_PREVIOUS:
|
|
236
|
+
if (!('value' in rule))
|
|
237
|
+
throw new Error(`Invalid shape for operator IS_CURRENT | IS_PREVIOUS`);
|
|
238
|
+
return toMethodExpression(rule, RuleExpression.methodCall.DATE_TIME_IS_IN_RANGE, [
|
|
239
|
+
{ TYPE: 'STRING', VALUE: rule.value },
|
|
240
|
+
{
|
|
241
|
+
TYPE: 'STRING',
|
|
242
|
+
VALUE: operatorName === clientOperators.IS_CURRENT ? 'CURRENT' : 'PREVIOUS',
|
|
243
|
+
},
|
|
244
|
+
]);
|
|
245
|
+
default:
|
|
246
|
+
throw new Error('Unreachable default case');
|
|
207
247
|
}
|
|
208
248
|
}
|
|
209
249
|
/**
|
|
@@ -242,6 +282,8 @@ export function ruleToRuleExpression(ruleInput) {
|
|
|
242
282
|
case clientOperators.CONTAINS:
|
|
243
283
|
case clientOperators.CONTAINS_WORDS_STARTING_WITH:
|
|
244
284
|
case clientOperators.CONTAINS_WORDS_STARTING_SPLIT_DELIMITER:
|
|
285
|
+
case clientOperators.IS_CURRENT:
|
|
286
|
+
case clientOperators.IS_PREVIOUS:
|
|
245
287
|
return ruleToRuleMethodExpression(rule, operatorName);
|
|
246
288
|
default:
|
|
247
289
|
throw new Error(`Unmatched case for operator name: ${operatorName}`);
|
|
@@ -345,6 +387,17 @@ export function fromMethodExpression(fields, methodExpr) {
|
|
|
345
387
|
clientOperators[clientOperators.CONTAINS_WORDS_STARTING_SPLIT_DELIMITER],
|
|
346
388
|
methodExpr.PARAMETERS.slice(1).map((x) => x.VALUE),
|
|
347
389
|
];
|
|
390
|
+
case methodExpr.METHOD === RuleExpression.methodCall.DATE_TIME_IS_IN_RANGE &&
|
|
391
|
+
methodExpr.PARAMETERS.length === TERNARARY_FUNCTION_OPERANDS &&
|
|
392
|
+
methodExpr.PARAMETERS[2].TYPE === 'STRING' &&
|
|
393
|
+
(methodExpr.PARAMETERS[2].VALUE === 'CURRENT' ||
|
|
394
|
+
methodExpr.PARAMETERS[2].VALUE === 'PREVIOUS'):
|
|
395
|
+
return [
|
|
396
|
+
clientOperators[methodExpr.PARAMETERS[2].VALUE === 'CURRENT'
|
|
397
|
+
? clientOperators.IS_CURRENT
|
|
398
|
+
: clientOperators.IS_PREVIOUS],
|
|
399
|
+
methodExpr.PARAMETERS[1].VALUE,
|
|
400
|
+
];
|
|
348
401
|
default:
|
|
349
402
|
throw new Error('Unhandled fromMethodExpression case');
|
|
350
403
|
}
|
|
@@ -17,10 +17,11 @@ export var RuleExpression;
|
|
|
17
17
|
TRIM: 'TRIM',
|
|
18
18
|
LONG_TO_DATE: 'LONG_TO_DATE',
|
|
19
19
|
LONG_TO_DATE_TIME: 'LONG_TO_DATE_TIME',
|
|
20
|
+
DATE_TIME_IS_IN_RANGE: 'DATE_TIME_IS_IN_RANGE',
|
|
20
21
|
};
|
|
21
22
|
RuleExpression.logicalOperations = {
|
|
22
23
|
AND: 'AND',
|
|
23
24
|
OR: 'OR',
|
|
24
25
|
};
|
|
25
|
-
RuleExpression.operations = Object.assign(Object.assign({}, RuleExpression.logicalOperations), { GREATER_THAN: 'GREATER_THAN', LESS_THAN: 'LESS_THAN', GREATER_THAN_OR_EQUAL: 'GREATER_THAN_OR_EQUAL', LESS_THAN_OR_EQUAL: 'LESS_THAN_OR_EQUAL', EQUALS: 'EQUALS', NOT_EQUALS: 'NOT_EQUALS', PLUS: 'PLUS', MINUS: 'MINUS', MULTIPLY: 'MULTIPLY', DIVIDE: 'DIVIDE', BITWISE_AND: 'BITWISE_AND', BITWISE_OR: 'BITWISE_OR', ASSIGNMENT: 'ASSIGNMENT' });
|
|
26
|
+
RuleExpression.operations = Object.assign(Object.assign({}, RuleExpression.logicalOperations), { GREATER_THAN: 'GREATER_THAN', LESS_THAN: 'LESS_THAN', GREATER_THAN_OR_EQUAL: 'GREATER_THAN_OR_EQUAL', LESS_THAN_OR_EQUAL: 'LESS_THAN_OR_EQUAL', EQUALS: 'EQUALS', NOT_EQUALS: 'NOT_EQUALS', PLUS: 'PLUS', MINUS: 'MINUS', MULTIPLY: 'MULTIPLY', DIVIDE: 'DIVIDE', BITWISE_AND: 'BITWISE_AND', BITWISE_OR: 'BITWISE_OR', ASSIGNMENT: 'ASSIGNMENT', IS_CURRENT: 'IS_CURRENT', IS_PREVIOUS: 'IS_PREVIOUS' });
|
|
26
27
|
})(RuleExpression || (RuleExpression = {}));
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@genesislcap/foundation-ui",
|
|
3
3
|
"description": "Genesis Foundation UI",
|
|
4
|
-
"version": "14.
|
|
4
|
+
"version": "14.290.0",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"license": "SEE LICENSE IN license.txt",
|
|
7
7
|
"main": "dist/esm/index.js",
|
|
@@ -83,13 +83,13 @@
|
|
|
83
83
|
}
|
|
84
84
|
},
|
|
85
85
|
"devDependencies": {
|
|
86
|
-
"@genesislcap/foundation-testing": "14.
|
|
87
|
-
"@genesislcap/genx": "14.
|
|
88
|
-
"@genesislcap/rollup-builder": "14.
|
|
89
|
-
"@genesislcap/ts-builder": "14.
|
|
90
|
-
"@genesislcap/uvu-playwright-builder": "14.
|
|
91
|
-
"@genesislcap/vite-builder": "14.
|
|
92
|
-
"@genesislcap/webpack-builder": "14.
|
|
86
|
+
"@genesislcap/foundation-testing": "14.290.0",
|
|
87
|
+
"@genesislcap/genx": "14.290.0",
|
|
88
|
+
"@genesislcap/rollup-builder": "14.290.0",
|
|
89
|
+
"@genesislcap/ts-builder": "14.290.0",
|
|
90
|
+
"@genesislcap/uvu-playwright-builder": "14.290.0",
|
|
91
|
+
"@genesislcap/vite-builder": "14.290.0",
|
|
92
|
+
"@genesislcap/webpack-builder": "14.290.0",
|
|
93
93
|
"copyfiles": "^2.4.1",
|
|
94
94
|
"rimraf": "^5.0.0",
|
|
95
95
|
"rxjs": "^7.5.4"
|
|
@@ -100,15 +100,15 @@
|
|
|
100
100
|
"@fortawesome/free-regular-svg-icons": "^6.2.1",
|
|
101
101
|
"@fortawesome/free-solid-svg-icons": "^6.2.1",
|
|
102
102
|
"@genesiscommunitysuccess/analyzer-import-alias-plugin": "^5.0.3",
|
|
103
|
-
"@genesislcap/expression-builder": "14.
|
|
104
|
-
"@genesislcap/foundation-comms": "14.
|
|
105
|
-
"@genesislcap/foundation-criteria": "14.
|
|
106
|
-
"@genesislcap/foundation-errors": "14.
|
|
107
|
-
"@genesislcap/foundation-events": "14.
|
|
108
|
-
"@genesislcap/foundation-logger": "14.
|
|
109
|
-
"@genesislcap/foundation-notifications": "14.
|
|
110
|
-
"@genesislcap/foundation-user": "14.
|
|
111
|
-
"@genesislcap/foundation-utils": "14.
|
|
103
|
+
"@genesislcap/expression-builder": "14.290.0",
|
|
104
|
+
"@genesislcap/foundation-comms": "14.290.0",
|
|
105
|
+
"@genesislcap/foundation-criteria": "14.290.0",
|
|
106
|
+
"@genesislcap/foundation-errors": "14.290.0",
|
|
107
|
+
"@genesislcap/foundation-events": "14.290.0",
|
|
108
|
+
"@genesislcap/foundation-logger": "14.290.0",
|
|
109
|
+
"@genesislcap/foundation-notifications": "14.290.0",
|
|
110
|
+
"@genesislcap/foundation-user": "14.290.0",
|
|
111
|
+
"@genesislcap/foundation-utils": "14.290.0",
|
|
112
112
|
"@microsoft/fast-colors": "5.3.1",
|
|
113
113
|
"@microsoft/fast-components": "2.30.6",
|
|
114
114
|
"@microsoft/fast-element": "1.14.0",
|
|
@@ -130,5 +130,5 @@
|
|
|
130
130
|
"access": "public"
|
|
131
131
|
},
|
|
132
132
|
"customElements": "dist/custom-elements.json",
|
|
133
|
-
"gitHead": "
|
|
133
|
+
"gitHead": "d06408e1848d98c9de0bd3a7f3998e5650128d5d"
|
|
134
134
|
}
|