@solidstarters/solid-core-ui 1.1.17 → 1.1.19

package/src/components/core/form/fields/relations/SolidRelationManyToOneField.tsx

@@ -7,6 +7,12 @@ import { useState } from "react";
 import * as Yup from 'yup';
 import { Schema } from "yup";
 import { FormikObject, ISolidField, SolidFieldProps } from "../ISolidField";
+import { camelCase, capitalize } from "lodash";
+import { Button } from "primereact/button";
+import { Checkbox } from "primereact/checkbox";
+import { Dialog } from "primereact/dialog";
+import { Panel } from "primereact/panel";
+import SolidFormView from "../../SolidFormView";
 
 
 export class SolidRelationManyToOneField implements ISolidField {
@@ -57,6 +63,8 @@ export class SolidRelationManyToOneField implements ISolidField {
         const className = fieldLayoutInfo.attrs?.className || 'field col-12';
         const fieldLabel = fieldLayoutInfo.attrs.label ?? fieldMetadata.displayName;
         const solidFormViewMetaData = this.fieldContext.solidFormViewMetaData;
+        const showFieldLabel = fieldLayoutInfo?.attrs?.showLabel;
+        const [visibleCreateRelationEntity, setvisibleCreateRelationEntity] = useState(false);
 
         // auto complete specific code. 
         const entityApi = createSolidEntityApi(fieldMetadata.relationModelSingularName);
@@ -106,11 +114,36 @@ export class SolidRelationManyToOneField implements ISolidField {
 
         const isFormFieldValid = (formik: any, fieldName: string) => formik.touched[fieldName] && formik.errors[fieldName];
 
+
+
+
+        const disabled = fieldLayoutInfo.attrs?.disabled;
+        const readOnly = fieldLayoutInfo.attrs?.readOnly;
+
+
+        const customCreateHandler = (values: any) => {
+            const currentRelationData = formik.values[fieldLayoutInfo.attrs.name] || [];
+            const jsonValues = Object.fromEntries(values.entries());
+            const updatedRelationData = [
+                ...currentRelationData,
+                {
+                    label: jsonValues[fieldMetadata?.relationModel?.userKeyField?.name],
+                    value: "new",
+                    original: jsonValues,
+                },
+            ];
+
+            formik.setFieldValue(fieldLayoutInfo.attrs.name, updatedRelationData);
+
+        }
         return (
             <div className={className}>
                 <div className="flex flex-column gap-2 mt-4">
-                    <label htmlFor={fieldLayoutInfo.attrs.name} className="form-field-label">{fieldLabel}
-                    </label>
+                    {showFieldLabel != false &&
+                        <label htmlFor={fieldLayoutInfo.attrs.name} className="form-field-label">
+                            {fieldLabel}
+                        </label>
+                    }
                     <AutoComplete
                         readOnly={formReadonly || fieldReadonly}
                         disabled={formDisabled || fieldDisabled}
@@ -124,6 +157,9 @@ export class SolidRelationManyToOneField implements ISolidField {
                         onChange={formik.handleChange}
                         className="w-full solid-standard-autocomplete"
                     />
+                    {fieldLayoutInfo.attrs.inlineCreate === "true" &&
+                        this.renderSolidFormEmbededView(formik, customCreateHandler, visibleCreateRelationEntity, setvisibleCreateRelationEntity)
+                    }
                 </div>
                 {isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (
                     <Message severity="error" text={formik?.errors[fieldLayoutInfo.attrs.name]?.toString()} />
@@ -131,4 +167,58 @@ export class SolidRelationManyToOneField implements ISolidField {
             </div>
         );
     }
+
+
+    renderSolidFormEmbededView(formik: FormikObject, customCreateHandler: any, visibleCreateRelationEntity: any, setvisibleCreateRelationEntity: any) {
+
+        const fieldMetadata = this.fieldContext.fieldMetadata;
+        const fieldLayoutInfo = this.fieldContext.field;
+        const className = fieldLayoutInfo.attrs?.className || 'field col-6 flex flex-column gap-2 mt-4';
+        const fieldLabel = fieldLayoutInfo.attrs.label ?? fieldMetadata.displayName;
+
+        const params = {
+            moduleName: this.fieldContext.fieldMetadata.relationModelModuleName,
+            id: "new",
+            embeded: true,
+            layout: fieldLayoutInfo?.attrs?.inlineCreateLayout,
+            customCreateHandler: ((values: any) => {
+                setvisibleCreateRelationEntity(false);
+                customCreateHandler(values)
+            }),
+            inlineCreateAutoSave: fieldLayoutInfo?.attrs?.inlineCreateAutoSave,
+            handlePopupClose: (() => {
+                setvisibleCreateRelationEntity(false);
+            }),
+            modelName: camelCase(this.fieldContext.fieldMetadata.relationModelSingularName)
+        }
+
+        return (
+            <div >
+                <Button
+                    icon="pi pi-plus"
+                    rounded
+                    outlined
+                    aria-label="Filter"
+                    type="button"
+                    size="small"
+                    onClick={() => setvisibleCreateRelationEntity(true)}
+                    className="custom-add-button"
+                />
+                <Dialog
+                    header=""
+                    showHeader={false}
+                    visible={visibleCreateRelationEntity}
+                    style={{ width: fieldLayoutInfo?.attrs?.inlineCreateLayout?.attrs?.width ?? "60vw" }}
+                    onHide={() => {
+                        if (!visibleCreateRelationEntity) return;
+                        setvisibleCreateRelationEntity(false);
+                    }}
+                    className="solid-dialog"
+                >
+                    <SolidFormView {...params} />
+
+                </Dialog>
+            </div>
+        )
+    }
 }

package/src/components/core/form/fields/relations/SolidRelationOneToManyField.tsx

@@ -62,6 +62,7 @@ export class SolidRelationOneToManyField implements ISolidField {
         const [listViewParams, setListViewParams] = useState<any>()
         const [formViewParams, setformViewParams] = useState<any>()
         const [refreshList, setRefreshList] = useState(false); // Added state for rerender
+        const showFieldLabel = fieldLayoutInfo?.attrs?.showLabel;
 
 
         const handlePopupOpen = (id: any) => {
@@ -133,7 +134,10 @@ export class SolidRelationOneToManyField implements ISolidField {
         return (
             <div className={className}>
                 {/* <div className="justify-content-center align-items-center"> */}
-                    <label htmlFor={fieldLayoutInfo.attrs.name}  className="form-field-label">{fieldLabel}&nbsp;{fieldDescription && <span className="form_field_help">({fieldDescription}) </span>}</label>
+                {showFieldLabel != false &&
+                    <label htmlFor={fieldLayoutInfo.attrs.name} className="form-field-label">{fieldLabel}&nbsp;{fieldDescription && <span className="form_field_help">({fieldDescription}) </span>}</label>
+                }
+
                 {/* </div>
                 <br></br> */}
                 {listViewParams &&

package/src/components/core/list/SolidListView.tsx

@@ -59,6 +59,7 @@ export const SolidListView = (params: SolidListViewParams) => {
   // const [showGlobalSearchElement, setShowGlobalSearchElement] = useState<boolean>(false);
 
   const [toPopulate, setToPopulate] = useState<string[]>([]);
+  const [toPopulateMedia, setToPopulateMedia] = useState<string[]>([]);
   const [actionsAllowed, setActionsAllowed] = useState<string[]>([]);
 
   const [triggerCheckIfPermissionExists] = useLazyCheckIfPermissionExistsQuery();
@@ -123,6 +124,8 @@ export const SolidListView = (params: SolidListViewParams) => {
 
     const initialFilters: any = {};
     const toPopulate: string[] = [];
+    const toPopulateMedia: string[] = [];
+
     for (let i = 0; i < solidView.layout.children?.length; i++) {
       const column = solidView.layout.children[i];
       const fieldMetadata = solidFieldsMetadata[column.attrs.name];
@@ -155,10 +158,14 @@ export const SolidListView = (params: SolidListViewParams) => {
       if (fieldMetadata.type === 'relation' && fieldMetadata.relationType === 'many-to-one') {
         toPopulate.push(fieldMetadata.name);
       }
+      if (fieldMetadata.type === 'mediaSingle' || fieldMetadata.relationType === 'mediaMultiple') {
+        toPopulateMedia.push(fieldMetadata.name);
+      }
     }
     // setFilters(initialFilters);
     setRows(solidListViewMetaData?.data?.solidView?.layout?.attrs?.defaultPageSize ? solidListViewMetaData?.data?.solidView?.layout?.attrs.defaultPageSize : 25)
     setToPopulate(toPopulate);
+    setToPopulateMedia(toPopulateMedia);
   }
 
   useEffect(() => {
@@ -268,11 +275,12 @@ export const SolidListView = (params: SolidListViewParams) => {
 
   // Fetch data after toPopulate has been populated...
   useEffect(() => {
-    if (toPopulate) {
+    if (toPopulate || toPopulateMedia) {
       const queryData = {
         offset: 0,
         limit: 25,
         populate: toPopulate,
+        populateMedia: toPopulateMedia,
         sort: [`id:desc`],
         filters: { ...params.customFilter }
       };
@@ -288,7 +296,7 @@ export const SolidListView = (params: SolidListViewParams) => {
       setSelectedRecoverRecords([]);
       setShowArchived(false);
     }
-  }, [isDeleteSolidEntitiesSucess, isDeleteSolidSingleEntitySuccess, toPopulate]);
+  }, [isDeleteSolidEntitiesSucess, isDeleteSolidSingleEntitySuccess, toPopulate, toPopulateMedia]);
 
   // Handle pagination event.
   const onPageChange = (event: any) => {
@@ -402,6 +410,7 @@ export const SolidListView = (params: SolidListViewParams) => {
       limit: limit ?? rows,
       filters: filters ?? filters,
       populate: toPopulate,
+      populateMedia: toPopulateMedia
     };
 
     if (sortField) {
@@ -702,7 +711,7 @@ export const SolidListView = (params: SolidListViewParams) => {
           rows={rows}
           rowsPerPageOptions={solidListViewMetaData?.data?.solidView?.layout?.attrs?.pageSizeOptions}
           dataKey="id"
-          emptyMessage="No Entities found."
+          emptyMessage={solidListViewMetaData?.data?.solidView?.model?.description || 'No Entities found.'}
           filterDisplay="menu"
           totalRecords={totalRecords}
           first={first}

package/src/components/core/list/columns/SolidMediaMultipleColumn.tsx

@@ -9,11 +9,29 @@ const SolidMediaMultipleColumn = ({ solidListViewMetaData, fieldMetadata, column
     const showFilterOperator = false;
     const columnDataType = undefined;
     const header = column.attrs.label ?? fieldMetadata.displayName;
+    const imageBodyTemplate = (product: any) => {
+        if (!product?._media?.[fieldMetadata.name]) return null;
 
+        const imageUrls = product._media[fieldMetadata.name].map((i: any) => i._full_url);
+
+        return (
+            <>
+                {imageUrls.map((url: string, index: number) => (
+                    <img
+                        key={index}
+                        src={url}
+                        alt={`product-image-${index}`}
+                        className="w-6rem shadow-2 border-round"
+                    />
+                ))}
+            </>
+        );
+    };
     return (
         <Column
             key={fieldMetadata.name}
             field={fieldMetadata.name}
+            body={imageBodyTemplate}
             header={header}
             // className="text-sm"
             sortable={column.attrs.sortable}

package/src/components/core/list/columns/SolidMediaSingleColumn.tsx

@@ -8,16 +8,37 @@ import { FilterMatchMode } from 'primereact/api';
 
 const SolidMediaSingleColumn = ({ solidListViewMetaData, fieldMetadata, column }: SolidListViewColumnParams) => {
     // const filterable = column.attrs.filterable;
+
     const filterable = false;
     const showFilterOperator = false;
     const columnDataType = undefined;
     const header = column.attrs.label ?? fieldMetadata.displayName;
 
+    const imageBodyTemplate = (product: any) => {
+        if (!product?._media?.[fieldMetadata.name]) return null;
+
+        const imageUrls = product._media[fieldMetadata.name].map((i: any) => i._full_url);
+
+        return (
+            <>
+                {imageUrls.map((url: string, index: number) => (
+                    <img
+                        key={index}
+                        src={url}
+                        alt={`product-image-${index}`}
+                        className="w-6rem shadow-2 border-round"
+                    />
+                ))}
+            </>
+        );
+    };
+
     return (
         <Column
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
+            body={imageBodyTemplate}
             // className="text-sm"
             sortable={column.attrs.sortable}
             // filter={filterable}

package/src/components/core/model/CreateModel.tsx

@@ -321,8 +321,8 @@ const CreateModel = ({ data, params }: any) => {
           size="small"
           className="bg-primary-reverse p-0"
           style={{
-            height: 32,
-            width: 32
+            height: 33.06,
+            width: 33.06
           }}
           onClick={(e) =>
             // @ts-ignore 
@@ -400,9 +400,9 @@ const CreateModel = ({ data, params }: any) => {
             </>
           }
         </div>
-        <div className="solid-form-stepper">
+        {/* <div className="solid-form-stepper">
           <SolidFormStepper />
-        </div>
+        </div> */}
         <div className="p-4 solid-form-content">
           <TabView
             activeIndex={activeIndex}

package/src/components/core/model/FieldMetaData.tsx

@@ -74,6 +74,30 @@ const FieldMetaData = ({ modelMetaData, fieldMetaData, setFieldMetaData, deleteM
     )
   };
 
+    const showToaster = async (message: any, severity: any) => {
+      const errorMessages = Object.values(message);
+      if (errorMessages.length > 0) {
+        toast?.current?.show({
+          severity: severity,
+          summary: "Can you send me the report?",
+          life: 3000,
+          //@ts-ignore
+          content: (props) => (
+            <div
+              className="flex flex-column align-items-left"
+              style={{ flex: "1" }}
+            >
+              {errorMessages.map((m, index) => (
+                <div className="flex align-items-center gap-2" key={index}>
+                  <span className="font-bold text-900">{String(m)}</span>
+                </div>
+              ))}
+            </div>
+          ),
+        });
+      }
+    };
+
 
 
   return (
@@ -132,7 +156,7 @@ const FieldMetaData = ({ modelMetaData, fieldMetaData, setFieldMetaData, deleteM
             }}
             showHeader={false}
           >
-            <FieldMetaDataForm modelMetaData={modelMetaData} fieldMetaData={selectedFieldMetaData} allFields={fieldMetaData} setFieldMetaData={setFieldMetaData} deleteModelFunction={deleteModelFunction} setVisiblePopup={setVisiblePopup} formikFieldsMetadataRef={formikFieldsMetadataRef} params={params} setIsRequiredPopUp={setIsRequiredPopUp}></FieldMetaDataForm>
+            <FieldMetaDataForm modelMetaData={modelMetaData} fieldMetaData={selectedFieldMetaData} allFields={fieldMetaData} setFieldMetaData={setFieldMetaData} deleteModelFunction={deleteModelFunction} setVisiblePopup={setVisiblePopup} formikFieldsMetadataRef={formikFieldsMetadataRef} params={params} setIsRequiredPopUp={setIsRequiredPopUp} showToaster={showToaster}></FieldMetaDataForm>
           </Dialog>
           <Dialog
             visible={isRequiredPopUp}

package/src/components/core/model/FieldMetaDataForm.tsx

@@ -4,7 +4,7 @@ import { SingleSelectAutoCompleteField } from "@/components/common/SingleSelectA
 import { getSingularAndPlural } from "@/helpers/helpers";
 import { useGetFieldDefaultMetaDataQuery } from "@/redux/api/fieldApi";
 import { useLazyGetMediaStorageProvidersQuery } from "@/redux/api/mediaStorageProviderApi";
-import { useLazyGetModelsQuery } from "@/redux/api/modelApi";
+import { useLazyGetModelsQuery, useUpdateUserKeyMutation } from "@/redux/api/modelApi";
 import { useLazyGetmodulesQuery } from "@/redux/api/moduleApi";
 import { useFormik } from "formik";
 import { capitalize } from "lodash";
@@ -506,7 +506,7 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
   return Yup.object(schema);
 };
 
-const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, allFields, deleteModelFunction, setVisiblePopup, params, setIsRequiredPopUp }: any) => {
+const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, allFields, deleteModelFunction, setVisiblePopup, params, setIsRequiredPopUp, showToaster }: any) => {
 
   const booleanOptions = ["false", "true"];
   const [isBackPopupVisible, setIsBackPopupVisible] = useState(false);
@@ -523,6 +523,10 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
   const [triggerGetMediaStorageProvider, { data: MediaStorageProviderData, isFetching: isMediaStorageProviderFetching, error: MediaStorageProviderError }] = useLazyGetMediaStorageProvidersQuery();
   const [triggerGetModules, { data: moduleData, isFetching: isModuleFetching, error: moduleError }] = useLazyGetmodulesQuery();
   const [triggerGetModels, { data: modelData, isFetching: ismodelFetching, error: modelError }] = useLazyGetModelsQuery();
+  const [
+    updateUserKey,
+    { isLoading: isUpdateUserKeyLoading, isSuccess: isUpdateUserKeySuccess, isError: isUpdateUserKeyError, error: UpdateUserKeyError, data: newModel },
+  ] = useUpdateUserKeyMutation();
 
 
   const [markdownText, setMarkdownText] = useState<string>();
@@ -543,7 +547,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
   const [ormTypeOptions, setOrmTypeOptions] = useState([]);
   const [selectedOrmType, setSelectedOrmType] = useState<any>(fieldMetaData?.ormType);
 
-
+  const [isUserKeyFields, setUserKeyFields] = useState(false);
+  const [userKeyData, setUserKeyData] = useState([]);
 
   const [
     filteredExternalIdProvider,
@@ -734,7 +739,9 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     }
   };
 
-
+  const searchUserKeyField = () => {
+    return userKeyData;
+  }
 
   const searchComputedFieldValueType = async (event: any) => {
     const query = event.query;
@@ -904,7 +911,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     isUserKey: fieldMetaData ? fieldMetaData?.isUserKey : false,
     relationJoinColumnName: fieldMetaData ? fieldMetaData?.relationJoinColumnName : null,
     joinColumnName: fieldMetaData ? fieldMetaData?.joinColumnName : null,
-    relationJoinTableName: fieldMetaData ? fieldMetaData?.relationJoinTableName : null
+    relationJoinTableName: fieldMetaData ? fieldMetaData?.relationJoinTableName : null,
+    userKey: fieldMetaData ? fieldMetaData?.userKey : null
   };
 
 
@@ -914,7 +922,6 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     enableReinitialize: true,
     onSubmit: async (values) => {
       try {
-
         setFieldMetaData((prevItems: any) => {
           const newFieldData = { ...values, isSystem: values.isSystem == true ? true : '' }
           const formtatedFieldPayload = fieldBasedPayloadFormating(newFieldData, currentFields, fieldMetaData);
@@ -931,6 +938,13 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
             return [...prevItems, formtatedFieldPayload]
           }
         });
+        if (values.userKey) {
+          const data = {
+            modelName: values.relationModelSingularName,
+            fieldName: values.userKey
+          }
+          updateUserKey(data);
+        }
         // nextTab()
         setVisiblePopup(false);
 
@@ -972,7 +986,13 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     }
   };
 
-
+  useEffect(() => {
+    if (isUpdateUserKeySuccess) {
+      showToaster([newModel?.data?.message], "success");
+    } if (isUpdateUserKeyError) {
+      showToaster(UpdateUserKeyError, 'error')
+    }
+  }, [isUpdateUserKeySuccess, isUpdateUserKeyError])
 
   const handleTypeSelect = (e: any, label: string) => {
 
@@ -1012,6 +1032,40 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     }
   }, [fieldMetaData])
 
+  useEffect(() => {
+    const fetchFields = async () => {
+      const queryData: any = {
+        limit: 10,
+        offset: 0,
+        filters: {
+          singularName: {
+            $eq: formik.values.relationModelSingularName
+          }
+        },
+        populate: ['fields']
+      };
+      const queryString = qs.stringify(queryData, {
+        encodeValuesOnly: true,
+      });
+  
+      const result = await triggerGetModels(queryString).unwrap();
+  
+      if (result && result.records) {
+        if (!result?.records[0]?.userKeyField) {
+          setUserKeyFields(true);
+          const fieldsWithUnique = result?.records[0]?.fields?.filter((field: any) => field?.unique === true);
+          setUserKeyData(fieldsWithUnique)
+        } else {
+          setUserKeyFields(false);
+          setUserKeyData([]);
+        }
+      }
+    }
+    if (formik.values.relationModelSingularName) {
+      fetchFields();
+    }
+  }, [formik.values.relationModelSingularName])
+
   const updateEnumValues = (index: number, updatedString: string) => {
     const updatedValues = formik.values.selectionStaticValues.map((enumValue: string, i: number) =>
       i === index ? updatedString : enumValue
@@ -1826,6 +1880,39 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               </div>
                             )}
 
+                          {isUserKeyFields && (
+                              <div className="field col-6 flex-flex-column gap-2">
+                                <label
+                                  htmlFor="userKey"
+                                  className="form-field-label"
+                                >
+                                  Set User Key
+                                </label>
+
+
+                                <SingleSelectAutoCompleteField
+                                  key="userKey"
+                                  formik={formik}
+                                  isFormFieldValid={isFormFieldValid}
+                                  fieldName="userKey"
+                                  fieldNameId="userKey"
+                                  labelKey="displayName"
+                                  valueKey="name"
+                                  searchData={searchUserKeyField}
+                                  existingData={formik.values.userKey}
+                                />
+                                {isFormFieldValid(
+                                  formik,
+                                  "userKey"
+                                ) && (
+                                    <Message
+                                      severity="error"
+                                      text={formik?.errors?.userKey?.toString()}
+                                    />
+                                  )}
+                              </div>
+                            )}
+
                           {currentFields.includes("relationCreateInverse") && formik.values.relationType === "many-to-many" && (
                             <div className="field col-6 flex flex-column gap-2 mt-3">
                               <label htmlFor="relationCreateInverse" className="form-field-label">
@@ -1838,7 +1925,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                   checked={Boolean(formik.values.relationCreateInverse)}
                                   onChange={(e) => formik.setFieldValue("relationCreateInverse", e.checked)}
                                 />
-                                <label htmlFor="relationCreateInverse" className="ml-2">Enable</label>
+                                <label htmlFor="relationCreateInverse" className="ml-2">Create Inverse</label>
                               </div>
                               {isFormFieldValid(formik, "relationCreateInverse") && (
                                 <Message severity="error" text={formik?.errors?.relationCreateInverse?.toString()} />
@@ -2045,7 +2132,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                     e.value
                                   )
                                 }
-                                placeholder="Select a Data Source"
+                                placeholder="Select Value Type"
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(
                                     formik,
@@ -2346,7 +2433,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
 
                         </div>
                       )}
-                      {(currentFields.includes("regexPattern") || currentFields.includes("min") || currentFields.includes("max") || currentFields.includes("ormType")) && ormTypeOptions && formik.values.relationType !== "many-to-many" &&
+                      {(currentFields.includes("regexPattern") || currentFields.includes("min") || currentFields.includes("max") || currentFields.includes("ormType")) && ormTypeOptions && selectedType.value !== 'relation' &&
                         <>
                           <p className="form-wrapper-heading text-base">Validations</p>
                           <div className="formgrid grid">
@@ -2439,7 +2526,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                   {currentFields.includes("min") && (
                                       <div className="field col-6 flex-flex-column gap-2 mt-3">
                                         <label htmlFor="min" className="form-field-label">
-                                          Min (Characters Allowed)
+                                          Min {(selectedType.value !== "int" && selectedType.value !== "decimal") && `(Characters Allowed)`}
 
                                         </label>
                                         {/* <InputText
@@ -2472,6 +2559,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                                 "min"
                                               ),
                                             })}
+                                            disabled={fieldMetaData?.id}
                                           />
                                         }
 
@@ -2486,7 +2574,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                   {currentFields.includes("max") && (
                                       <div className="field col-6 flex-flex-column gap-2 mt-3">
                                         <label htmlFor="max" className="form-field-label">
-                                          Max (Character allowed)
+                                          Max {(selectedType.value !== "int" &&
+                                                selectedType.value !== "decimal") && `(Characters allowed)`}
                                         </label>
                                         {/* <InputText
                                 type="text"
@@ -2517,6 +2606,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                                 "max"
                                               ),
                                             })}
+                                            disabled={fieldMetaData?.id}
                                           />
                                         }
 
@@ -2586,7 +2676,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
 
                       <p className="form-wrapper-heading text-base">Settings</p>
                       <div className="formgrid grid">
-                        {currentFields.includes("required") && (
+                        {currentFields.includes("required") && selectedType.value !== 'relation' && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <div className="flex align-items-center">
                                 <Checkbox
@@ -2610,7 +2700,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               )}
                             </div>
                         )}
-                        {currentFields.includes("unique") && (
+                        {currentFields.includes("unique") && selectedType.value !== 'relation' && (
                             <div className="field col-6 flex-flex-column gap-2">
                               <div className="flex align-items-center">
                                 <Checkbox
@@ -2634,7 +2724,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               )}
                             </div>
                         )}
-                        {currentFields.includes("index") && (
+                        {currentFields.includes("index") && selectedType.value !== 'relation' && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <div className="flex align-items-center">
                                 <Checkbox
@@ -2656,7 +2746,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               )}
                             </div>
                         )}
-                        {currentFields.includes("private") && (
+                        {currentFields.includes("private") && selectedType.value !== 'relation' && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <div className="flex align-items-center">
                                 <Checkbox
@@ -2681,7 +2771,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               )}
                             </div>
                         )}
-                        {currentFields.includes("encrypt") && (
+                        {currentFields.includes("encrypt") && selectedType.value !== 'relation' && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <div className="flex align-items-center gap-2">
                                 <Checkbox
@@ -2742,7 +2832,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                   Is Userkey
                                 </label>
                               </div>
-                              <p className="fieldSubTitle">If userkey already then it will be replaced with this key</p>
+                              <p className="fieldSubTitle">By selecting this option, you are setting this field as the model's user key. Any existing user key configuration will be overwritten</p>
 
                               {isFormFieldValid(formik, "isUserKey") && (
                                 <Message