@archbase/components 4.0.31 → 4.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archbase/components",
-  "version": "4.0.31",
+  "version": "4.0.32",
   "description": "UI Components for Archbase React v3 - Form editors, data visualization, and business components",
   "author": "Edson Martins <edsonmartins2005@gmail.com>",
   "license": "MIT",
@@ -118,9 +118,9 @@
     "vis-timeline": "^7.7.3",
     "xlsx": "^0.18.5",
     "yet-another-react-lightbox": "^3.21.0",
-    "@archbase/core": "4.0.31",
-    "@archbase/data": "4.0.31",
-    "@archbase/layout": "4.0.31"
+    "@archbase/core": "4.0.32",
+    "@archbase/data": "4.0.32",
+    "@archbase/layout": "4.0.32"
   },
   "devDependencies": {
     "@types/d3": "^7.4.3",

package/src/datagrid/ag-grid/archbase-data-grid-ag-enum-filter.tsx

@@ -0,0 +1,79 @@
+import { useCallback, useRef, useState } from 'react';
+import { useGridFilter } from 'ag-grid-react';
+import type { CustomFilterProps } from 'ag-grid-react';
+import { Checkbox, Divider, Stack } from '@mantine/core';
+
+interface EnumFilterModel {
+  filterType: 'set';
+  values: string[];
+}
+
+type Props = CustomFilterProps<any, any, EnumFilterModel> & {
+  enumValues?: Array<{ label: string; value: string }>;
+};
+
+export function ArchbaseEnumSetFilter({ model, onModelChange, onUiChange, colDef, enumValues = [] }: Props) {
+  const [pending, setPending] = useState<string[]>(model?.values ?? []);
+
+  // modelRef keeps doesFilterPass and afterGuiAttached stable across re-renders.
+  // FilterComponentWrapper.setMethods() calls filterChangedCallback() whenever
+  // doesFilterPass changes reference — causing an infinite loop if defined inline.
+  const modelRef = useRef(model);
+  modelRef.current = model;
+
+  const field = ((colDef as any).field ?? '') as string;
+
+  const doesFilterPass = useCallback(({ data }: any) => {
+    if (!modelRef.current?.values?.length) return true;
+    return modelRef.current.values.includes(data?.[field]);
+  }, [field]);
+
+  const afterGuiAttached = useCallback(() => {
+    setPending(modelRef.current?.values ?? []);
+  }, []);
+
+  useGridFilter({ doesFilterPass, afterGuiAttached });
+
+  const toggle = (value: string) => {
+    setPending((prev) =>
+      prev.includes(value) ? prev.filter((v) => v !== value) : [...prev, value]
+    );
+    onUiChange();
+  };
+
+  const handleApply = () => {
+    onModelChange(pending.length === 0 ? null : { filterType: 'set', values: pending });
+  };
+
+  const handleReset = () => {
+    setPending([]);
+    onModelChange(null);
+  };
+
+  return (
+    <Stack gap={0} miw={180}>
+      <Stack p="xs" gap={6}>
+        {enumValues.map((opt) => (
+          <Checkbox
+            key={opt.value}
+            label={opt.label}
+            size="sm"
+            checked={pending.includes(opt.value)}
+            onChange={() => toggle(opt.value)}
+          />
+        ))}
+      </Stack>
+      <Divider />
+      <div className="ag-filter-apply-panel">
+        <button className="ag-standard-button ag-filter-apply-panel-button" onClick={handleReset}>
+          Redefinir
+        </button>
+        <button className="ag-standard-button ag-filter-apply-panel-button" onClick={handleApply}>
+          Aplicar
+        </button>
+      </div>
+    </Stack>
+  );
+}
+
+ArchbaseEnumSetFilter.displayName = 'ArchbaseEnumSetFilter';

package/src/datagrid/ag-grid/archbase-data-grid-ag-utils.ts

@@ -4,6 +4,7 @@
  * Helper functions for AG Grid implementation.
  */
 import type { ColDef, SortModelItem } from 'ag-grid-community';
+import { builder, emit } from '@archbase/core';
 import type { IArchbaseDataSourceBase } from '@archbase/data';
 import type {
   ArchbaseFilterDefinition,
@@ -143,19 +144,22 @@ export const buildFilterExpression = (
       let filterExpr = '';
       switch (type) {
         case 'contains':
-          filterExpr = `${field}==*${value}*`;
+          filterExpr = `${field}==^*${value}*`;
+          break;
+        case 'notContains':
+          filterExpr = `${field}!=^*${value}*`;
           break;
         case 'equals':
-          filterExpr = `${field}==${value}`;
+          filterExpr = emit(builder.eq(field, value));
           break;
         case 'notEqual':
-          filterExpr = `${field}!=${value}`;
+          filterExpr = emit(builder.neq(field, value));
           break;
         case 'startsWith':
-          filterExpr = `${field}==${value}*`;
+          filterExpr = `${field}==^${value}*`;
           break;
         case 'endsWith':
-          filterExpr = `${field}==*${value}`;
+          filterExpr = `${field}==^*${value}`;
           break;
         case 'blank':
           filterExpr = `${field}==null`;
@@ -164,26 +168,33 @@ export const buildFilterExpression = (
           filterExpr = `${field}!=null`;
           break;
         case 'greaterThan':
-          filterExpr = `${field}>${value}`;
+          filterExpr = emit(builder.gt(field, value));
           break;
         case 'greaterThanOrEqual':
-          filterExpr = `${field}>=${value}`;
+          filterExpr = emit(builder.ge(field, value));
           break;
         case 'lessThan':
-          filterExpr = `${field}<${value}`;
+          filterExpr = emit(builder.lt(field, value));
           break;
         case 'lessThanOrEqual':
-          filterExpr = `${field}<=${value}`;
+          filterExpr = emit(builder.le(field, value));
           break;
         case 'inRange':
-          filterExpr = `${field}>=${value};${field}<=${filterTo}`;
+          filterExpr = emit(builder.bt(field, value, filterTo));
           break;
         default:
           if (value) {
-            filterExpr = `${field}==${value}`;
+            filterExpr = emit(builder.eq(field, value));
           }
       }
 
+      // Handle set filter (enum) — values array from ArchbaseEnumSetFilter
+      if (!filterExpr && values && Array.isArray(values) && values.length > 0) {
+        filterExpr = values.length === 1
+          ? emit(builder.eq(field, String(values[0])))
+          : emit(builder.in(field, values.map(String)));
+      }
+
       if (filterExpr) {
         filterParts.push(filterExpr);
       }

package/src/datagrid/ag-grid/archbase-data-grid-ag.tsx

@@ -141,6 +141,7 @@ import {
   getAlignmentByDataType,
   createValueFormatter,
 } from './archbase-data-grid-ag-formatters';
+import { ArchbaseEnumSetFilter } from './archbase-data-grid-ag-enum-filter';
 
 // Import shared components
 import { ArchbaseDataGridToolbar } from '../main/archbase-data-grid-toolbar';
@@ -497,6 +498,7 @@ function ArchbaseDataGridAG<T extends object = any, ID = any>(
                 }
               : undefined;
 
+            const isEnumColumn = dataType === 'enum' && (columnProps.enumValues?.length ?? 0) > 0;
             const colDef: ExtendedColDef<T> = {
               field: columnProps.dataField as any,
               headerName: columnProps.header,
@@ -504,7 +506,12 @@ function ArchbaseDataGridAG<T extends object = any, ID = any>(
               minWidth: columnProps.minSize,
               maxWidth: columnProps.maxSize,
               sortable: columnProps.enableSorting !== false,
-              filter: columnProps.enableColumnFilter !== false && allowColumnFilters,
+              filter: columnProps.enableColumnFilter !== false && allowColumnFilters
+                ? (isEnumColumn ? ArchbaseEnumSetFilter : true)
+                : false,
+              filterParams: isEnumColumn
+                ? { enumValues: columnProps.enumValues, closeOnApply: true }
+                : undefined,
               resizable: enableColumnResizing,
               flex: columnAutoWidth ? 1 : undefined,
               cellRenderer,
@@ -581,6 +588,7 @@ function ArchbaseDataGridAG<T extends object = any, ID = any>(
       filterParams: {
         buttons: ['reset', 'apply'],
         closeOnApply: true,
+        maxNumConditions: 1,
       },
     }),
     [enableColumnResizing, allowColumnFilters]