@provoly/dashboard 1.1.5 → 1.1.7

package/fesm2022/provoly-dashboard-widgets-widget-map.mjs

@@ -278,60 +278,66 @@ class CqlUtils {
         const attributesReference = classes.map((clazz) => clazz.attributes).flat();
         return filters[datasourceId]
             .map((cond) => {
-            const conditions = [];
             const attribute = attributesReference.find((attr) => attr.id === cond.attribute);
             const field = fields.find((f) => f.id === attribute?.field);
             const attributeName = attribute?.technicalName;
-            if (attributeName && cond.value && (typeof cond.value !== 'string' || cond.value.length > 0)) {
-                const quoteSafeValue = `${cond.value}`.replace(/'/g, "''");
-                switch (cond.operator) {
-                    case 'EQUALS':
-                        if (!field || TextFieldTypes.includes(field?.type)) {
-                            conditions.push(`${attributeName}='${quoteSafeValue}'`);
-                        }
-                        else {
-                            conditions.push(`${attributeName}=${cond.value}`);
-                        }
-                        break;
-                    case 'CONTAINS':
-                        conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);
-                        break;
-                    case 'START_WITH':
-                        conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);
-                        break;
-                    case 'END_WITH':
-                        conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);
-                        break;
-                    case 'GREATER_THAN':
-                        conditions.push(`${attributeName}>${cond.value}`);
-                        break;
-                    case 'LOWER_THAN':
-                        conditions.push(`${attributeName}<${cond.value}`);
-                        break;
-                    case 'INSIDE':
-                        const splitI = cond.value?.split(',');
-                        if (splitI && splitI.length > 1) {
-                            conditions.push(`${attributeName}<${splitI[0]}`);
-                            conditions.push(`${attributeName}>${splitI[1]}`);
-                        }
-                        break;
-                    case 'OUTSIDE':
-                        const splitO = cond.value?.split(',');
-                        if (splitO && splitO.length > 1) {
-                            conditions.push(`${attributeName}>${splitO[0]}`);
-                            conditions.push(`${attributeName}<${splitO[1]}`);
-                        }
-                        break;
-                }
-            }
-            else {
-                console.warn(`Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`);
-            }
-            return conditions;
+            return this.getConditionsForValue(attributeName, cond, field, datasourceId);
         })
             .filter((conds) => conds.length > 0)
             .join(' AND ');
     }
+    static getConditionsForValue(attributeName, cond, field, datasourceId) {
+        let conditions = [];
+        const values = (Array.isArray(cond.value) ? cond.value : [cond.value]);
+        if (attributeName) {
+            values.forEach((value) => {
+                if (value && (typeof value !== 'string' || value.length > 0)) {
+                    const quoteSafeValue = `${value}`.replace(/'/g, "''");
+                    switch (cond.operator) {
+                        case 'EQUALS':
+                            if (!field || TextFieldTypes.includes(field?.type)) {
+                                conditions.push(`${attributeName}='${quoteSafeValue}'`);
+                            }
+                            else {
+                                conditions.push(`${attributeName}=${value}`);
+                            }
+                            break;
+                        case 'CONTAINS':
+                            conditions.push(`${attributeName} LIKE '%${quoteSafeValue}%'`);
+                            break;
+                        case 'START_WITH':
+                            conditions.push(`${attributeName} LIKE '${quoteSafeValue}%'`);
+                            break;
+                        case 'END_WITH':
+                            conditions.push(`${attributeName} LIKE '%${quoteSafeValue}'`);
+                            break;
+                        case 'GREATER_THAN':
+                            conditions.push(`${attributeName}>${value}`);
+                            break;
+                        case 'LOWER_THAN':
+                            conditions.push(`${attributeName}<${value}`);
+                            break;
+                        case 'OUTSIDE':
+                            const splitI = value?.split(',');
+                            if (splitI && splitI.length > 1) {
+                                conditions.push(`( ${attributeName}<${splitI[0]} AND ${attributeName}>${splitI[1]} )`);
+                            }
+                            break;
+                        case 'INSIDE':
+                            const splitO = value?.split(',');
+                            if (splitO && splitO.length > 1) {
+                                conditions.push(`( ${attributeName}>${splitO[0]} AND ${attributeName}<${splitO[1]} )`);
+                            }
+                            break;
+                    }
+                }
+            });
+        }
+        else {
+            console.warn(`Cannot add cql filter on datasource ${datasourceId} because ${cond.attribute} attribute not found in classes`);
+        }
+        return conditions.length > 1 ? '( ' + conditions.join(' OR ') + ' )' : conditions[0];
+    }
 }
 
 class XMLUtils {