@lightdash/common 2.477.0 → 2.478.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/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/types/filterGrammar.d.ts +2 -0
- package/dist/cjs/types/filterGrammar.d.ts.map +1 -1
- package/dist/cjs/types/filterGrammar.grammar.d.ts +1 -1
- package/dist/cjs/types/filterGrammar.grammar.d.ts.map +1 -1
- package/dist/cjs/types/filterGrammar.grammar.js +14 -1
- package/dist/cjs/types/filterGrammar.grammar.js.map +1 -1
- package/dist/cjs/types/filterGrammar.js +11 -14
- package/dist/cjs/types/filterGrammar.js.map +1 -1
- package/dist/cjs/types/filterGrammar.parser.d.ts.map +1 -1
- package/dist/cjs/types/filterGrammar.parser.js +493 -164
- package/dist/cjs/types/filterGrammar.parser.js.map +1 -1
- package/dist/cjs/types/filterGrammarConversion.d.ts.map +1 -1
- package/dist/cjs/types/filterGrammarConversion.js +8 -2
- package/dist/cjs/types/filterGrammarConversion.js.map +1 -1
- package/dist/cjs/utils/filters.d.ts.map +1 -1
- package/dist/cjs/utils/filters.js +6 -0
- package/dist/cjs/utils/filters.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/types/filterGrammar.d.ts +2 -0
- package/dist/esm/types/filterGrammar.d.ts.map +1 -1
- package/dist/esm/types/filterGrammar.grammar.d.ts +1 -1
- package/dist/esm/types/filterGrammar.grammar.d.ts.map +1 -1
- package/dist/esm/types/filterGrammar.grammar.js +14 -1
- package/dist/esm/types/filterGrammar.grammar.js.map +1 -1
- package/dist/esm/types/filterGrammar.js +11 -14
- package/dist/esm/types/filterGrammar.js.map +1 -1
- package/dist/esm/types/filterGrammar.parser.d.ts.map +1 -1
- package/dist/esm/types/filterGrammar.parser.js +493 -164
- package/dist/esm/types/filterGrammar.parser.js.map +1 -1
- package/dist/esm/types/filterGrammarConversion.d.ts.map +1 -1
- package/dist/esm/types/filterGrammarConversion.js +8 -2
- package/dist/esm/types/filterGrammarConversion.js.map +1 -1
- package/dist/esm/utils/filters.d.ts.map +1 -1
- package/dist/esm/utils/filters.js +6 -0
- package/dist/esm/utils/filters.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/types/filterGrammar.d.ts +2 -0
- package/dist/types/types/filterGrammar.d.ts.map +1 -1
- package/dist/types/types/filterGrammar.grammar.d.ts +1 -1
- package/dist/types/types/filterGrammar.grammar.d.ts.map +1 -1
- package/dist/types/types/filterGrammar.grammar.js +14 -1
- package/dist/types/types/filterGrammar.grammar.js.map +1 -1
- package/dist/types/types/filterGrammar.js +11 -14
- package/dist/types/types/filterGrammar.js.map +1 -1
- package/dist/types/types/filterGrammar.parser.d.ts.map +1 -1
- package/dist/types/types/filterGrammar.parser.js +493 -164
- package/dist/types/types/filterGrammar.parser.js.map +1 -1
- package/dist/types/types/filterGrammarConversion.d.ts.map +1 -1
- package/dist/types/types/filterGrammarConversion.js +8 -2
- package/dist/types/types/filterGrammarConversion.js.map +1 -1
- package/dist/types/utils/filters.d.ts.map +1 -1
- package/dist/types/utils/filters.js +6 -0
- package/dist/types/utils/filters.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,6 +11,8 @@ export type ParsedFilter = {
|
|
|
11
11
|
values: AnyType[];
|
|
12
12
|
is?: boolean;
|
|
13
13
|
date_interval?: string;
|
|
14
|
+
to_date?: boolean;
|
|
15
|
+
exclude_today?: boolean;
|
|
14
16
|
};
|
|
15
17
|
export declare const parseFilters: (rawFilters: Record<string, AnyType>[] | undefined) => MetricFilterRule[];
|
|
16
18
|
export declare const isFilterValueMap: (value: unknown) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammar.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammar.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,
|
|
1
|
+
{"version":3,"file":"filterGrammar.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammar.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAGH,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,EAE/B,MAAM,UAAU,CAAC;AAClB,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAMpD,MAAM,MAAM,cAAc,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B,GAAG;IACA,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AA2DF,eAAO,MAAM,YAAY,eACT,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,KAClD,gBAAgB,EA6DlB,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAAW,OAAO,KAAG,OACsB,CAAC;AAEzE,eAAO,MAAM,yBAAyB,yCAGnC;IACC,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAC9C,cAAc,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;CAChD,KAAG,uBAAuB,EAsG1B,CAAC;eAIa,aAAa"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare const filterGrammar = "ROOT\n= EXPRESSION / EMPTY_STRING\nEMPTY_STRING = '' {\n return {\n type: 'equals',\n values: [],\n is: true,\n }\n }\n\nEXPRESSION\n= BETWEEN_DATE / BETWEEN_NUMERICAL / NUMERICAL / CURRENT_DATE_RESTRICTION / DATE_RESTRICTION / LIST / TERM\n\nBETWEEN_DATE = SPACE_SYMBOL* (\"between\"i / \"BETWEEN\") SPACE_SYMBOL+ min:DATE_STRING SPACE_SYMBOL+ (\"and\"i / \"AND\") SPACE_SYMBOL+ max:DATE_STRING {\n return {\n type: 'inBetween',\n values: [min, max],\n is: true\n }\n }\n\nBETWEEN_NUMERICAL = SPACE_SYMBOL* (\"between\"i / \"BETWEEN\") SPACE_SYMBOL+ min:NUMBER SPACE_SYMBOL+ (\"and\"i / \"AND\") SPACE_SYMBOL+ max:NUMBER {\n return {\n type: 'inBetween',\n values: [min, max],\n is: true\n }\n }\n\nNUMERICAL = SPACE_SYMBOL* operator:OPERATOR SPACE_SYMBOL* value:NUMBER {\n return {\n type: operator,\n values: [value]\n }\n }\n\nOPERATOR = '>=' / '<=' / '>' / '<'\n\nDATE_STRING\n = quotation_mark date:ISO_DATE quotation_mark { return date }\n / ISO_DATE\n\nISO_DATE\n = year:YEAR \"-\" month:MONTH \"-\" day:DAY time:(\"T\" TIME \"Z\"?)? {\n return text();\n }\n\nYEAR = [0-9][0-9][0-9][0-9]\nMONTH = (\"0\" [1-9]) / (\"1\" [0-2])\nDAY = (\"0\" [1-9]) / ([1-2] [0-9]) / (\"3\" [0-1])\nTIME = [0-9][0-9] \":\" [0-9][0-9] \":\" [0-9][0-9] (\".\" [0-9]+)?\n\nDATE_RESTRICTION = SPACE_SYMBOL* operator:DATE_OPERATOR SPACE_SYMBOL* value:NUMBER SPACE_SYMBOL* interval:DATE_INTERVAL {\n return {\n type: operator,\n values: [value],\n date_interval: interval\n }\n }\n\nDATE_OPERATOR = 'inThePast' / 'inTheNext'\nDATE_INTERVAL = 'milliseconds' / 'seconds' / 'minutes' / 'hours' / 'days' / 'weeks' / 'months' / 'years'\n\nCURRENT_DATE_RESTRICTION
|
|
1
|
+
declare const filterGrammar = "ROOT\n= EXPRESSION / EMPTY_STRING\nEMPTY_STRING = '' {\n return {\n type: 'equals',\n values: [],\n is: true,\n }\n }\n\nEXPRESSION\n= BETWEEN_DATE / BETWEEN_NUMERICAL / NUMERICAL / CURRENT_DATE_RESTRICTION / DATE_RESTRICTION / LIST / TERM\n\nBETWEEN_DATE = SPACE_SYMBOL* (\"between\"i / \"BETWEEN\") SPACE_SYMBOL+ min:DATE_STRING SPACE_SYMBOL+ (\"and\"i / \"AND\") SPACE_SYMBOL+ max:DATE_STRING {\n return {\n type: 'inBetween',\n values: [min, max],\n is: true\n }\n }\n\nBETWEEN_NUMERICAL = SPACE_SYMBOL* (\"between\"i / \"BETWEEN\") SPACE_SYMBOL+ min:NUMBER SPACE_SYMBOL+ (\"and\"i / \"AND\") SPACE_SYMBOL+ max:NUMBER {\n return {\n type: 'inBetween',\n values: [min, max],\n is: true\n }\n }\n\nNUMERICAL = SPACE_SYMBOL* operator:OPERATOR SPACE_SYMBOL* value:NUMBER {\n return {\n type: operator,\n values: [value]\n }\n }\n\nOPERATOR = '>=' / '<=' / '>' / '<'\n\nDATE_STRING\n = quotation_mark date:ISO_DATE quotation_mark { return date }\n / ISO_DATE\n\nISO_DATE\n = year:YEAR \"-\" month:MONTH \"-\" day:DAY time:(\"T\" TIME \"Z\"?)? {\n return text();\n }\n\nYEAR = [0-9][0-9][0-9][0-9]\nMONTH = (\"0\" [1-9]) / (\"1\" [0-2])\nDAY = (\"0\" [1-9]) / ([1-2] [0-9]) / (\"3\" [0-1])\nTIME = [0-9][0-9] \":\" [0-9][0-9] \":\" [0-9][0-9] (\".\" [0-9]+)?\n\nDATE_RESTRICTION = SPACE_SYMBOL* operator:DATE_OPERATOR SPACE_SYMBOL* value:NUMBER SPACE_SYMBOL* interval:DATE_INTERVAL {\n return {\n type: operator,\n values: [value],\n date_interval: interval\n }\n }\n\nDATE_OPERATOR = 'inThePast' / 'inTheNext'\nDATE_INTERVAL = 'milliseconds' / 'seconds' / 'minutes' / 'hours' / 'days' / 'weeks' / 'months' / 'years'\n\nCURRENT_DATE_RESTRICTION\n = SPACE_SYMBOL* operator:CURRENT_DATE_OPERATOR SPACE_SYMBOL+ interval:CURRENT_PERIOD_INTERVAL SPACE_SYMBOL+ 'to' SPACE_SYMBOL+ 'date' excludeToday:(SPACE_SYMBOL+ 'excluding' SPACE_SYMBOL+ 'today')? SPACE_SYMBOL* {\n return {\n type: operator,\n values: [1],\n date_interval: interval,\n to_date: true,\n ...(excludeToday ? { exclude_today: true } : {})\n }\n }\n / SPACE_SYMBOL* operator:CURRENT_DATE_OPERATOR SPACE_SYMBOL+ interval:CURRENT_DATE_INTERVAL {\n return {\n type: operator,\n values: [1],\n date_interval: interval\n }\n }\n\nCURRENT_DATE_OPERATOR = 'notInTheCurrent' / 'inTheCurrent'\nCURRENT_DATE_INTERVAL\n = 'milliseconds' / 'seconds' / 'minutes' / 'hours' / 'days' / 'weeks' / 'months' / 'quarters' / 'years'\n / singular:('millisecond' / 'second' / 'minute' / 'hour' / 'day' / 'week' / 'month' / 'quarter' / 'year') { return singular + 's' }\nCURRENT_PERIOD_INTERVAL\n = 'weeks' / 'months' / 'quarters' / 'years'\n / singular:('week' / 'month' / 'quarter' / 'year') { return singular + 's' }\n\nNUMBER\n = '-'? FLOAT ([Ee] [+-]? INTEGER)?\n { return Number(text()) }\n\nFLOAT\n = INTEGER '.'? INTEGER?\n\nINTEGER\n = [0-9]+\n\nLIST\n= left:TERM COMMA right:EXPRESSION {\n return {\n type: ',',\n left: left,\n right: right\n }\n}\n\nTERM\n= not:(NOT)? term:(PCT / KEYWORDS / MATCH) {\n term.is = not ? false : true\n return term\n }\n\n\n\nKEYWORDS = (\"EMPTY\" / \"empty\") {\n return {\n type: 'blank',\n }\n}\n/ (\"NULL\" / \"null\") {\n return {\n type: 'null',\n }\n}\nMATCH\n= quotation_mark sequence:(char / COMMA / UNDERSCORE / CARET)+ quotation_mark {\n return {\n type:'equals',\n values: [sequence.join('')]\n }\n }\n / sequence:(char / COMMA / UNDERSCORE / CARET)+ {\n return {\n type:'equals',\n values: [sequence.join('')]\n }\n}\nPCT\n= CONTAINS / STARTS_WITH / ENDS_WITH\nCONTAINS\n= PCT_SYMBOL value:(char / UNDERSCORE)+ PCT_SYMBOL !(string / PCT_SYMBOL / UNDERSCORE) {\n return {\n type: 'include',\n values: [value.join('')]\n }\n}\nSTARTS_WITH\n= value:(char / UNDERSCORE)+ PCT_SYMBOL !(string / PCT_SYMBOL / UNDERSCORE) {\n return {\n type: 'startsWith',\n values: [value.join('')]\n }\n}\nENDS_WITH\n= PCT_SYMBOL value:(char / UNDERSCORE)+ !(PCT_SYMBOL ) {\nreturn {\n type: 'endsWith',\n values: [value.join('')]\n }\n}\nNOT = '!'\nCOMMA = COMMA_SYMBOL\nraw_string \"string\"\n= str:char_sequence { return str }\nstring \"string\"\n= str:char_sequence { return str ? str.trim():str}\n/* ----- 7. Strings ----- */\nchar_sequence \"string\"\n= quotation_mark chars:(valid_char / escaped_quotation_mark)* quotation_mark {\n return '\"' + chars.join(\"\") + '\"'\n}\n/\nchars:char+ {return chars.join('') }\nchar \"character\"\n= ESCAPE_CARET\n/ escape symbol:SYMBOLS { return symbol}\n/ escape\nsequence:(\n '\"'\n / \"\\\\\"\n / \"/\"\n / \"b\" { return \"\\b\"; }\n / \"f\" { return \"\\f\"; }\n / \"n\" { return \"\\n\"; }\n / \"r\" { return \"\\r\"; }\n / \"t\" { return \"\\t\"; }\n / \"u\" digits:$(HEXDIG HEXDIG HEXDIG HEXDIG) {\n return String.fromCharCode(parseInt(digits, 16));\n }\n)\n{ return sequence }\n/ unescaped\n/ NOT_SYMBOL\n/* Returns a single space for double escaped space at the end, or before a comma\nto reverse escapeWithDoubleLastEscape */\nESCAPE_CARET\n= CARET (SPACE_SYMBOL ! FOLLOWING_SPACE_END / ESCAPED_DOUBLE_SPACE) {\n return \" \"\n}\n/\nCARET symbol:(PCT_SYMBOL / UNDERSCORE / COMMA_SYMBOL / CARET / NOT_SYMBOL) {\n return symbol\n}\nSYMBOLS = PCT_SYMBOL / COMMA_SYMBOL / NOT_SYMBOL / UNDERSCORE / CARET\nPCT_SYMBOL \t\t = '%'\nUNDERSCORE \t\t = '_'\nCOMMA_SYMBOL \t = \",\"\nNOT_SYMBOL\t \t = \"-\"\nSPACE_SYMBOL = \" \"\nFOLLOWING_SPACE_END = \"^ \" (&COMMA_SYMBOL / !.)\nESCAPED_DOUBLE_SPACE = \" ^ \"\nCARET \t \t\t = \"^\"\nescape \t = \"\\\\\"\nescaped_quotation_mark = '\\\\\"'\nquotation_mark \t = '\"'\nunescaped \t = !SYMBOLS char:char_range { return char;}\nvalid_char = char:char_range { return char;}\nchar_range = [^\\0-\\x1F\\x22\\x5C]\nHEXDIG = [0-9a-f]i\n\n\n";
|
|
2
2
|
export default filterGrammar;
|
|
3
3
|
//# sourceMappingURL=filterGrammar.grammar.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammar.grammar.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammar.grammar.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"filterGrammar.grammar.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammar.grammar.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,aAAa,4/LA+NlB,CAAC;eAEa,aAAa"}
|
|
@@ -71,7 +71,17 @@ DATE_RESTRICTION = SPACE_SYMBOL* operator:DATE_OPERATOR SPACE_SYMBOL* value:NUMB
|
|
|
71
71
|
DATE_OPERATOR = 'inThePast' / 'inTheNext'
|
|
72
72
|
DATE_INTERVAL = 'milliseconds' / 'seconds' / 'minutes' / 'hours' / 'days' / 'weeks' / 'months' / 'years'
|
|
73
73
|
|
|
74
|
-
CURRENT_DATE_RESTRICTION
|
|
74
|
+
CURRENT_DATE_RESTRICTION
|
|
75
|
+
= SPACE_SYMBOL* operator:CURRENT_DATE_OPERATOR SPACE_SYMBOL+ interval:CURRENT_PERIOD_INTERVAL SPACE_SYMBOL+ 'to' SPACE_SYMBOL+ 'date' excludeToday:(SPACE_SYMBOL+ 'excluding' SPACE_SYMBOL+ 'today')? SPACE_SYMBOL* {
|
|
76
|
+
return {
|
|
77
|
+
type: operator,
|
|
78
|
+
values: [1],
|
|
79
|
+
date_interval: interval,
|
|
80
|
+
to_date: true,
|
|
81
|
+
...(excludeToday ? { exclude_today: true } : {})
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
/ SPACE_SYMBOL* operator:CURRENT_DATE_OPERATOR SPACE_SYMBOL+ interval:CURRENT_DATE_INTERVAL {
|
|
75
85
|
return {
|
|
76
86
|
type: operator,
|
|
77
87
|
values: [1],
|
|
@@ -83,6 +93,9 @@ CURRENT_DATE_OPERATOR = '${FilterOperator.NOT_IN_THE_CURRENT}' / '${FilterOperat
|
|
|
83
93
|
CURRENT_DATE_INTERVAL
|
|
84
94
|
= 'milliseconds' / 'seconds' / 'minutes' / 'hours' / 'days' / 'weeks' / 'months' / 'quarters' / 'years'
|
|
85
95
|
/ singular:('millisecond' / 'second' / 'minute' / 'hour' / 'day' / 'week' / 'month' / 'quarter' / 'year') { return singular + 's' }
|
|
96
|
+
CURRENT_PERIOD_INTERVAL
|
|
97
|
+
= 'weeks' / 'months' / 'quarters' / 'years'
|
|
98
|
+
/ singular:('week' / 'month' / 'quarter' / 'year') { return singular + 's' }
|
|
86
99
|
|
|
87
100
|
NUMBER
|
|
88
101
|
= '-'? FLOAT ([Ee] [+-]? INTEGER)?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammar.grammar.js","sourceRoot":"","sources":["../../../src/types/filterGrammar.grammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,8EAA8E;AAC9E,0EAA0E;AAC1E,2EAA2E;AAC3E,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,gFAAgF;AAChF,4EAA4E;AAC5E,4EAA4E;AAC5E,MAAM,aAAa,GAAG;;;;eAIP,cAAc,CAAC,MAAM;;;;;;;;;;;iBAWnB,cAAc,CAAC,UAAU;;;;;;;;iBAQzB,cAAc,CAAC,UAAU
|
|
1
|
+
{"version":3,"file":"filterGrammar.grammar.js","sourceRoot":"","sources":["../../../src/types/filterGrammar.grammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,8EAA8E;AAC9E,0EAA0E;AAC1E,2EAA2E;AAC3E,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,gFAAgF;AAChF,4EAA4E;AAC5E,4EAA4E;AAC5E,MAAM,aAAa,GAAG;;;;eAIP,cAAc,CAAC,MAAM;;;;;;;;;;;iBAWnB,cAAc,CAAC,UAAU;;;;;;;;iBAQzB,cAAc,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA0Df,cAAc,CAAC,kBAAkB,QAAQ,cAAc,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAgD9E,cAAc,CAAC,MAAM;;;;;;gBAMxB,cAAc,CAAC,MAAM;;;;;;;;;eAStB,cAAc,CAAC,OAAO;;;;;;;eAOtB,cAAc,CAAC,WAAW;;;;;;;cAO3B,cAAc,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiErC,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -6,6 +6,15 @@ import filterGrammar from './filterGrammar.grammar';
|
|
|
6
6
|
// it instead of `peg.generate(filterGrammar)` keeps the browser SDK bundle free
|
|
7
7
|
// of `eval()`/`new Function()` so it works under a strict CSP. See issue #21276.
|
|
8
8
|
import { filterGrammarParser } from './filterGrammar.parser';
|
|
9
|
+
const parseDateSettings = (parsedFilter) => parsedFilter.date_interval
|
|
10
|
+
? {
|
|
11
|
+
settings: {
|
|
12
|
+
unitOfTime: parsedFilter.date_interval,
|
|
13
|
+
...(parsedFilter.to_date && { toDate: true }),
|
|
14
|
+
...(parsedFilter.exclude_today && { excludeToday: true }),
|
|
15
|
+
},
|
|
16
|
+
}
|
|
17
|
+
: null;
|
|
9
18
|
const parseOperator = (operator, isTrue, fieldName) => {
|
|
10
19
|
switch (operator) {
|
|
11
20
|
case FilterOperator.EQUALS:
|
|
@@ -72,13 +81,7 @@ export const parseFilters = (rawFilters) => {
|
|
|
72
81
|
target: { fieldRef: key },
|
|
73
82
|
operator: parseOperator(parsedFilter.type, !!parsedFilter.is, key),
|
|
74
83
|
values: parsedFilter.values || [1],
|
|
75
|
-
...(parsedFilter
|
|
76
|
-
? {
|
|
77
|
-
settings: {
|
|
78
|
-
unitOfTime: parsedFilter.date_interval,
|
|
79
|
-
},
|
|
80
|
-
}
|
|
81
|
-
: null),
|
|
84
|
+
...parseDateSettings(parsedFilter),
|
|
82
85
|
},
|
|
83
86
|
];
|
|
84
87
|
}
|
|
@@ -164,13 +167,7 @@ export const parseModelRequiredFilters = ({ requiredFilters, defaultFilters, })
|
|
|
164
167
|
target: filterTarget,
|
|
165
168
|
operator: parseOperator(parsedFilter.type, !!parsedFilter.is, key),
|
|
166
169
|
values: parsedFilter.values || [1],
|
|
167
|
-
...(parsedFilter
|
|
168
|
-
? {
|
|
169
|
-
settings: {
|
|
170
|
-
unitOfTime: parsedFilter.date_interval,
|
|
171
|
-
},
|
|
172
|
-
}
|
|
173
|
-
: null),
|
|
170
|
+
...parseDateSettings(parsedFilter),
|
|
174
171
|
required,
|
|
175
172
|
},
|
|
176
173
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammar.js","sourceRoot":"","sources":["../../../src/types/filterGrammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EACH,cAAc,
|
|
1
|
+
{"version":3,"file":"filterGrammar.js","sourceRoot":"","sources":["../../../src/types/filterGrammar.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammar.parser.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammar.parser.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,EAAE;IAC9B,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"filterGrammar.parser.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammar.parser.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,EAAE;IAC9B,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;CAg4H9B,CAAC"}
|