@provoly/dashboard 1.1.4 → 1.1.6
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/esm2022/lib/core/model/filter.interface.mjs +1 -1
- package/esm2022/widgets/widget-map/component/widget-map.component.mjs +4 -1
- package/esm2022/widgets/widget-map/utils/cql-utils.class.mjs +54 -48
- package/fesm2022/provoly-dashboard-widgets-widget-map.mjs +56 -47
- package/fesm2022/provoly-dashboard-widgets-widget-map.mjs.map +1 -1
- package/lib/core/model/filter.interface.d.ts +1 -1
- package/package.json +49 -49
- package/widgets/widget-map/utils/cql-utils.class.d.ts +1 -0
|
@@ -7,59 +7,65 @@ export class CqlUtils {
|
|
|
7
7
|
const attributesReference = classes.map((clazz) => clazz.attributes).flat();
|
|
8
8
|
return filters[datasourceId]
|
|
9
9
|
.map((cond) => {
|
|
10
|
-
const conditions = [];
|
|
11
10
|
const attribute = attributesReference.find((attr) => attr.id === cond.attribute);
|
|
12
11
|
const field = fields.find((f) => f.id === attribute?.field);
|
|
13
12
|
const attributeName = attribute?.technicalName;
|
|
14
|
-
|
|
15
|
-
const quoteSafeValue = `${cond.value}`.replace(/'/g, "''");
|
|
16
|
-
switch (cond.operator) {
|
|
17
|
-
case 'EQUALS':
|
|
18
|
-
if (!field || TextFieldTypes.includes(field?.type)) {
|
|
19
|
-
conditions.push(`${attributeName}='${quoteSafeValue}'`);
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
conditions.push(`${attributeName}=${cond.value}`);
|
|
23
|
-
}
|
|
24
|
-
break;
|
|
25
|
-
case 'CONTAINS':
|
|
26
|
-
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);
|
|
27
|
-
break;
|
|
28
|
-
case 'START_WITH':
|
|
29
|
-
conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);
|
|
30
|
-
break;
|
|
31
|
-
case 'END_WITH':
|
|
32
|
-
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);
|
|
33
|
-
break;
|
|
34
|
-
case 'GREATER_THAN':
|
|
35
|
-
conditions.push(`${attributeName}>${cond.value}`);
|
|
36
|
-
break;
|
|
37
|
-
case 'LOWER_THAN':
|
|
38
|
-
conditions.push(`${attributeName}<${cond.value}`);
|
|
39
|
-
break;
|
|
40
|
-
case 'INSIDE':
|
|
41
|
-
const splitI = cond.value?.split(',');
|
|
42
|
-
if (splitI && splitI.length > 1) {
|
|
43
|
-
conditions.push(`${attributeName}<${splitI[0]}`);
|
|
44
|
-
conditions.push(`${attributeName}>${splitI[1]}`);
|
|
45
|
-
}
|
|
46
|
-
break;
|
|
47
|
-
case 'OUTSIDE':
|
|
48
|
-
const splitO = cond.value?.split(',');
|
|
49
|
-
if (splitO && splitO.length > 1) {
|
|
50
|
-
conditions.push(`${attributeName}>${splitO[0]}`);
|
|
51
|
-
conditions.push(`${attributeName}<${splitO[1]}`);
|
|
52
|
-
}
|
|
53
|
-
break;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
console.warn(`Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`);
|
|
58
|
-
}
|
|
59
|
-
return conditions;
|
|
13
|
+
return this.getConditionsForValue(attributeName, cond, field, datasourceId);
|
|
60
14
|
})
|
|
61
15
|
.filter((conds) => conds.length > 0)
|
|
62
16
|
.join(' AND ');
|
|
63
17
|
}
|
|
18
|
+
static getConditionsForValue(attributeName, cond, field, datasourceId) {
|
|
19
|
+
let conditions = [];
|
|
20
|
+
const values = (Array.isArray(cond.value) ? cond.value : [cond.value]);
|
|
21
|
+
if (attributeName) {
|
|
22
|
+
values.forEach((value) => {
|
|
23
|
+
if (value && (typeof value !== 'string' || value.length > 0)) {
|
|
24
|
+
const quoteSafeValue = `${value}`.replace(/'/g, "''");
|
|
25
|
+
switch (cond.operator) {
|
|
26
|
+
case 'EQUALS':
|
|
27
|
+
if (!field || TextFieldTypes.includes(field?.type)) {
|
|
28
|
+
conditions.push(`${attributeName}='${quoteSafeValue}'`);
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
conditions.push(`${attributeName}=${value}`);
|
|
32
|
+
}
|
|
33
|
+
break;
|
|
34
|
+
case 'CONTAINS':
|
|
35
|
+
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);
|
|
36
|
+
break;
|
|
37
|
+
case 'START_WITH':
|
|
38
|
+
conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);
|
|
39
|
+
break;
|
|
40
|
+
case 'END_WITH':
|
|
41
|
+
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);
|
|
42
|
+
break;
|
|
43
|
+
case 'GREATER_THAN':
|
|
44
|
+
conditions.push(`${attributeName}>${value}`);
|
|
45
|
+
break;
|
|
46
|
+
case 'LOWER_THAN':
|
|
47
|
+
conditions.push(`${attributeName}<${value}`);
|
|
48
|
+
break;
|
|
49
|
+
case 'OUTSIDE':
|
|
50
|
+
const splitI = value?.split(',');
|
|
51
|
+
if (splitI && splitI.length > 1) {
|
|
52
|
+
conditions.push(`( ${attributeName}<${splitI[0]} AND ${attributeName}>${splitI[1]} )`);
|
|
53
|
+
}
|
|
54
|
+
break;
|
|
55
|
+
case 'INSIDE':
|
|
56
|
+
const splitO = value?.split(',');
|
|
57
|
+
if (splitO && splitO.length > 1) {
|
|
58
|
+
conditions.push(`( ${attributeName}>${splitO[0]} AND ${attributeName}<${splitO[1]} )`);
|
|
59
|
+
}
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
console.warn(`Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`);
|
|
67
|
+
}
|
|
68
|
+
return conditions.length > 1 ? '( ' + conditions.join(' OR ') + ' )' : conditions[0];
|
|
69
|
+
}
|
|
64
70
|
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cql-utils.class.js","sourceRoot":"","sources":["../../../../../../../projects/provoly/dashboard/widgets/widget-map/utils/cql-utils.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { Class, Field, FilterContext, TextFieldTypes } from '@provoly/dashboard';\n\nexport class CqlUtils {\n  static getCQLParamsFor(\n    datasourceId: string,\n    filters: { [p: string]: FilterContext[] },\n    classes: Class[],\n    fields: Field[]\n  ): string | null {\n    if (!filters || !datasourceId || !filters[datasourceId] || filters[datasourceId].length === 0) {\n      return null;\n    }\n\n    const attributesReference = classes.map((clazz) => clazz.attributes).flat();\n\n    return filters[datasourceId]\n      .map((cond) => {\n        const attribute = attributesReference.find((attr) => attr.id === cond.attribute);\n        const field = fields.find((f) => f.id === attribute?.field);\n        const attributeName = attribute?.technicalName;\n\n        return this.getConditionsForValue(attributeName, cond, field, datasourceId);\n      })\n      .filter((conds) => conds.length > 0)\n      .join(' AND ');\n  }\n\n  static getConditionsForValue(\n    attributeName: string | undefined,\n    cond: FilterContext,\n    field: Field | undefined,\n    datasourceId: string\n  ) {\n    let conditions: string[] = [];\n\n    const values = (Array.isArray(cond.value) ? cond.value : [cond.value]) as string[] | number[];\n\n    if (attributeName) {\n      values.forEach((value) => {\n        if (value && (typeof value !== 'string' || value.length > 0)) {\n          const quoteSafeValue = `${value}`.replace(/'/g, \"''\");\n          switch (cond.operator) {\n            case 'EQUALS':\n              if (!field || TextFieldTypes.includes(field?.type)) {\n                conditions.push(`${attributeName}='${quoteSafeValue}'`);\n              } else {\n                conditions.push(`${attributeName}=${value}`);\n              }\n              break;\n            case 'CONTAINS':\n              conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);\n              break;\n            case 'START_WITH':\n              conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);\n              break;\n            case 'END_WITH':\n              conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);\n              break;\n            case 'GREATER_THAN':\n              conditions.push(`${attributeName}>${value}`);\n              break;\n            case 'LOWER_THAN':\n              conditions.push(`${attributeName}<${value}`);\n              break;\n            case 'OUTSIDE':\n              const splitI = (value as string)?.split(',');\n              if (splitI && splitI.length > 1) {\n                conditions.push(`( ${attributeName}<${splitI[0]} AND ${attributeName}>${splitI[1]} )`);\n              }\n              break;\n            case 'INSIDE':\n              const splitO = (value as string)?.split(',');\n              if (splitO && splitO.length > 1) {\n                conditions.push(`( ${attributeName}>${splitO[0]} AND ${attributeName}<${splitO[1]} )`);\n              }\n              break;\n          }\n        }\n      });\n    } else {\n      console.warn(\n        `Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`\n      );\n    }\n\n    return conditions.length > 1 ? '( ' + conditions.join(' OR ') + ' )' : conditions[0];\n  }\n}\n"]}
|
|
@@ -278,60 +278,66 @@ class CqlUtils {
|
|
|
278
278
|
const attributesReference = classes.map((clazz) => clazz.attributes).flat();
|
|
279
279
|
return filters[datasourceId]
|
|
280
280
|
.map((cond) => {
|
|
281
|
-
const conditions = [];
|
|
282
281
|
const attribute = attributesReference.find((attr) => attr.id === cond.attribute);
|
|
283
282
|
const field = fields.find((f) => f.id === attribute?.field);
|
|
284
283
|
const attributeName = attribute?.technicalName;
|
|
285
|
-
|
|
286
|
-
const quoteSafeValue = `${cond.value}`.replace(/'/g, "''");
|
|
287
|
-
switch (cond.operator) {
|
|
288
|
-
case 'EQUALS':
|
|
289
|
-
if (!field || TextFieldTypes.includes(field?.type)) {
|
|
290
|
-
conditions.push(`${attributeName}='${quoteSafeValue}'`);
|
|
291
|
-
}
|
|
292
|
-
else {
|
|
293
|
-
conditions.push(`${attributeName}=${cond.value}`);
|
|
294
|
-
}
|
|
295
|
-
break;
|
|
296
|
-
case 'CONTAINS':
|
|
297
|
-
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);
|
|
298
|
-
break;
|
|
299
|
-
case 'START_WITH':
|
|
300
|
-
conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);
|
|
301
|
-
break;
|
|
302
|
-
case 'END_WITH':
|
|
303
|
-
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);
|
|
304
|
-
break;
|
|
305
|
-
case 'GREATER_THAN':
|
|
306
|
-
conditions.push(`${attributeName}>${cond.value}`);
|
|
307
|
-
break;
|
|
308
|
-
case 'LOWER_THAN':
|
|
309
|
-
conditions.push(`${attributeName}<${cond.value}`);
|
|
310
|
-
break;
|
|
311
|
-
case 'INSIDE':
|
|
312
|
-
const splitI = cond.value?.split(',');
|
|
313
|
-
if (splitI && splitI.length > 1) {
|
|
314
|
-
conditions.push(`${attributeName}<${splitI[0]}`);
|
|
315
|
-
conditions.push(`${attributeName}>${splitI[1]}`);
|
|
316
|
-
}
|
|
317
|
-
break;
|
|
318
|
-
case 'OUTSIDE':
|
|
319
|
-
const splitO = cond.value?.split(',');
|
|
320
|
-
if (splitO && splitO.length > 1) {
|
|
321
|
-
conditions.push(`${attributeName}>${splitO[0]}`);
|
|
322
|
-
conditions.push(`${attributeName}<${splitO[1]}`);
|
|
323
|
-
}
|
|
324
|
-
break;
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
else {
|
|
328
|
-
console.warn(`Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`);
|
|
329
|
-
}
|
|
330
|
-
return conditions;
|
|
284
|
+
return this.getConditionsForValue(attributeName, cond, field, datasourceId);
|
|
331
285
|
})
|
|
332
286
|
.filter((conds) => conds.length > 0)
|
|
333
287
|
.join(' AND ');
|
|
334
288
|
}
|
|
289
|
+
static getConditionsForValue(attributeName, cond, field, datasourceId) {
|
|
290
|
+
let conditions = [];
|
|
291
|
+
const values = (Array.isArray(cond.value) ? cond.value : [cond.value]);
|
|
292
|
+
if (attributeName) {
|
|
293
|
+
values.forEach((value) => {
|
|
294
|
+
if (value && (typeof value !== 'string' || value.length > 0)) {
|
|
295
|
+
const quoteSafeValue = `${value}`.replace(/'/g, "''");
|
|
296
|
+
switch (cond.operator) {
|
|
297
|
+
case 'EQUALS':
|
|
298
|
+
if (!field || TextFieldTypes.includes(field?.type)) {
|
|
299
|
+
conditions.push(`${attributeName}='${quoteSafeValue}'`);
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
conditions.push(`${attributeName}=${value}`);
|
|
303
|
+
}
|
|
304
|
+
break;
|
|
305
|
+
case 'CONTAINS':
|
|
306
|
+
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);
|
|
307
|
+
break;
|
|
308
|
+
case 'START_WITH':
|
|
309
|
+
conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);
|
|
310
|
+
break;
|
|
311
|
+
case 'END_WITH':
|
|
312
|
+
conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);
|
|
313
|
+
break;
|
|
314
|
+
case 'GREATER_THAN':
|
|
315
|
+
conditions.push(`${attributeName}>${value}`);
|
|
316
|
+
break;
|
|
317
|
+
case 'LOWER_THAN':
|
|
318
|
+
conditions.push(`${attributeName}<${value}`);
|
|
319
|
+
break;
|
|
320
|
+
case 'OUTSIDE':
|
|
321
|
+
const splitI = value?.split(',');
|
|
322
|
+
if (splitI && splitI.length > 1) {
|
|
323
|
+
conditions.push(`( ${attributeName}<${splitI[0]} AND ${attributeName}>${splitI[1]} )`);
|
|
324
|
+
}
|
|
325
|
+
break;
|
|
326
|
+
case 'INSIDE':
|
|
327
|
+
const splitO = value?.split(',');
|
|
328
|
+
if (splitO && splitO.length > 1) {
|
|
329
|
+
conditions.push(`( ${attributeName}>${splitO[0]} AND ${attributeName}<${splitO[1]} )`);
|
|
330
|
+
}
|
|
331
|
+
break;
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
});
|
|
335
|
+
}
|
|
336
|
+
else {
|
|
337
|
+
console.warn(`Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`);
|
|
338
|
+
}
|
|
339
|
+
return conditions.length > 1 ? '( ' + conditions.join(' OR ') + ' )' : conditions[0];
|
|
340
|
+
}
|
|
335
341
|
}
|
|
336
342
|
|
|
337
343
|
class XMLUtils {
|
|
@@ -2050,6 +2056,9 @@ class WidgetMapComponent extends DataWidgetComponent {
|
|
|
2050
2056
|
}
|
|
2051
2057
|
}
|
|
2052
2058
|
}
|
|
2059
|
+
else {
|
|
2060
|
+
layer.title = geoLayer.paramLayer;
|
|
2061
|
+
}
|
|
2053
2062
|
}
|
|
2054
2063
|
else {
|
|
2055
2064
|
layer.title = this.translateService.instant(`@pry.widget.map.layerType.${layer.type}`, { ...layer });
|