@solidstarters/solid-core-ui 1.0.1 → 1.0.2

package/src/components/core/filter/{columns → fields}/SolidDecimalField.tsx

@@ -1,5 +1,4 @@
-'use client';
-
+"use client";
 import { SolidFilterFieldsParams } from '../SolidFilterFields';
 import SolidIntField from './SolidIntField';
 

package/src/components/core/filter/{columns → fields}/SolidExternalIdField.tsx

@@ -1,25 +1,22 @@
-'use client';
-
-import React from 'react';
-import { FilterMatchMode } from 'primereact/api';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 const SolidExternalIdField = ({ 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 },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
     ];
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
 
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)

package/src/components/core/filter/{columns → fields}/SolidFloatField.tsx

@@ -1,4 +1,4 @@
-'use client';
+"use client";
 import { SolidFilterFieldsParams } from '../SolidFilterFields';
 import SolidIntField from './SolidIntField';
 

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

@@ -1,28 +1,26 @@
-'use client';
-import React from 'react';
-import { InputTypes, SolidVarInputsFilterElement } from "../SolidVarInputsFilterElement";
-import { FilterMatchMode } from 'primereact/api';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
 import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+import { InputTypes, SolidVarInputsFilterElement } from "../SolidVarInputsFilterElement";
 
 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 },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
     ];
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
 
     return (
        <>
                   <Dropdown
-                      value={rule.operator}
+                      value={rule.matchMode}
                       onChange={(e: any) => {
                           console.log("e", e);
-                          onChange(index, 'operator', e.value)
-                      }}
+                          onChange(rule.id, 'matchMode', e.value)
+                        }}
                       options={filterMatchModeOptions}
                       optionLabel='label'
                       optionValue='value'

package/src/components/core/filter/{columns → fields}/SolidIntField.tsx

@@ -1,28 +1,26 @@
-'use client';
-import React from 'react';
-import { FilterMatchMode } from 'primereact/api';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 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 }
+        { label: 'Equals', value: "$eqi" },
+        { label: 'Not Equals', value: "$nei" },
+        { label: 'Less Than', value: "$lt" },
+        { label: 'Less Than Or Equal', value: "$lte" },
+        { label: 'Greater Than', value: "$gt" },
+        { label: 'Greater Than Or Equal', value: "$gte" },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
+        { label: 'Between', value: "$between" }
     ];
 
 
 
     // const header = column.attrs.label ?? fieldMetadata.displayName;
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
     return (
         <>

package/src/components/core/filter/{columns → fields}/SolidLongTextField.tsx

@@ -1,4 +1,4 @@
-'use client';
+"use client";
 import { SolidFilterFieldsParams } from '../SolidFilterFields';
 import SolidShortTextField from './SolidShortTextField';
 

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

@@ -1,9 +1,6 @@
-'use client';
-import React from 'react';
-import { Column } from "primereact/column";
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
-import { FilterMatchMode } from 'primereact/api';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 const SolidMediaMultipleField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
@@ -14,21 +11,21 @@ const SolidMediaMultipleField = ({ fieldMetadata, onChange, index, rule }: Solid
     // const header = column.attrs.label ?? fieldMetadata.displayName;
     const columnDataType = 'text';
     const filterMatchModeOptions = [
-        { label: 'Starts With', value: FilterMatchMode.STARTS_WITH },
-        { label: 'Contains', value: FilterMatchMode.CONTAINS },
-        { label: 'Not Contains', value: FilterMatchMode.NOT_CONTAINS },
-        { label: 'Ends With', value: FilterMatchMode.ENDS_WITH },
-        { label: 'Equals', value: FilterMatchMode.EQUALS },
-        { label: 'Not Equals', value: FilterMatchMode.NOT_EQUALS },
-        { label: 'In', value: FilterMatchMode.IN },
-        { label: 'Not In', value: FilterMatchMode.NOT_IN }
+        { label: 'Starts With', value: "$startsWithi" },
+        { label: 'Contains', value: "$containsi" },
+        { label: 'Not Contains', value: "$notContains" },
+        { label: 'Ends With', value: "$endsWith" },
+        { label: 'Equals', value: "$eqi" },
+        { label: 'Not Equals', value: "$nei" },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" }
     ];
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
     return (
         <>
 
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)

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

@@ -1,8 +1,6 @@
-'use client';
-import React from 'react';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
-import { FilterMatchMode } from 'primereact/api';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 const SolidMediaSingleField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
@@ -12,16 +10,16 @@ const SolidMediaSingleField = ({ fieldMetadata, onChange, index, rule }: SolidFi
     // const columnDataType = undefined;
     const columnDataType = 'text';
     const filterMatchModeOptions = [
-        { label: 'Starts With', value: FilterMatchMode.STARTS_WITH },
-        { label: 'Contains', value: FilterMatchMode.CONTAINS },
-        { label: 'Not Contains', value: FilterMatchMode.NOT_CONTAINS },
-        { label: 'Ends With', value: FilterMatchMode.ENDS_WITH },
-        { label: 'Equals', value: FilterMatchMode.EQUALS },
-        { label: 'Not Equals', value: FilterMatchMode.NOT_EQUALS },
-        { label: 'In', value: FilterMatchMode.IN },
-        { label: 'Not In', value: FilterMatchMode.NOT_IN }
+        { label: 'Starts With', value: "$startsWithi" },
+        { label: 'Contains', value: "$containsi" },
+        { label: 'Not Contains', value: "$notContains" },
+        { label: 'Ends With', value: "$endsWith" },
+        { label: 'Equals', value: "$eqi" },
+        { label: 'Not Equals', value: "$nei" },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" }
     ];
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
     // const header = column.attrs.label ?? fieldMetadata.displayName;
 
@@ -29,7 +27,7 @@ const SolidMediaSingleField = ({ fieldMetadata, onChange, index, rule }: SolidFi
         <>
 
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)

package/src/components/core/filter/{columns → fields}/SolidRelationField.tsx

@@ -1,4 +1,4 @@
-'use client';
+"use client";
 import { SolidFilterFieldsParams } from '../SolidFilterFields';
 import SolidRelationManyToOneField from './relations/SolidRelationManyToOneField';
 

package/src/components/core/filter/{columns → fields}/SolidRichTextField.tsx

@@ -1,4 +1,4 @@
-'use client';
+"use client";
 import { SolidFilterFieldsParams } from '../SolidFilterFields';
 import SolidShortTextField from './SolidShortTextField';
 

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

@@ -1,25 +1,22 @@
-'use client';
-import React from 'react';
-import { FilterMatchMode } from 'primereact/api';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 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 },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
     ];
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
 
 
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)
@@ -32,7 +29,7 @@ const SolidSelectionDynamicField = ({ fieldMetadata, onChange, index, rule }: So
                 values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    onChange(rule.id, 'value', e)
+                    onChange(rule.id, 'value', e.map((i: any) => i.value))
                 }}
                 numberOfInputs={numberOfInputs}
                 inputType={InputTypes.SelectionDynamic}

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

@@ -1,8 +1,6 @@
-'use client';
-import React from 'react';
-import { FilterMatchMode } from 'primereact/api';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 
@@ -12,16 +10,16 @@ const SolidSelectionStaticField = ({ fieldMetadata, onChange, index, rule }: Sol
     const showFilterOperator = false;
     const columnDataType = fieldMetadata.selectionValueType === 'int' ? 'numeric' : 'text';
     const filterMatchModeOptions = [
-        { label: 'In', value: FilterMatchMode.IN },
-        { label: 'Not In', value: FilterMatchMode.NOT_IN },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
     ];
 
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)
@@ -34,7 +32,7 @@ const SolidSelectionStaticField = ({ fieldMetadata, onChange, index, rule }: Sol
                 values={rule.value}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    onChange(rule.id, 'value', e)
+                    onChange(rule.id, 'value', e.value)
                 }}
                 numberOfInputs={numberOfInputs}
                 inputType={InputTypes.SelectionStatic}

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

@@ -1,8 +1,6 @@
-'use client';
-import React from 'react';
-import { FilterMatchMode } from 'primereact/api';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 const SolidShortTextField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
@@ -10,23 +8,23 @@ const SolidShortTextField = ({ fieldMetadata, onChange, index, rule }: SolidFilt
     const showFilterOperator = false;
     const columnDataType = 'text';
     const filterMatchModeOptions = [
-        { label: 'Starts With', value: FilterMatchMode.STARTS_WITH },
-        { label: 'Contains', value: FilterMatchMode.CONTAINS },
-        { label: 'Not Contains', value: FilterMatchMode.NOT_CONTAINS },
-        { label: 'Ends With', value: FilterMatchMode.ENDS_WITH },
-        { label: 'Equals', value: FilterMatchMode.EQUALS },
-        { label: 'Not Equals', value: FilterMatchMode.NOT_EQUALS },
-        { label: 'In', value: FilterMatchMode.IN },
-        { label: 'Not In', value: FilterMatchMode.NOT_IN }
+        { label: 'Starts With', value: "$startsWithi" },
+        { label: 'Contains', value: "$containsi" },
+        { label: 'Not Contains', value: "$notContains" },
+        { label: 'Ends With', value: "$endsWith" },
+        { label: 'Equals', value: "$eqi" },
+        { label: 'Not Equals', value: "$nei" },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" }
     ];
 
     // const header = column.attrs.label ?? fieldMetadata.displayName;
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)

package/src/components/core/filter/{columns → fields}/SolidTimeField.tsx

@@ -1,9 +1,8 @@
-'use client';
-import React from 'react';
-import { dateFilterMatchModeOptions } from './SolidDateField';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
-import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
+import { dateFilterMatchModeOptions } from './SolidDateField';
 
 const SolidTimeField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     // const filterable = column.attrs.filterable;
@@ -12,11 +11,11 @@ const SolidTimeField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFie
 
     // 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");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)

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

@@ -1,23 +1,21 @@
-'use client';
-import React from 'react';
-import { FilterMatchMode } from 'primereact/api';
-import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
+"use client";
 import { Dropdown } from 'primereact/dropdown';
+import { getNumberOfInputs, SolidFilterFieldsParams } from '../SolidFilterFields';
 import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilterElement';
 
 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 },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
     ];
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
                     onChange(rule.id, 'matchMode', e.value)

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

@@ -1,6 +1,5 @@
-'use client';
+"use client";
 import { InputTypes, SolidVarInputsFilterElement } from '@/components/core/filter/SolidVarInputsFilterElement';
-import { FilterMatchMode } from 'primereact/api';
 import { Dropdown } from 'primereact/dropdown';
 import { getNumberOfInputs, SolidFilterFieldsParams } from '../../SolidFilterFields';
 
@@ -8,11 +7,11 @@ const SolidRelationManyToOneField = ({ fieldMetadata, onChange, index, rule }: S
     // const filterable = column.attrs.filterable;
     const showFilterOperator = false;
     const filterMatchModeOptions = [
-        { label: 'In', value: FilterMatchMode.IN },
-        { label: 'Not In', value: FilterMatchMode.NOT_IN },
+        { label: 'In', value: "$in" },
+        { label: 'Not In', value: "$notIn" },
     ];
     const columnDataType = undefined;
-    const numberOfInputs = getNumberOfInputs("in");
+    const numberOfInputs = getNumberOfInputs(rule.matchMode);
 
     // const filterTemplate = (options: ColumnFilterElementTemplateOptions) => {
 
@@ -51,10 +50,10 @@ const SolidRelationManyToOneField = ({ fieldMetadata, onChange, index, rule }: S
     return (
         <>
             <Dropdown
-                value={rule.operator}
+                value={rule.matchMode}
                 onChange={(e: any) => {
                     console.log("e", e);
-                    onChange(index, 'operator', e.value)
+                    onChange(rule.id, 'matchMode', e.value)
                 }}
                 options={filterMatchModeOptions}
                 optionLabel='label'

package/src/components/core/form/SolidFormView.tsx

@@ -1,37 +1,37 @@
 "use client";
 
-import * as Yup from "yup";
-import React, { useEffect, useRef, useState } from "react";
-import { TabView, TabPanel } from "primereact/tabview";
-import "primeflex/primeflex.css";
+import { SolidCancelButton } from "@/components/common/CancelButton";
+import { createPermission, deletePermission, updatePermission } from "@/helpers/permissions";
+import { createSolidEntityApi } from "@/redux/api/solidEntityApi";
 import { useGetSolidViewLayoutQuery } from "@/redux/api/solidViewApi";
-import qs from "qs";
+import { useLazyCheckIfPermissionExistsQuery } from "@/redux/api/userApi";
+import { FetchBaseQueryError } from "@reduxjs/toolkit/dist/query";
 import { useFormik } from "formik";
-import { Button } from "primereact/button";
-import { SolidShortTextField } from "./fields/SolidShortTextField";
-import { FormikObject, ISolidField, SolidFieldProps } from "./fields/ISolidField";
-import { SolidSelectionStaticField } from "./fields/SolidSelectionStaticField";
-import { SolidSelectionDynamicField } from "./fields/SolidSelectionDynamicField";
-import { createSolidEntityApi } from "@/redux/api/solidEntityApi";
-import { SolidRelationField } from "./fields/SolidRelationField";
-import { SolidMediaSingleField } from "./fields/SolidMediaSingleField";
-import { SolidMediaMultipleField } from "./fields/SolidMediaMultipleField";
 import { usePathname, useRouter } from "next/navigation";
-import { CancelButton, SolidCancelButton } from "@/components/common/CancelButton";
+import "primeflex/primeflex.css";
+import { Button } from "primereact/button";
 import { Dialog } from "primereact/dialog";
-import { SolidIntegerField } from "./fields/SolidIntegerField";
-import { SolidDateTimeField } from "./fields/SolidDateTimeField";
-import { SolidJsonField } from "./fields/SolidJsonField";
-import { FetchBaseQueryError } from "@reduxjs/toolkit/dist/query";
+import { TabPanel, TabView } from "primereact/tabview";
 import { Toast } from "primereact/toast";
+import qs from "qs";
+import { useEffect, useRef, useState } from "react";
+import * as Yup from "yup";
+import { FormikObject, ISolidField, SolidFieldProps } from "./fields/ISolidField";
+import { SolidBooleanField } from "./fields/SolidBooleanField";
+import { SolidDateField } from "./fields/SolidDateField";
+import { SolidDateTimeField } from "./fields/SolidDateTimeField";
 import { SolidDecimalField } from "./fields/SolidDecimalField";
+import { SolidIntegerField } from "./fields/SolidIntegerField";
+import { SolidJsonField } from "./fields/SolidJsonField";
 import { SolidLongTextField } from "./fields/SolidLongTextField";
-import { SolidBooleanField } from "./fields/SolidBooleanField";
+import { SolidMediaMultipleField } from "./fields/SolidMediaMultipleField";
+import { SolidMediaSingleField } from "./fields/SolidMediaSingleField";
+import { SolidRelationField } from "./fields/SolidRelationField";
 import { SolidRichTextField } from "./fields/SolidRichTextField";
-import { SolidDateField } from "./fields/SolidDateField";
+import { SolidSelectionDynamicField } from "./fields/SolidSelectionDynamicField";
+import { SolidSelectionStaticField } from "./fields/SolidSelectionStaticField";
+import { SolidShortTextField } from "./fields/SolidShortTextField";
 import { SolidTimeField } from "./fields/SolidTimeField";
-import { useLazyCheckIfPermissionExistsQuery } from "@/redux/api/userApi";
-import { createPermission, deletePermission, updatePermission } from "@/helpers/permissions";
 
 export type SolidFormViewProps = {
     moduleName: string;
@@ -500,16 +500,17 @@ const SolidFormView = (params: SolidFormViewProps) => {
     const {
         data: solidFormViewData,
         isLoading: solidFormViewDataIsLoading,
-    } = useGetSolidEntityByIdQuery({ id: params.id, qs: formViewDataQs }, { skip: !solidFormViewMetaData || params.id === 'new' });
+    } = useGetSolidEntityByIdQuery({ id: params.id, qs: formViewDataQs },
+        { skip: !solidFormViewMetaData || params.id === 'new', refetchOnMountOrArgChange: true, });
     useEffect(() => {
         if (solidFormViewData) {
             console.log(`DATA: `, solidFormViewData);
             setInitialEntityData(solidFormViewData.data);
         }
-    }, [solidFormViewData]);
+    }, [solidFormViewData, params]);
 
     let formik: FormikObject;
-
+    
     if (solidFormViewMetaDataIsLoading || solidFormViewDataIsLoading || !formViewLayout) {
         formik = useFormik({
             initialValues: {},

package/src/components/core/form/fields/ISolidField.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { FieldConfig, FieldHelperProps, FieldInputProps, FieldMetaProps, FormikConfig, FormikErrors, FormikState, FormikTouched, FormikValues } from "formik";
+import { FieldConfig, FieldHelperProps, FieldInputProps, FieldMetaProps, FormikErrors, FormikState, FormikTouched, FormikValues } from "formik";
 import { Schema } from "yup";
 
 export type SolidFieldProps = {

package/src/components/core/form/fields/SolidBooleanField.tsx

@@ -1,13 +1,11 @@
 'use client';
-import { Schema } from "yup";
-import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
-import * as Yup from 'yup';
-import { Tooltip } from "primereact/tooltip";
-import { InputText } from "primereact/inputtext";
 import { Message } from "primereact/message";
 import { SelectButton } from "primereact/selectbutton";
 import { classNames } from "primereact/utils";
 import { useEffect } from "react";
+import * as Yup from 'yup';
+import { Schema } from "yup";
+import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
 
 export class SolidBooleanField implements ISolidField {
 

package/src/components/core/form/fields/SolidDateField.tsx

@@ -1,11 +1,10 @@
 'use client';
-import { Schema } from "yup";
-import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
-import * as Yup from 'yup';
-import { Tooltip } from "primereact/tooltip";
-import { Message } from "primereact/message";
 import { Calendar } from "primereact/calendar";
+import { Message } from "primereact/message";
 import { useRef } from "react";
+import * as Yup from 'yup';
+import { Schema } from "yup";
+import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
 
 export class SolidDateField implements ISolidField {
 

package/src/components/core/form/fields/SolidDateTimeField.tsx

@@ -1,11 +1,10 @@
 'use client';
-import { Schema } from "yup";
-import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
-import * as Yup from 'yup';
-import { Tooltip } from "primereact/tooltip";
-import { Message } from "primereact/message";
 import { Calendar } from "primereact/calendar";
+import { Message } from "primereact/message";
 import { useRef } from "react";
+import * as Yup from 'yup';
+import { Schema } from "yup";
+import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
 
 export class SolidDateTimeField implements ISolidField {
 

package/src/components/core/form/fields/SolidDecimalField.tsx

@@ -1,11 +1,9 @@
 'use client';
+import { InputNumber } from "primereact/inputnumber";
+import { Message } from "primereact/message";
+import * as Yup from 'yup';
 import { Schema } from "yup";
 import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
-import * as Yup from 'yup';
-import { Tooltip } from "primereact/tooltip";
-import { InputText } from "primereact/inputtext";
-import { Message } from "primereact/message";
-import { InputNumber } from "primereact/inputnumber";
 
 export class SolidDecimalField implements ISolidField {
 

package/src/components/core/form/fields/SolidIntegerField.tsx

@@ -1,11 +1,9 @@
 'use client';
+import { InputNumber } from "primereact/inputnumber";
+import { Message } from "primereact/message";
+import * as Yup from 'yup';
 import { Schema } from "yup";
 import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
-import * as Yup from 'yup';
-import { Tooltip } from "primereact/tooltip";
-import { InputText } from "primereact/inputtext";
-import { Message } from "primereact/message";
-import { InputNumber } from "primereact/inputnumber";
 
 export class SolidIntegerField implements ISolidField {