@solidstarters/solid-core-ui 1.1.19 → 1.1.20

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

@@ -32,6 +32,11 @@ import { FilterIcon } from '../../modelsComponents/filterIcon';
 import { OverlayPanel } from "primereact/overlaypanel";
 import { Toast } from "primereact/toast";
 import { Divider } from "primereact/divider";
+import CompactImage from '../../../resources/images/layout/images/compact.png';
+import CozyImage from '../../../resources/images/layout/images/cozy.png';
+import ComfortableImage from '../../../resources/images/layout/images/comfortable.png';
+import ListImage from '../../../resources/images/layout/images/cozy.png';
+import KanbanImage from '../../../resources/images/layout/images/kanban.png';
 
 const getRandomInt = (min: number, max: number) => {
   return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -261,7 +266,7 @@ export const SolidListView = (params: SolidListViewParams) => {
       sort: [`id:desc`],
     };
     if (showArchived) {
-      queryData.showSoftDeleted = 'true';
+      queryData.showSoftDeleted = 'inclusive';
     }
     const queryString = qs.stringify(queryData, {
       encodeValuesOnly: true
@@ -611,14 +616,14 @@ export const SolidListView = (params: SolidListViewParams) => {
   }
 
   const sizeOptions = [
-    { label: 'Compact', value: 'small', image: '/images/layout/images/compact.png' },
-    { label: 'Cozy', value: 'normal', image: '/images/layout/images/cozy.png' },
-    { label: 'Comfortable', value: 'large', image: '/images/layout/images/comfortable.png' }
+    { label: 'Compact', value: 'small', image: CompactImage},
+    { label: 'Cozy', value: 'normal', image: CozyImage },
+    { label: 'Comfortable', value: 'large', image: ComfortableImage }
   ]
 
   const viewModes = [
-    { label: 'List ', value: 'list', image: '/images/layout/images/cozy.png' },
-    { label: 'Kanban', value: 'kanban', image: '/images/layout/images/kanban.png' },
+    { label: 'List ', value: 'list', image: ListImage },
+    { label: 'Kanban', value: 'kanban', image: KanbanImage },
   ]
 
   const [size, setSize] = useState<string | any>(sizeOptions[1].value);
@@ -629,27 +634,6 @@ export const SolidListView = (params: SolidListViewParams) => {
       <div className="page-header">
         <Toast ref={toast} />
         <div className="flex gap-3 align-items-center">
-
-
-          {actionsAllowed.includes(`${deletePermission(params.modelName)}`) && solidListViewMetaData?.data?.solidView?.layout?.attrs?.delete !== false && selectedRecords.length > 0 && <Button
-            type="button"
-            label="Delete"
-            size="small"
-            onClick={() => setDialogVisible(true)}
-            severity="danger"
-          />}
-          {/* {isFilterApplied &&
-            <Button
-              type="button"
-              icon="pi pi-filter-slash"
-              label="Clear"
-              size="small"
-              outlined
-              onClick={clearFilter}
-              className="small-button"
-            />
-          } */}
-
           {solidListViewMetaData?.data?.solidView?.layout?.attrs?.enableGlobalSearch === true && params.embeded === false &&
             <SolidGlobalSearchElement filters={filters} clearFilter={clearFilter} ref={solidGlobalSearchElementRef} viewData={solidListViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}></SolidGlobalSearchElement>
           }
@@ -668,14 +652,7 @@ export const SolidListView = (params: SolidListViewParams) => {
           {showArchived && <Button type="button" icon="pi pi-refresh" label="Recover" size='small' severity="secondary"
             onClick={() => setRecoverDialogVisible(true)}
           ></Button>}
-          {/* <SolidLayoutViews
-            sizeOptions={sizeOptions}
-            setSize={setSize}
-            size={size}
-            viewModes={viewModes}
-            setView={setView}
-            view={view}
-          /> */}
+
           {params.embeded === false &&
             <SolidConfigureLayoutElement
               setShowArchived={setShowArchived}
@@ -687,11 +664,13 @@ export const SolidListView = (params: SolidListViewParams) => {
               viewModes={viewModes}
               setView={setView}
               view={view}
+              params={params}
+              actionsAllowed={actionsAllowed}
+              selectedRecords={selectedRecords}
+              setDialogVisible={setDialogVisible}
             ></SolidConfigureLayoutElement>
           }
-          {/* {params.embeded === false &&
-            <SolidListViewOptions></SolidListViewOptions>
-          } */}
+
         </div>
       </div>
       <style>{`.p-datatable .p-datatable-loading-overlay {background-color: rgba(0, 0, 0, 0.0);} .greyed-out-row { background-color: #f5f5f5 !important; color: #a0a0a0 !important; opacity: 0.6;}`}</style>
@@ -744,16 +723,15 @@ export const SolidListView = (params: SolidListViewParams) => {
               ) :
                 <>
                   {detailsBodyTemplate(rowData)}
-                  <OverlayPanel ref={op} className="solid-custom-overlay" style={{ top: 10 }}>
+                  <OverlayPanel ref={op} className="solid-custom-overlay" style={{ top: 10, minWidth: 120 }}>
                     <div className="flex flex-column gap-1 p-1">
                       <Button
-                        className="w-8rem text-left gap-2"
+                        type="button"
+                        className="w-full text-left gap-1"
                         label="Edit"
                         size="small"
                         iconPos="left"
-                        icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-                          <path d="M3.33333 12.6667H4.28333L10.8 6.15L9.85 5.2L3.33333 11.7167V12.6667ZM2 14V11.1667L10.8 2.38333C10.9333 2.26111 11.0806 2.16667 11.2417 2.1C11.4028 2.03333 11.5722 2 11.75 2C11.9278 2 12.1 2.03333 12.2667 2.1C12.4333 2.16667 12.5778 2.26667 12.7 2.4L13.6167 3.33333C13.75 3.45556 13.8472 3.6 13.9083 3.76667C13.9694 3.93333 14 4.1 14 4.26667C14 4.44444 13.9694 4.61389 13.9083 4.775C13.8472 4.93611 13.75 5.08333 13.6167 5.21667L4.83333 14H2ZM10.3167 5.68333L9.85 5.2L10.8 6.15L10.3167 5.68333Z" fill="#F9F0FF" />
-                        </svg>}
+                        icon={"pi pi-pencil"}
                         onClick={() => {
                           if (params.embeded == true) {
                             params.handlePopUpOpen(selectedSolidViewData?.id);
@@ -762,18 +740,19 @@ export const SolidListView = (params: SolidListViewParams) => {
                           }
                         }}
                       />
-                      <Button
-                        text
-                        className="w-8rem text-left gap-2"
-                        label="Delete"
-                        size="small"
-                        iconPos="left"
-                        severity="secondary"
-                        icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-                          <path d="M4.66666 14C4.29999 14 3.9861 13.8694 3.72499 13.6083C3.46388 13.3472 3.33332 13.0333 3.33332 12.6667V4H2.66666V2.66667H5.99999V2H9.99999V2.66667H13.3333V4H12.6667V12.6667C12.6667 13.0333 12.5361 13.3472 12.275 13.6083C12.0139 13.8694 11.7 14 11.3333 14H4.66666ZM11.3333 4H4.66666V12.6667H11.3333V4ZM5.99999 11.3333H7.33332V5.33333H5.99999V11.3333ZM8.66666 11.3333H9.99999V5.33333H8.66666V11.3333Z" fill="#4B4D52" />
-                        </svg>}
-                        onClick={() => setDeleteEntity(true)}
-                      />
+                      {actionsAllowed.includes(`${deletePermission(params.modelName)}`) && solidListViewMetaData?.data?.solidView?.layout?.attrs?.delete !== false &&
+                        <Button
+                          text
+                          type="button"
+                          className="w-full text-left gap-1"
+                          label="Delete"
+                          size="small"
+                          iconPos="left"
+                          severity="danger"
+                          icon={'pi pi-trash'}
+                          onClick={() => setDeleteEntity(true)}
+                        />
+                      }
                       {solidListViewMetaData?.data?.solidView?.layout?.attrs?.rowButtons &&
                         solidListViewMetaData?.data?.solidView?.layout?.attrs?.rowButtons.map((rowAction: any) => {
                           return (
@@ -793,6 +772,8 @@ export const SolidListView = (params: SolidListViewParams) => {
                                 setListViewRowActionPopupState(true)
                               }
                               }
+                              className="w-full text-left gap-2"
+                              label="Generate Code"
                             />
                           );
                         })}

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

@@ -7,7 +7,7 @@ import qs from "qs";
 
 export const SolidManyToOneFilterElement = ({ value, updateInputs, index, fieldMetadata }: any) => {
 
-    const entityApi = createSolidEntityApi(fieldMetadata.relationModelSingularName);
+    const entityApi = createSolidEntityApi(fieldMetadata.relationCoModelSingularName);
     const { useLazyGetSolidEntitiesQuery } = entityApi;
     const [triggerGetSolidEntities] = useLazyGetSolidEntitiesQuery();
 

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

@@ -18,6 +18,7 @@ import { SolidFormStepper } from "@/components/common/SolidFormStepper";
 import { Dialog } from "primereact/dialog";
 import { Divider } from "primereact/divider";
 import { OverlayPanel } from "primereact/overlaypanel";
+import { SolidBreadcrumb } from "@/components/common/SolidBreadcrumb";
 
 interface ErrorResponseData {
   message: string;
@@ -145,17 +146,17 @@ const CreateModel = ({ data, params }: any) => {
           errorMessages.forEach((error) => {
             handleError([error]); // Call handleError for each error separately
           });
-      
+
           firstErrorTab = 0; // Model Metadata tab has errors
         } else {
-          setFormErrors({}); 
+          setFormErrors({});
         }
-  
+
         if (fieldMetaData.length === 0) {
           handleError(["Please add at least one field"]);
           firstErrorTab = firstErrorTab ?? 1; // If no prior error, set to Field tab
         }
-  
+
         if (firstErrorTab !== undefined) {
           setTabErrors({ [firstErrorTab]: true }); // Set error only on the first tab with an issue
           setActiveIndex(firstErrorTab); // Switch to the tab with an error
@@ -313,13 +314,9 @@ const CreateModel = ({ data, params }: any) => {
           outlined
           severity="secondary"
           type="button"
-          icon={
-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-              <path d="M6 14C5.45 14 4.97917 13.8042 4.5875 13.4125C4.19583 13.0208 4 12.55 4 12C4 11.45 4.19583 10.9792 4.5875 10.5875C4.97917 10.1958 5.45 10 6 10C6.55 10 7.02083 10.1958 7.4125 10.5875C7.80417 10.9792 8 11.45 8 12C8 12.55 7.80417 13.0208 7.4125 13.4125C7.02083 13.8042 6.55 14 6 14ZM12 14C11.45 14 10.9792 13.8042 10.5875 13.4125C10.1958 13.0208 10 12.55 10 12C10 11.45 10.1958 10.9792 10.5875 10.5875C10.9792 10.1958 11.45 10 12 10C12.55 10 13.0208 10.1958 13.4125 10.5875C13.8042 10.9792 14 11.45 14 12C14 12.55 13.8042 13.0208 13.4125 13.4125C13.0208 13.8042 12.55 14 12 14ZM18 14C17.45 14 16.9792 13.8042 16.5875 13.4125C16.1958 13.0208 16 12.55 16 12C16 11.45 16.1958 10.9792 16.5875 10.5875C16.9792 10.1958 17.45 10 18 10C18.55 10 19.0208 10.1958 19.4125 10.5875C19.8042 10.9792 20 11.45 20 12C20 12.55 19.8042 13.0208 19.4125 13.4125C19.0208 13.8042 18.55 14 18 14Z" fill="#4B4D52" />
-            </svg>
-          }
+          icon={'pi pi-cog'}
           size="small"
-          className="bg-primary-reverse p-0"
+          className="surface-card p-0"
           style={{
             height: 33.06,
             width: 33.06
@@ -331,7 +328,7 @@ const CreateModel = ({ data, params }: any) => {
         />
         <OverlayPanel ref={op} className="solid-custom-overlay">
           <div className="flex flex-column gap-1 p-1">
-            <Button
+            {/* <Button
               text
               type="button"
               className="w-8rem text-left gap-2 text-color"
@@ -341,18 +338,16 @@ const CreateModel = ({ data, params }: any) => {
               icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
                 <path d="M6 11.9997C5.63333 11.9997 5.31944 11.8691 5.05833 11.608C4.79722 11.3469 4.66667 11.033 4.66667 10.6663V2.66634C4.66667 2.29967 4.79722 1.98579 5.05833 1.72467C5.31944 1.46356 5.63333 1.33301 6 1.33301H12C12.3667 1.33301 12.6806 1.46356 12.9417 1.72467C13.2028 1.98579 13.3333 2.29967 13.3333 2.66634V10.6663C13.3333 11.033 13.2028 11.3469 12.9417 11.608C12.6806 11.8691 12.3667 11.9997 12 11.9997H6ZM6 10.6663H12V2.66634H6V10.6663ZM3.33333 14.6663C2.96667 14.6663 2.65278 14.5358 2.39167 14.2747C2.13056 14.0136 2 13.6997 2 13.333V3.99967H3.33333V13.333H10.6667V14.6663H3.33333Z" fill="black" fill-opacity="0.88" />
               </svg>}
-            />
+            /> */}
             <Button
               text
               type="button"
-              className="w-8rem text-left gap-2 text-color"
+              className="w-8rem text-left gap-2"
               label="Delete"
               size="small"
               iconPos="left"
-              icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-                <path d="M4.66666 14C4.29999 14 3.9861 13.8694 3.72499 13.6083C3.46388 13.3472 3.33332 13.0333 3.33332 12.6667V4H2.66666V2.66667H5.99999V2H9.99999V2.66667H13.3333V4H12.6667V12.6667C12.6667 13.0333 12.5361 13.3472 12.275 13.6083C12.0139 13.8694 11.7 14 11.3333 14H4.66666ZM11.3333 4H4.66666V12.6667H11.3333V4ZM5.99999 11.3333H7.33332V5.33333H5.99999V11.3333ZM8.66666 11.3333H9.99999V5.33333H8.66666V11.3333Z" fill="#4B4D52" />
-              </svg>
-              }
+              severity="danger"
+              icon={'pi pi-trash'}
               onClick={() => setDeleteEntity(true)}
             />
           </div>
@@ -361,6 +356,14 @@ const CreateModel = ({ data, params }: any) => {
     )
   }
 
+  const breadcrumbData = [
+    { label: 'Model', link: '/admin/core/solid-core/model-metadata/list' },
+    { label: params.id === "new" ? 'Create Model' : 'Edit Model' },
+  ];
+
+  const [isDirty, setIsDirty] = useState(false);
+
+
   return (
     <div className="solid-form-wrapper">
       <Toast ref={toast} />
@@ -373,7 +376,9 @@ const CreateModel = ({ data, params }: any) => {
                 <div className="form-wrapper-title">Create Model</div>
               </div>
               <div className="gap-3 flex">
-                <Button label="Save" size="small" onClick={handleSubmit} type="submit" />
+                {isDirty &&
+                  <Button label="Save" size="small" onClick={handleSubmit} type="submit" />
+                }
                 <CancelButton />
               </div>
             </>
@@ -387,7 +392,9 @@ const CreateModel = ({ data, params }: any) => {
                 {data?.isSystem !== true &&
                   <>
                     <div>
-                      <Button label="Save" size="small" type="submit" onClick={handleSubmit} />
+                      {isDirty &&
+                        <Button label="Save" size="small" type="submit" onClick={handleSubmit} />
+                      }
                     </div>
                     <div>
                       <Button outlined label="Delete" size="small" severity="danger" type="button" onClick={() => setDeleteEntity(true)} />
@@ -400,6 +407,7 @@ const CreateModel = ({ data, params }: any) => {
             </>
           }
         </div>
+        <SolidBreadcrumb breadcrumbItems={breadcrumbData} />
         {/* <div className="solid-form-stepper">
           <SolidFormStepper />
         </div> */}
@@ -418,8 +426,8 @@ const CreateModel = ({ data, params }: any) => {
 
             }}
           >
-            <TabPanel header="Model" 
-             headerClassName={tabErrors[0] ? "tab-error" : ""}>
+            <TabPanel header="Model"
+              headerClassName={tabErrors[0] ? "tab-error" : ""}>
               <ModelMetaData
                 modelMetaData={modelMetaData}
                 setModelMetaData={setModelMetaData}
@@ -428,10 +436,11 @@ const CreateModel = ({ data, params }: any) => {
                 nextTab={nextTab}
                 formikModelMetadataRef={formikModelMetadataRef}
                 params={params}
-                formErrors= {formErrors}
+                formErrors={formErrors}
+                setIsDirty={setIsDirty}
               ></ModelMetaData>
             </TabPanel>
-            <TabPanel header="Fields" 
+            <TabPanel header="Fields"
               headerClassName={tabErrors[1] ? "tab-error" : ""}>
               <FieldMetaData
                 modelMetaData={modelMetaData}

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

@@ -74,36 +74,36 @@ 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>
-          ),
-        });
-      }
-    };
+  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 (
     <>
 
-      {!modelMetaData.moduleId ?
+      {!modelMetaData.moduleId || !modelMetaData.dataSource ?
         <div className="card flex justify-content-center">
           <Messages ref={msgs} />
         </div>

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

@@ -388,13 +388,13 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
     ...(currentFields.includes("relationType") && {
       relationType: Yup.string().required("Relation Type is required"),
     }),
-    ...(currentFields.includes("relationModelSingularName") && {
-      relationModelSingularName: Yup.string().required(
+    ...(currentFields.includes("relationCoModelSingularName") && {
+      relationCoModelSingularName: Yup.string().required(
         "Relation Model Singular Name is required"
       ),
     }),
-    ...(currentFields.includes("relationModelFieldName") && {
-      relationModelFieldName: Yup.string()
+    ...(currentFields.includes("relationCoModelFieldName") && {
+      relationCoModelFieldName: Yup.string()
       // .required(
       //   "Relation Model Field Name is required"
       // ),
@@ -703,7 +703,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     }
   };
 
-  const searchRelationModelSingularNames = async (event: any) => {
+  const searchrelationCoModelSingularNames = async (event: any) => {
     try {
       const query = event.query;
       const queryData: any = {
@@ -892,8 +892,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     mediaStorageProvider: fieldMetaData ? fieldMetaData?.mediaStorageProvider : null,
     mediaEmbedded: fieldMetaData ? (fieldMetaData?.mediaEmbedded && fieldMetaData?.mediaEmbedded.toString()) : "true",
     relationType: fieldMetaData ? fieldMetaData?.relationType : null,
-    relationModelSingularName: fieldMetaData ? fieldMetaData?.relationModelSingularName : null,
-    relationModelFieldName: fieldMetaData ? fieldMetaData?.relationModelFieldName : modelMetaData.pluralName || '',
+    relationCoModelSingularName: fieldMetaData ? fieldMetaData?.relationCoModelSingularName : null,
+    relationCoModelFieldName: fieldMetaData ? fieldMetaData?.relationCoModelFieldName : modelMetaData.pluralName || '',
     relationCreateInverse: fieldMetaData ? fieldMetaData?.relationCreateInverse : false,
     relationCascade: fieldMetaData ? fieldMetaData?.relationCascade : 'cascade',
     relationModelModuleName: fieldMetaData ? fieldMetaData?.relationModelModuleName : modelMetaData?.module.name,
@@ -909,8 +909,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     isSystem: fieldMetaData ? fieldMetaData?.isSystem : false,
     columnName: fieldMetaData ? fieldMetaData?.columnName : null,
     isUserKey: fieldMetaData ? fieldMetaData?.isUserKey : false,
-    relationJoinColumnName: fieldMetaData ? fieldMetaData?.relationJoinColumnName : null,
-    joinColumnName: fieldMetaData ? fieldMetaData?.joinColumnName : null,
+    relationCoModelColumnName: fieldMetaData ? fieldMetaData?.relationCoModelColumnName : null,
     relationJoinTableName: fieldMetaData ? fieldMetaData?.relationJoinTableName : null,
     userKey: fieldMetaData ? fieldMetaData?.userKey : null
   };
@@ -940,7 +939,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
         });
         if (values.userKey) {
           const data = {
-            modelName: values.relationModelSingularName,
+            modelName: values.relationCoModelSingularName,
             fieldName: values.userKey
           }
           updateUserKey(data);
@@ -1039,7 +1038,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
         offset: 0,
         filters: {
           singularName: {
-            $eq: formik.values.relationModelSingularName
+            $eq: formik.values.relationCoModelSingularName
           }
         },
         populate: ['fields']
@@ -1061,10 +1060,10 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
         }
       }
     }
-    if (formik.values.relationModelSingularName) {
+    if (formik.values.relationCoModelSingularName) {
       fetchFields();
     }
-  }, [formik.values.relationModelSingularName])
+  }, [formik.values.relationCoModelSingularName])
 
   const updateEnumValues = (index: number, updatedString: string) => {
     const updatedValues = formik.values.selectionStaticValues.map((enumValue: string, i: number) =>
@@ -1791,9 +1790,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                 searchData={searchRelationModelModuleNames}
                                 existingData={formik.values.relationModelModuleName}
                                 additionalAction={(e: any) => {
-                                  formik.setFieldValue("relationModelSingularName", "");
-                                  formik.setFieldValue("relationJoinColumnName", "");
-                                  formik.setFieldValue("joinColumnName", "");
+                                  formik.setFieldValue("relationCoModelSingularName", "");
+                                  formik.setFieldValue("relationCoModelColumnName", "");
                                   formik.setFieldValue("relationJoinTableName", "");
                                 }}
                               />
@@ -1832,11 +1830,11 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                           )}
 
                           {currentFields.includes(
-                            "relationModelSingularName"
+                            "relationCoModelSingularName"
                           ) && (
                               <div className="field col-6 flex-flex-column gap-2 mt-3">
                                 <label
-                                  htmlFor="relationModelSingularName"
+                                  htmlFor="relationCoModelSingularName"
                                   className="form-field-label"
                                 >
                                   Co-Model Name
@@ -1844,37 +1842,23 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
 
 
                                 <SingleSelectAutoCompleteField
-                                  key="relationModelSingularName"
+                                  key="relationCoModelSingularName"
                                   formik={formik}
                                   isFormFieldValid={isFormFieldValid}
-                                  fieldName="relationModelSingularName"
-                                  fieldNameId="relationModelSingularName"
+                                  fieldName="relationCoModelSingularName"
+                                  fieldNameId="relationCoModelSingularName"
                                   labelKey="displayName"
                                   valueKey="singularName"
-                                  searchData={searchRelationModelSingularNames}
-                                  existingData={formik.values.relationModelSingularName}
+                                  searchData={searchrelationCoModelSingularNames}
+                                  existingData={formik.values.relationCoModelSingularName}
                                 />
-
-                                {/* <InputText
-                                        type="text"
-                                        id="relationModelSingularName"
-                                        name="relationModelSingularName"
-                                        onChange={formik.handleChange}
-                                        value={formik.values.relationModelSingularName}
-                                        className={classNames("", {
-                                          "p-invalid": isFormFieldValid(
-                                            formik,
-                                            "relationModelSingularName"
-                                          ),
-                                        })}
-                                      /> */}
                                 {isFormFieldValid(
                                   formik,
-                                  "relationModelSingularName"
+                                  "relationCoModelSingularName"
                                 ) && (
                                     <Message
                                       severity="error"
-                                      text={formik?.errors?.relationModelSingularName?.toString()}
+                                      text={formik?.errors?.relationCoModelSingularName?.toString()}
                                     />
                                   )}
                               </div>
@@ -1913,7 +1897,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               </div>
                             )}
 
-                          {currentFields.includes("relationCreateInverse") && formik.values.relationType === "many-to-many" && (
+                          {currentFields.includes("relationCreateInverse") && (formik.values.relationType === "many-to-many" || formik.values.relationType === "many-to-one")&& (
                             <div className="field col-6 flex flex-column gap-2 mt-3">
                               <label htmlFor="relationCreateInverse" className="form-field-label">
                                 Relation Create Inverse
@@ -1933,31 +1917,31 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                             </div>
                           )}
 
-                          {currentFields.includes("relationModelFieldName") && formik.values.relationCreateInverse && formik.values.relationType === "many-to-many" && (
+                          {currentFields.includes("relationCoModelFieldName") && formik.values.relationCreateInverse && (formik.values.relationType === "many-to-many" || formik.values.relationType === "many-to-one") && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <label
-                                htmlFor="relationModelFieldName"
+                                htmlFor="relationCoModelFieldName"
                                 className="form-field-label"
                               >
                                 Field Name on Inverse Side
                               </label>
                               <InputText
                                 type="text"
-                                id="relationModelFieldName"
-                                name="relationModelFieldName"
+                                id="relationCoModelFieldName"
+                                name="relationCoModelFieldName"
                                 onChange={formik.handleChange}
-                                value={formik.values.relationModelFieldName}
+                                value={formik.values.relationCoModelFieldName}
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(
                                     formik,
-                                    "relationModelFieldName"
+                                    "relationCoModelFieldName"
                                   ),
                                 })}
                               />
-                              {isFormFieldValid(formik, "relationModelFieldName") && (
+                              {isFormFieldValid(formik, "relationCoModelFieldName") && (
                                 <Message
                                   severity="error"
-                                  text={formik?.errors?.relationModelFieldName?.toString()}
+                                  text={formik?.errors?.relationCoModelFieldName?.toString()}
                                 />
                               )}
 
@@ -1995,7 +1979,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                             </div>
                           )}
 
-                          {currentFields.includes("joinColumnName") && formik.values.relationType === "many-to-many" && (
+                          {/* {currentFields.includes("joinColumnName") && formik.values.relationType === "many-to-many" && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <label
                                 htmlFor="joinColumnName"
@@ -2024,33 +2008,33 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               )}
 
                             </div>
-                          )}
+                          )} */}
 
-                          {currentFields.includes("relationJoinColumnName") && formik.values.relationType === "many-to-many" && (
+                          {currentFields.includes("relationCoModelColumnName") && (formik.values.relationType === "many-to-many" || formik.values.relationType === "many-to-one") && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <label
-                                htmlFor="relationJoinColumnName"
+                                htmlFor="relationCoModelColumnName"
                                 className="form-field-label"
                               >
-                                Relation Join Column Name
+                                Relation Co-Model Column Name
                               </label>
                               <InputText
                                 type="text"
-                                id="relationJoinColumnName"
-                                name="relationJoinColumnName"
+                                id="relationCoModelColumnName"
+                                name="relationCoModelColumnName"
                                 onChange={formik.handleChange}
-                                value={formik.values.relationJoinColumnName}
+                                value={formik.values.relationCoModelColumnName}
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(
                                     formik,
-                                    "relationJoinColumnName"
+                                    "relationCoModelColumnName"
                                   ),
                                 })}
                               />
-                              {isFormFieldValid(formik, "relationJoinColumnName") && (
+                              {isFormFieldValid(formik, "relationCoModelColumnName") && (
                                 <Message
                                   severity="error"
-                                  text={formik?.errors?.relationJoinColumnName?.toString()}
+                                  text={formik?.errors?.relationCoModelColumnName?.toString()}
                                 />
                               )}
 
@@ -2707,6 +2691,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                   name="unique"
                                   onChange={(e) => {
                                     formik.setFieldValue("unique", e.checked);
+                                    formik.setFieldValue("isUserKey", false);
                                   }}
                                   checked={formik.values.unique}
                                 ></Checkbox>
@@ -2818,7 +2803,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                             </div>
                           </div>
                         )} */}
-                        {currentFields.includes("isUserKey") && (
+                        {currentFields.includes("isUserKey") && formik.values.unique && (
                          <div className="field col-6 flex-flex-column gap-2 mt-3">
                          <div className="flex align-items-center gap-2">
                                 <Checkbox