@solidstarters/solid-core-ui 0.1.26 → 1.0.0

package/src/components/core/filter/columns/SolidFloatField.tsx

@@ -0,0 +1,9 @@
+'use client';
+import { SolidFilterFieldsParams } from '../SolidFilterFields';
+import SolidIntField from './SolidIntField';
+
+const SolidFloatField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
+    return SolidIntField({ fieldMetadata, onChange, index, rule });
+};
+
+export default SolidFloatField;

package/src/components/core/{kanban/columns/SolidIdColumn.tsx → filter/columns/SolidIdField.tsx}

@@ -1,46 +1,46 @@
+'use client';
 import React from 'react';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from "../SolidVarInputsFilterElement";
+import { InputTypes, SolidVarInputsFilterElement } from "../SolidVarInputsFilterElement";
 import { FilterMatchMode } from 'primereact/api';
 import { Dropdown } from 'primereact/dropdown';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 
-const SolidIdColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidIdField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     const showFilterOperator = false;
     const columnDataType = 'text';
     const filterMatchModeOptions = [
         { label: 'In', value: FilterMatchMode.IN },
         { label: 'Not In', value: FilterMatchMode.NOT_IN },
     ];
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
 
     return (
        <>
                   <Dropdown
-                      value={enumValue.operator}
+                      value={rule.operator}
                       onChange={(e: any) => {
                           console.log("e", e);
-                          updateEnumValues(index, 'operator', e.value)
+                          onChange(index, 'operator', e.value)
                       }}
                       options={filterMatchModeOptions}
                       optionLabel='label'
                       optionValue='value'
                       placeholder="Select Operator" className="w-full md:w-14rem" />
-                  <SolidKanbanVarInputsFilterElement
-                      values={enumValue.value}
+                  <SolidVarInputsFilterElement
+                      values={rule.value}
                       onChange={(e: any) => {
                           console.log("e", e);
-                          updateEnumValues(index, 'value', e)
-                      }}
+                          onChange(rule.id, 'value', e)
+                        }}
                       numberOfInputs={numberOfInputs}
-                      inputType={KanbanInputTypes.Numeric}
-                      solidListViewMetaData={solidKanbanViewMetaData}
+                      inputType={InputTypes.Numeric}
                       fieldMetadata={fieldMetadata}
                   >
-                  </SolidKanbanVarInputsFilterElement>
+                  </SolidVarInputsFilterElement>
               </>
     );
 
 };
 
-export default SolidIdColumn;
+export default SolidIdField;

package/src/components/core/filter/columns/SolidIntField.tsx

@@ -0,0 +1,56 @@
+'use client';
+import React from 'react';
+import { FilterMatchMode } from 'primereact/api';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+import { Dropdown } from 'primereact/dropdown';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
+
+const SolidIntField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
+    // const filterable = column.attrs.filterable;
+    const filterMatchModeOptions = [
+        { label: 'Equals', value: FilterMatchMode.EQUALS },
+        { label: 'Not Equals', value: FilterMatchMode.NOT_EQUALS },
+        { label: 'Less Than', value: FilterMatchMode.LESS_THAN },
+        { label: 'Less Than Or Equal', value: FilterMatchMode.LESS_THAN_OR_EQUAL_TO },
+        { label: 'Greater Than', value: FilterMatchMode.GREATER_THAN },
+        { label: 'Greater Than Or Equal', value: FilterMatchMode.GREATER_THAN_OR_EQUAL_TO },
+        { label: 'In', value: FilterMatchMode.IN },
+        { label: 'Not In', value: FilterMatchMode.NOT_IN },
+        { label: 'Between', value: FilterMatchMode.BETWEEN }
+    ];
+
+
+
+    // const header = column.attrs.label ?? fieldMetadata.displayName;
+    const numberOfInputs = getNumberOfInputs("in");
+
+    return (
+        <>
+                    <Dropdown
+                        value={rule.matchMode}
+                        onChange={(e: any) => {
+                            console.log("e", e);
+                            // updateEnumValues(index, 'operator', e.value)
+                            onChange(rule.id, 'matchMode', e.value)
+                        }}
+                        options={filterMatchModeOptions}
+                        optionLabel='label'
+                        optionValue='value'
+                        placeholder="Select Operator" className="w-full filter-small-input md:w-14rem" />
+                    <SolidVarInputsFilterElement
+                        values={rule.value}
+                        onChange={(e: any) => {
+                            console.log("e", e);
+                            // updateEnumValues(index, 'value', e)
+                            onChange(rule.id, 'value', e)
+                        }}
+                        numberOfInputs={numberOfInputs}
+                        inputType={InputTypes.Numeric}
+                        fieldMetadata={fieldMetadata}
+                    >
+                    </SolidVarInputsFilterElement>
+        </>
+    );
+};
+
+export default SolidIntField;

package/src/components/core/filter/columns/SolidLongTextField.tsx

@@ -0,0 +1,9 @@
+'use client';
+import { SolidFilterFieldsParams } from '../SolidFilterFields';
+import SolidShortTextField from './SolidShortTextField';
+
+const SolidLongTextField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
+    return SolidShortTextField({ fieldMetadata, onChange, index, rule });
+};
+
+export default SolidLongTextField;

package/src/components/core/{kanban/columns/SolidMediaMultipleColumn.tsx → filter/columns/SolidMediaMultipleField.tsx}

@@ -1,9 +1,12 @@
+'use client';
+import React from 'react';
+import { Column } from "primereact/column";
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { FilterMatchMode } from 'primereact/api';
 import { Dropdown } from 'primereact/dropdown';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '../../kanban/SolidVarInputsFilterElement';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
-const SolidMediaMultipleColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidMediaMultipleField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     // const filterable = column.attrs.filterable;
     const filterable = false;
     // const showFilterOperator = false;
@@ -20,35 +23,34 @@ const SolidMediaMultipleColumn = ({ solidKanbanViewMetaData, fieldMetadata, upda
         { label: 'In', value: FilterMatchMode.IN },
         { label: 'Not In', value: FilterMatchMode.NOT_IN }
     ];
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
     return (
         <>
 
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(rule.id, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.Text}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.Text}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 
 };
 
-export default SolidMediaMultipleColumn;
+export default SolidMediaMultipleField;

package/src/components/core/{kanban/columns/SolidMediaSingleColumn.tsx → filter/columns/SolidMediaSingleField.tsx}

@@ -1,9 +1,11 @@
-import { FilterMatchMode } from 'primereact/api';
+'use client';
+import React from 'react';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { Dropdown } from 'primereact/dropdown';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '../../kanban/SolidVarInputsFilterElement';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { FilterMatchMode } from 'primereact/api';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
-const SolidMediaSingleColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidMediaSingleField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     // const filterable = column.attrs.filterable;
     const filterable = false;
     // const showFilterOperator = false;
@@ -19,7 +21,7 @@ const SolidMediaSingleColumn = ({ solidKanbanViewMetaData, fieldMetadata, update
         { label: 'In', value: FilterMatchMode.IN },
         { label: 'Not In', value: FilterMatchMode.NOT_IN }
     ];
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
     // const header = column.attrs.label ?? fieldMetadata.displayName;
 
@@ -27,30 +29,29 @@ const SolidMediaSingleColumn = ({ solidKanbanViewMetaData, fieldMetadata, update
         <>
 
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(rule.id, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.Text}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.Text}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 
 };
 
-export default SolidMediaSingleColumn;
+export default SolidMediaSingleField;

package/src/components/core/filter/columns/SolidRelationField.tsx

@@ -0,0 +1,13 @@
+'use client';
+import { SolidFilterFieldsParams } from '../SolidFilterFields';
+import SolidRelationManyToOneField from './relations/SolidRelationManyToOneField';
+
+const SolidRelationField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
+    if (fieldMetadata.relationType === 'many-to-one') {
+        return SolidRelationManyToOneField({ fieldMetadata, onChange, index, rule });
+    }
+    // TODO: Support one-to-many
+    // TODO: Support many-to-many
+};
+
+export default SolidRelationField;

package/src/components/core/filter/columns/SolidRichTextField.tsx

@@ -0,0 +1,9 @@
+'use client';
+import { SolidFilterFieldsParams } from '../SolidFilterFields';
+import SolidShortTextField from './SolidShortTextField';
+
+const SolidRichTextField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
+    return SolidShortTextField({ fieldMetadata, onChange, index, rule });
+};
+
+export default SolidRichTextField;

package/src/components/core/{kanban/columns/SolidSelectionDynamicColumn.tsx → filter/columns/SolidSelectionDynamicField.tsx}

@@ -1,46 +1,47 @@
+'use client';
+import React from 'react';
 import { FilterMatchMode } from 'primereact/api';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { Dropdown } from 'primereact/dropdown';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '../../kanban/SolidVarInputsFilterElement';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
-const SolidSelectionDynamicColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidSelectionDynamicField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     const showFilterOperator = false;
     const columnDataType = fieldMetadata.selectionValueType === 'int' ? 'numeric' : 'text';
     const filterMatchModeOptions = [
         { label: 'In', value: FilterMatchMode.IN },
         { label: 'Not In', value: FilterMatchMode.NOT_IN },
     ];
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
 
 
     return (
         <>
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(rule.id, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.SelectionDynamic}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.SelectionDynamic}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 
 };
 
-export default SolidSelectionDynamicColumn;
+export default SolidSelectionDynamicField;

package/src/components/core/{kanban/columns/SolidSelectionStaticColumn.tsx → filter/columns/SolidSelectionStaticField.tsx}

@@ -1,10 +1,12 @@
+'use client';
+import React from 'react';
 import { FilterMatchMode } from 'primereact/api';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { Dropdown } from 'primereact/dropdown';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '../../kanban/SolidVarInputsFilterElement';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 
-const SolidSelectionStaticColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidSelectionStaticField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
 
     // const filterable = column.attrs.filterable;
     const showFilterOperator = false;
@@ -14,34 +16,33 @@ const SolidSelectionStaticColumn = ({ solidKanbanViewMetaData, fieldMetadata, up
         { label: 'Not In', value: FilterMatchMode.NOT_IN },
     ];
 
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
     return (
         <>
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(rule.id, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.SelectionStatic}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.SelectionStatic}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 };
 
-export default SolidSelectionStaticColumn;
+export default SolidSelectionStaticField;

package/src/components/core/{kanban/columns/SolidShortTextColumn.tsx → filter/columns/SolidShortTextField.tsx}

@@ -1,9 +1,11 @@
+'use client';
+import React from 'react';
 import { FilterMatchMode } from 'primereact/api';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { Dropdown } from 'primereact/dropdown';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '../../kanban/SolidVarInputsFilterElement';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
-const SolidShortTextColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidShortTextField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     // const filterable = column.attrs.filterable;
     const showFilterOperator = false;
     const columnDataType = 'text';
@@ -19,35 +21,34 @@ const SolidShortTextColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEn
     ];
 
     // const header = column.attrs.label ?? fieldMetadata.displayName;
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
     return (
         <>
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(rule.id, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.Text}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.Text}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 
 };
 
-export default SolidShortTextColumn;
+export default SolidShortTextField;

package/src/components/core/filter/columns/SolidTimeField.tsx

@@ -0,0 +1,43 @@
+'use client';
+import React from 'react';
+import { dateFilterMatchModeOptions } from './SolidDateField';
+import { Dropdown } from 'primereact/dropdown';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+
+const SolidTimeField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
+    // const filterable = column.attrs.filterable;
+    const showFilterOperator = false;
+    const columnDataType = 'date';
+
+    // TODO: the body template to be controlled based on the format that one is expecting the date to be displayed in.
+    // const header = column.attrs.label ?? fieldMetadata.displayName;
+    const numberOfInputs = getNumberOfInputs("in");
+    return (
+        <>
+            <Dropdown
+                value={rule.operator}
+                onChange={(e: any) => {
+                    console.log("e", e);
+                    onChange(rule.id, 'matchMode', e.value)
+                }}
+                options={dateFilterMatchModeOptions}
+                optionLabel='label'
+                optionValue='value'
+                placeholder="Select Operator" className="w-full md:w-14rem" />
+            <SolidVarInputsFilterElement
+                values={rule.value}
+                onChange={(e: any) => {
+                    console.log("e", e);
+                    onChange(rule.id, 'value', e)
+                }}
+                numberOfInputs={numberOfInputs}
+                inputType={InputTypes.Time}
+                fieldMetadata={fieldMetadata}
+            >
+            </SolidVarInputsFilterElement></>
+    );
+
+};
+
+export default SolidTimeField;

package/src/components/core/{kanban/columns/SolidUuidColumn.tsx → filter/columns/SolidUuidField.tsx}

@@ -1,44 +1,45 @@
+'use client';
+import React from 'react';
 import { FilterMatchMode } from 'primereact/api';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { Dropdown } from 'primereact/dropdown';
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '../../kanban/SolidVarInputsFilterElement';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../SolidKanbanViewSearchColumn';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
-const SolidUuidColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidUuidField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     const showFilterOperator = false;
     const columnDataType = 'text';
     const filterMatchModeOptions = [
         { label: 'In', value: FilterMatchMode.IN },
         { label: 'Not In', value: FilterMatchMode.NOT_IN },
     ];
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
     return (
         <>
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(rule.id, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.Text}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.Text}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 
 };
 
-export default SolidUuidColumn;
+export default SolidUuidField;

package/src/components/core/{kanban/columns/relations/SolidRelationManyToOneColumn.tsx → filter/columns/relations/SolidRelationManyToOneField.tsx}

@@ -1,9 +1,10 @@
-import { KanbanInputTypes, SolidKanbanVarInputsFilterElement } from '@/components/core/kanban/SolidVarInputsFilterElement';
+'use client';
+import { InputTypes, SolidVarInputsFilterElement } from '@/components/core/filter/SolidVarInputsFilterElement';
 import { FilterMatchMode } from 'primereact/api';
 import { Dropdown } from 'primereact/dropdown';
-import { getSolidKanbanViewNumberOfInputs, SolidKanbanViewColumnParams } from '../../SolidKanbanViewSearchColumn';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../../SolidFilterFields';
 
-const SolidRelationManyToOneColumn = ({ solidKanbanViewMetaData, fieldMetadata, updateEnumValues, index, enumValue }: SolidKanbanViewColumnParams) => {
+const SolidRelationManyToOneField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     // const filterable = column.attrs.filterable;
     const showFilterOperator = false;
     const filterMatchModeOptions = [
@@ -11,7 +12,7 @@ const SolidRelationManyToOneColumn = ({ solidKanbanViewMetaData, fieldMetadata,
         { label: 'Not In', value: FilterMatchMode.NOT_IN },
     ];
     const columnDataType = undefined;
-    const numberOfInputs = getSolidKanbanViewNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs("in");
 
     // const filterTemplate = (options: ColumnFilterElementTemplateOptions) => {
 
@@ -50,30 +51,29 @@ const SolidRelationManyToOneColumn = ({ solidKanbanViewMetaData, fieldMetadata,
     return (
         <>
             <Dropdown
-                value={enumValue.operator}
+                value={rule.operator}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'operator', e.value)
+                    onChange(index, 'operator', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'
                 optionValue='value'
                 placeholder="Select Operator" className="w-full md:w-14rem" />
-            <SolidKanbanVarInputsFilterElement
-                values={enumValue.value}
+            <SolidVarInputsFilterElement
+                values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    updateEnumValues(index, 'value', e)
+                    onChange(index, 'value', e)
                 }}
                 numberOfInputs={numberOfInputs}
-                inputType={KanbanInputTypes.RelationManyToOne}
-                solidListViewMetaData={solidKanbanViewMetaData}
+                inputType={InputTypes.RelationManyToOne}
                 fieldMetadata={fieldMetadata}
             >
-            </SolidKanbanVarInputsFilterElement>
+            </SolidVarInputsFilterElement>
         </>
     );
 
 };
 
-export default SolidRelationManyToOneColumn;
+export default SolidRelationManyToOneField;