@indigina/ui-kit 1.1.359 → 1.1.360

package/fesm2022/indigina-ui-kit.mjs

@@ -6429,39 +6429,46 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
             }], dragEnd: [{ type: i0.Output, args: ["dragEnd"] }], itemTemplate: [{ type: i0.ContentChild, args: [i0.forwardRef(() => TemplateRef), { isSignal: true }] }] } });
 
 const kitDataStateToODataString = (state, utcDates = false) => {
-    const mappedState = state.filter
-        ? {
-            ...state,
-            filter: mapFiltersForOData(state.filter),
-        }
-        : state;
-    return decodeURIComponent(toODataString(mappedState, { utcDates }));
+    const base = toODataString({ ...state, filter: undefined }, { utcDates });
+    const filter = state.filter && convertFiltersToOData(state.filter, utcDates);
+    return decodeURIComponent(filter ? `${base}$filter=(${filter})` : base);
 };
 const kitFilterBy = (data, filter) => filterBy(data, filter);
-const isKitFilterDescriptor = (filter) => {
-    return 'field' in filter && 'value' in filter;
-};
-const mapFiltersForOData = (filter) => ({
-    ...filter,
-    filters: filter.filters.map(filter => {
+const convertFiltersToOData = (filters, utcDates) => {
+    const oDataFilters = filters.filters.map(filter => {
         if ('isArray' in filter && filter.isArray) {
-            const filterData = filter.filters[0];
-            if (!isKitFilterDescriptor(filterData) || !filterData.field) {
-                return filter;
-            }
-            const field = (typeof filterData.field === 'string' ? filterData.field : filterData.field()).replaceAll('.', '/');
-            return {
-                field: `${field}/any(p: p eq '${filterData.value}')`,
-                operator: 'eq',
-                value: true,
-            };
+            return convertArrayFiltersToOData(filter);
         }
-        if ('filters' in filter) {
-            return mapFiltersForOData(filter);
+        else {
+            return convertStandardFiltersToOData(filter, utcDates);
         }
-        return filter;
-    }),
-});
+    });
+    return oDataFilters.filter(Boolean).join(` ${filters.logic} `);
+};
+const convertStandardFiltersToOData = (filter, utcDates) => {
+    return extractFilterExpression(toODataString({
+        filter: isKitFilterDescriptor(filter)
+            ? { logic: KitFilterLogic.AND, filters: [filter] }
+            : filter,
+    }, { utcDates }));
+};
+const convertArrayFiltersToOData = (filter) => {
+    const filterData = filter.filters[0];
+    if (!isKitFilterDescriptor(filterData) || !filterData.field) {
+        return '';
+    }
+    const field = (typeof filterData.field === 'string' ? filterData.field : filterData.field())?.replaceAll('.', '/');
+    return `${field}/any(p: p eq '${filterData.value}')`;
+};
+const isKitFilterDescriptor = (filter) => {
+    return 'field' in filter && 'value' in filter;
+};
+const extractFilterExpression = (odata) => {
+    const extractedExpression = odata.replace(/^\$filter=/, '');
+    return extractedExpression.startsWith('(') && extractedExpression.endsWith(')')
+        ? extractedExpression.slice(1, -1)
+        : extractedExpression;
+};
 
 var KitThemes;
 (function (KitThemes) {