@solidstarters/solid-core-ui 1.1.7 → 1.1.9

package/src/components/core/extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction.tsx

@@ -1,22 +1,34 @@
 'use client';
 import { useGenerateCodeForModelMutation } from "@/redux/api/modelApi";
+import { useSeederMutation } from "@/redux/api/testApi";
 import { Button } from "primereact/button";
+import { useEffect } from "react";
 
 
-export const GenerateModelCodeRowAction = ({ context }: any) => {
-
+const GenerateModelCodeRowAction = ({ context }: any) => {
     const [
         generateCode,
         { isLoading: isGenerateCodeUpdating, isSuccess: isGenerateCodeSuceess, isError: isGenerateCodeError, error: generateCodeError, data: generateCodeData },
     ] = useGenerateCodeForModelMutation();
 
+    const [triggerSeeder, {data}] = useSeederMutation();
+
 
     const generateCodeHandler = async () => {
-        const response = await generateCode({ id: context.rowData.id })
-        context.closeCustomRowActionPopup();
+        const response = await generateCode({ id: context?.rowData?.id });
+        context.closeListViewRowActionPopup();
         console.log("response", response);
     }
 
+    useEffect(() => {
+        const seeder = async () => {
+            if(isGenerateCodeSuceess) {
+                await triggerSeeder("ModuleMetadataSeederService");
+            }
+        }
+        seeder();
+    }, [isGenerateCodeSuceess])
+
     return (
         <div>
             <p className="">Click Ok to proceed with model code generation, please note that if the file already exists and <br></br>you have made custom changes to this file we will create a .bkp file as a backup of the existing file.</p>
@@ -29,10 +41,10 @@ export const GenerateModelCodeRowAction = ({ context }: any) => {
             </ul>
             <div className="flex gap-5 justify-content-center">
                 <Button label="Ok" icon="pi pi-check" className='small-button' severity="danger" autoFocus onClick={generateCodeHandler} />
-                <Button label="Cancel" icon="pi pi-times" className='small-button' onClick={() => context.closeCustomRowActionPopup()} />
+                <Button label="Cancel" icon="pi pi-times" className='small-button' onClick={() => context.closeListViewRowActionPopup()} />
             </div>
         </div >
     )
 }
 
-
+export default GenerateModelCodeRowAction;

package/src/components/core/extension/solid-core/moduleMetadata/list/GenerateModuleCodeRowAction.tsx

@@ -3,15 +3,15 @@ import { useGenerateCodeFormoduleMutation } from "@/redux/api/moduleApi";
 import { Button } from "primereact/button";
 
 
-export const GenerateModuleCodeRowAction = ({ context, closeCustomRowActionPopup }: any) => {
+const GenerateModuleCodeRowAction = ({ context }: any) => {
     const [
         generateCode,
         { isLoading: isGenerateCodeUpdating, isSuccess: isGenerateCodeSuceess, isError: isGenerateCodeError, error: generateCodeError, data: generateCodeData },
     ] = useGenerateCodeFormoduleMutation();
 
     const generateCodeHandler = async () => {
-        const response = await generateCode({ id: context.rowData.id })
-        closeCustomRowActionPopup()
+        const response = await generateCode({ id: context?.rowData?.id })
+        context.closeListViewRowActionPopup();
 
     }
 
@@ -20,9 +20,10 @@ export const GenerateModuleCodeRowAction = ({ context, closeCustomRowActionPopup
             <p className="text-center">Click Ok to proceed with module code generation, please note that if the file already exists and <br></br>you have made custom changes to this file we will create a .bkp file as a backup of the existing file.</p>
             <div className="flex gap-5 justify-content-center">
                 <Button label="Ok" icon="pi pi-check" className='small-button' severity="danger" autoFocus onClick={generateCodeHandler} />
-                <Button label="Cancel" icon="pi pi-times" className='small-button' onClick={closeCustomRowActionPopup} />
+                <Button label="Cancel" icon="pi pi-times" className='small-button' onClick={() => context.closeListViewRowActionPopup()} />
             </div>
         </div >
     )
 }
 
+export default GenerateModuleCodeRowAction;

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

@@ -6,8 +6,8 @@ import { InputTypes, SolidVarInputsFilterElement } from '../SolidVarInputsFilter
 const SolidIntField = ({ fieldMetadata, onChange, index, rule }: SolidFilterFieldsParams) => {
     // const filterable = column.attrs.filterable;
     const filterMatchModeOptions = [
-        { label: 'Equals', value: "$eqi" },
-        { label: 'Not Equals', value: "$nei" },
+        { label: 'Equals', value: "$eq" },
+        { label: 'Not Equals', value: "$ne" },
         { label: 'Less Than', value: "$lt" },
         { label: 'Less Than Or Equal', value: "$lte" },
         { label: 'Greater Than', value: "$gt" },

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

@@ -30,6 +30,7 @@ import { SolidLayoutViews } from '../common/SolidLayoutViews'
 import { SolidConfigureLayoutElement } from '../common/SolidConfigureLayoutElement'
 import { FilterIcon } from '../../modelsComponents/filterIcon';
 import { OverlayPanel } from "primereact/overlaypanel";
+import { Toast } from "primereact/toast";
 const getRandomInt = (min: number, max: number) => {
   return Math.floor(Math.random() * (max - min + 1)) + min;
 }
@@ -94,7 +95,10 @@ export const SolidListView = (params: SolidListViewParams) => {
     useLazyGetSolidEntitiesQuery,
     useLazyGetSolidEntityByIdQuery,
     usePrefetch,
-    useUpdateSolidEntityMutation
+    useUpdateSolidEntityMutation,
+    useRecoverSolidEntityByIdQuery,
+    useLazyRecoverSolidEntityByIdQuery,
+    useRecoverSolidEntityMutation
   } = entityApi;
 
   // Get the list view layout & metadata first. 
@@ -110,7 +114,6 @@ export const SolidListView = (params: SolidListViewParams) => {
     refetch
   } = useGetSolidViewLayoutQuery(listViewMetaDataQs);
 
-
   const initialFilterMethod = () => {
 
     const solidView = solidListViewMetaData.data.solidView;
@@ -179,24 +182,30 @@ export const SolidListView = (params: SolidListViewParams) => {
   const [sortField, setSortField] = useState("");
   const [sortOrder, setSortOrder] = useState(0);
   const [selectedRecords, setSelectedRecords] = useState<any[]>([]);
+  const [selectedRecoverRecords, setSelectedRecoverRecords] = useState<any[]>([]);
   const [loading, setLoading] = useState<boolean>(true);
   const [isDialogVisible, setDialogVisible] = useState(false);
+  const [isRecoverDialogVisible, setRecoverDialogVisible] = useState(false);
   const [createButtonUrl, setCreateButtonUrl] = useState<string>();
   const [editButtonUrl, setEditButtonUrl] = useState<string>();
+  const [showArchived, setShowArchived] = useState(false);
 
   // Custom Row Action
   const [listViewRowActionPopupState, setListViewRowActionPopupState] = useState(false);
   const [listViewRowActionData, setListRowActionData] = useState<any>();
 
+  const toast = useRef<Toast>(null);
+
   // Get the list view data.
   const [triggerGetSolidEntities, { data: solidEntityListViewData, isLoading, error }] = useLazyGetSolidEntitiesQuery();
 
+  const [triggerRecoverSolidEntitiesById, { data: recoverByIdData, isLoading: recoverByIdIsLoading, error: recoverByIdError, isError: recoverByIdIsError, isSuccess: recoverByIdIsSuccess }] = useLazyRecoverSolidEntityByIdQuery();
 
+  const [triggerRecoverSolidEntities, { data: recoverByData, isLoading: recoverByIsLoading, error: recoverError, isError: recoverIsError, isSuccess: recoverByIsSuccess }] = useRecoverSolidEntityMutation();
 
   // After data is fetched populate the list view state so as to be able to render the data. 
   useEffect(() => {
     if (solidEntityListViewData) {
-
       setListViewData(solidEntityListViewData?.records);
       setTotalRecords(solidEntityListViewData?.meta.totalRecords);
       setLoading(false);
@@ -231,6 +240,27 @@ export const SolidListView = (params: SolidListViewParams) => {
     },
   ] = useDeleteMultipleSolidEntitiesMutation();
 
+  // Fetch Soft Deleted data
+  useEffect(() => {
+    const queryData = {
+      offset: 0,
+      limit: 25,
+      populate: toPopulate,
+      sort: [`id:desc`],
+    };
+    if (showArchived) {
+      queryData.showSoftDeleted = 'true';
+    }
+    const queryString = qs.stringify(queryData, {
+      encodeValuesOnly: true
+    });
+
+    triggerGetSolidEntities(queryString);
+    setSelectedRecords([]);
+    setSelectedRecoverRecords([]);
+  }, [showArchived, recoverByIdIsSuccess, recoverByIsSuccess]);
+
+
   // Fetch data after toPopulate has been populated...
   useEffect(() => {
     if (toPopulate) {
@@ -250,6 +280,8 @@ export const SolidListView = (params: SolidListViewParams) => {
 
       triggerGetSolidEntities(queryString);
       setSelectedRecords([]);
+      setSelectedRecoverRecords([]);
+      setShowArchived(false);
     }
   }, [isDeleteSolidEntitiesSucess, isDeleteSolidSingleEntitySuccess, toPopulate]);
 
@@ -279,7 +311,11 @@ export const SolidListView = (params: SolidListViewParams) => {
   // handle change in the records which are currently selected...
   const onSelectionChange = (event: any) => {
     const value = event.value;
-    setSelectedRecords(value);
+    const activeRecords = value.filter((record: any) => record.deletedAt === null);
+    const deletedRecords = value.filter((record: any) => record.deletedAt !== null);
+
+    setSelectedRecords(activeRecords);
+    setSelectedRecoverRecords(deletedRecords);
   };
 
   const identifySolidOperatorAndValue = (primeReactMatchMode: FilterMatchMode, value: any): { operator: string, value: string | string[] | any[] } => {
@@ -475,6 +511,51 @@ export const SolidListView = (params: SolidListViewParams) => {
     );
   };
 
+  // Recover functions
+  const recoverById = (id) => {
+    triggerRecoverSolidEntitiesById(id);
+  }
+
+  const recoverAll = () => {
+    let recoverList: any = [];
+    selectedRecoverRecords.forEach((element: any) => {
+      recoverList.push(element.id);
+    });
+    triggerRecoverSolidEntities(recoverList);
+    setRecoverDialogVisible(false);
+  }
+
+  useEffect(() => {
+    if (recoverIsError || recoverByIdIsError) {
+      showError(recoverByIdIsError ? recoverByIdError : recoverError);
+    }
+  }, [recoverIsError, recoverByIdIsError])
+
+  const showError = async (error) => {
+    const errorMessages = error?.data?.message;
+    if (errorMessages.length > 0) {
+      toast?.current?.show({
+        severity: "error",
+        summary: "Can you send me the report?",
+        // sticky: true,
+        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>
+        ),
+      });
+    }
+  };
+
   // handle bulk deletion
   const deleteBulk = () => {
     let deleteList: any = [];
@@ -490,6 +571,7 @@ export const SolidListView = (params: SolidListViewParams) => {
   const onDeleteClose = () => {
     setDialogVisible(false);
     setSelectedRecords([]);
+    setSelectedRecoverRecords([]);
   }
 
   // Render columns dynamically based on metadata
@@ -542,6 +624,7 @@ export const SolidListView = (params: SolidListViewParams) => {
   return (
     <>
       <div className="page-header">
+      <Toast ref={toast} />
         <div className="flex gap-3 align-items-center">
 
 
@@ -566,7 +649,7 @@ export const SolidListView = (params: SolidListViewParams) => {
           }
 
           {solidListViewMetaData?.data?.solidView?.layout?.attrs?.enableGlobalSearch === true && params.embeded === false &&
-            <SolidGlobalSearchElement ref={solidGlobalSearchElementRef} viewData={solidListViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}  ></SolidGlobalSearchElement>
+            <SolidGlobalSearchElement ref={solidGlobalSearchElementRef} viewData={solidListViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}  setShowArchived={setShowArchived} showArchived={showArchived}></SolidGlobalSearchElement>
           }
         </div>
         <div className="flex align-items-center gap-3">
@@ -580,6 +663,9 @@ export const SolidListView = (params: SolidListViewParams) => {
               onClick={() => params.handlePopUpOpen(true)}
             ></Button>
           }
+          {showArchived && <Button type="button" icon="pi pi-refresh" label="Recover" size='small' severity="warning"
+              onClick={() => setRecoverDialogVisible(true)}
+          ></Button>}
           <SolidLayoutViews
             sizeOptions={sizeOptions}
             setSize={setSize}
@@ -596,10 +682,13 @@ export const SolidListView = (params: SolidListViewParams) => {
           } */}
         </div>
       </div>
-      <style>{`.p-datatable .p-datatable-loading-overlay {background-color: rgba(0, 0, 0, 0.0);}`}</style>
+      <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>
       <div className="solid-datatable-wrapper">
         <DataTable
           value={listViewData}
+          rowClassName={(rowData) => {
+            return rowData.deletedAt ? "greyed-out-row" : "";
+          }}
           showGridlines={false}
           lazy
           scrollable
@@ -620,7 +709,7 @@ export const SolidListView = (params: SolidListViewParams) => {
           sortOrder={sortOrder === 1 || sortOrder === -1 ? sortOrder : 0}
           loading={loading || isLoading}
           loadingIcon="pi pi-spinner"
-          selection={selectedRecords}
+          selection={[...selectedRecords, ...selectedRecoverRecords]}
           onSelectionChange={onSelectionChange}
           selectionMode="multiple"
           removableSort
@@ -635,7 +724,14 @@ export const SolidListView = (params: SolidListViewParams) => {
 
           {renderColumnsDynamically(listViewMetaData)}
           {actionsAllowed.includes(`${updatePermission(params.modelName)}`) && solidListViewMetaData?.data?.solidView?.layout?.attrs?.edit !== false &&
-            <Column body={detailsBodyTemplate} ></Column>
+            <Column body={(rowData) => (
+              rowData.deletedAt ? (
+                <a onClick={() => recoverById(rowData.id)} className="retrieve-button">
+                  <i className="pi pi-refresh" style={{ fontSize: "1rem" }}/>
+                </a>
+              ) :
+                detailsBodyTemplate(rowData)
+            )}></Column>
           }
           {solidListViewMetaData?.data?.solidView?.layout?.attrs?.rowButtons &&
             solidListViewMetaData?.data?.solidView?.layout?.attrs?.rowButtons.map((rowAction: any) => {
@@ -678,6 +774,20 @@ export const SolidListView = (params: SolidListViewParams) => {
         <p>Are you sure you want to delete the selected records?</p>
       </Dialog>
 
+      <Dialog
+        visible={isRecoverDialogVisible}
+        header="Confirm Recover"
+        modal
+        footer={() => (
+          <div className="flex justify-content-center">
+            <Button label="Yes" icon="pi pi-check" className='small-button' severity="danger" autoFocus onClick={recoverAll} />
+            <Button label="No" icon="pi pi-times" className='small-button' onClick={() => setRecoverDialogVisible(false)} />
+          </div>
+        )}
+        onHide={() => setRecoverDialogVisible(false)}
+      >
+        <p>Are you sure you want to recover all records?</p>
+      </Dialog>
 
       {listViewRowActionData &&
         <Dialog

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

@@ -342,6 +342,7 @@ const CreateModel = ({ data, params }: any) => {
                   deleteModelFunction={deleteModelFunction}
                   nextTab={nextTab}
                   formikFieldsMetadataRef={formikFieldsMetadataRef}
+                  params={params}
                 ></FieldMetaData>
               </TabPanel>
             </TabView>

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

@@ -11,7 +11,7 @@ import { useRef, useState } from "react";
 import FieldMetaDataForm from "./FieldMetaDataForm";
 
 
-const FieldMetaData = ({ modelMetaData, fieldMetaData, setFieldMetaData, deleteModelFunction, nextTab, formikFieldsMetadataRef }: any) => {
+const FieldMetaData = ({ modelMetaData, fieldMetaData, setFieldMetaData, deleteModelFunction, nextTab, formikFieldsMetadataRef, params }: any) => {
   const pathname = usePathname();
   const msgs = useRef<Messages>(null);
 
@@ -29,6 +29,7 @@ const FieldMetaData = ({ modelMetaData, fieldMetaData, setFieldMetaData, deleteM
   });
   const toast = useRef<Toast>(null);
   const [visiblePopup, setVisiblePopup] = useState(false);
+  const [isRequiredPopUp, setIsRequiredPopUp] = useState(false);
   const [currentPopup, setCurrentPopup] = useState();
   const [selectedFieldMetaData, setSelectedFieldMetaData] = useState(null);
   const onRowSelect = (event: any) => {
@@ -130,9 +131,27 @@ const FieldMetaData = ({ modelMetaData, fieldMetaData, setFieldMetaData, deleteM
             }}
             showHeader={false}
           >
-            <FieldMetaDataForm modelMetaData={modelMetaData} fieldMetaData={selectedFieldMetaData} allFields={fieldMetaData} setFieldMetaData={setFieldMetaData} deleteModelFunction={deleteModelFunction} setVisiblePopup={setVisiblePopup} formikFieldsMetadataRef={formikFieldsMetadataRef} ></FieldMetaDataForm>
+            <FieldMetaDataForm modelMetaData={modelMetaData} fieldMetaData={selectedFieldMetaData} allFields={fieldMetaData} setFieldMetaData={setFieldMetaData} deleteModelFunction={deleteModelFunction} setVisiblePopup={setVisiblePopup} formikFieldsMetadataRef={formikFieldsMetadataRef} params={params} setIsRequiredPopUp={setIsRequiredPopUp}></FieldMetaDataForm>
+          </Dialog>
+          <Dialog
+            visible={isRequiredPopUp}
+            header={(
+              <div className="flex align-items-center">
+                <i className="pi pi-exclamation-triangle text-yellow-500 text-xl mr-2"></i>
+                <span>Warning</span>
+              </div>
+            )}
+            headerClassName="text-center"
+            modal
+            footer={() => (
+              <div className="flex justify-content-center">
+                <Button label="Ok" className='small-button' onClick={() => setIsRequiredPopUp(false)} />
+              </div>
+            )}
+            onHide={() => setIsRequiredPopUp(false)}
+          >
+            <p>If there is data against this model this operation might not work and manual intervention will be required</p>
           </Dialog>
-
         </div >
       }
     </>

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

@@ -323,12 +323,12 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
                   "Max must be greater than Min",
                   function (value) {
                     const { min } = this.parent; // Access sibling field 'min'
-                    if (min != null && value == null) {
-                      // Trigger error if Min is filled but Max is empty
-                      return this.createError({
-                        message: "Max is required if Min is specified",
-                      });
-                    }
+                    // if (min != null && value == null) {
+                    //   // Trigger error if Min is filled but Max is empty
+                    //   return this.createError({
+                    //     message: "Max is required if Min is specified",
+                    //   });
+                    // }
                     return value == null || value > min; // Validate only if Max exists
                   }
                 );
@@ -345,12 +345,12 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
                   "Max must be greater than Min",
                   function (value) {
                     const { min } = this.parent; // Access sibling field 'min'
-                    if (min != null && value == null) {
-                      // Trigger error if Min is filled but Max is empty
-                      return this.createError({
-                        message: "Max is required if Min is specified",
-                      });
-                    }
+                    // if (min != null && value == null) {
+                    //   // Trigger error if Min is filled but Max is empty
+                    //   return this.createError({
+                    //     message: "Max is required if Min is specified",
+                    //   });
+                    // }
                     return value == null || value > min; // Validate only if Max exists
                   }
                 );
@@ -506,7 +506,7 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
   return Yup.object(schema);
 };
 
-const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, allFields, deleteModelFunction, setVisiblePopup }: any) => {
+const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, allFields, deleteModelFunction, setVisiblePopup, params, setIsRequiredPopUp }: any) => {
 
   const booleanOptions = ["false", "true"];
   const [isBackPopupVisible, setIsBackPopupVisible] = useState(false);
@@ -923,6 +923,9 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
             return updatedItems
           }
           else {
+            if (params?.id !== 'new' && formtatedFieldPayload?.required && !formtatedFieldPayload?.defaultValue) {
+              setIsRequiredPopUp(true);
+            }
             return [...prevItems, formtatedFieldPayload]
           }
         });
@@ -1114,7 +1117,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
               <div className="p-d-flex p-jc-center creat-field-for form-dem">
                 <div className="p-fluid" style={{ position: 'relative' }}>
                   <div className="mb-3">
-                    <div className="form-wrapper-title">Add a new {capitalize(selectedType.value)} Field</div>
+                    <div className="form-wrapper-title">{fieldMetaData ? `Edit ${capitalize(selectedType.value)} Field` : `Add a new ${capitalize(selectedType.value)} Field`}</div>
                   </div>
 
 
@@ -1416,7 +1419,7 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                 <Calendar
                                   id="defaultValue"
                                   name="defaultValue"
-                                  value={formik.values.defaultValue ? new Date(formik.values.defaultValue) : new Date()}
+                                  value={formik.values.defaultValue ? new Date(formik.values.defaultValue) : null}
                                   onChange={(e) => formik.setFieldValue("defaultValue", e.value)} // Use setFieldValue for proper handling
                                   showTime={formik.values.type === "datetime"}  // Show time picker for datetime
                                   timeOnly={formik.values.type === "time"}      // Time-only for time
@@ -2622,9 +2625,10 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                               )}
                             </div>
                         )}
-                        {currentFields.includes("isSystem") && (
-                            <div className="field col-6 flex-flex-column gap-2 mt-3">
-                              <div className="flex align-items-center gap-2">
+                        {/* {currentFields.includes("isSystem") && (
+                          <div className="md:col-6 sm:col-12">
+                            <div className="field">
+                              <div className="flex align-items-center">
                                 <Checkbox
                                   name="isSystem"
                                   onChange={(e) => {
@@ -2643,7 +2647,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                                 />
                               )}
                             </div>
-                        )}
+                          </div>
+                        )} */}
                         {currentFields.includes("isUserKey") && (
                          <div className="field col-6 flex-flex-column gap-2 mt-3">
                          <div className="flex align-items-center gap-2">

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

@@ -4,6 +4,7 @@ import { getSingularAndPlural } from "@/helpers/helpers";
 import { useGetFieldDefaultMetaDataQuery } from "@/redux/api/fieldApi";
 import { useLazyGetmodulesQuery } from "@/redux/api/moduleApi";
 import { useFormik } from "formik";
+import { snakeCase } from "lodash";
 import { usePathname, useRouter } from "next/navigation";
 import { Checkbox } from "primereact/checkbox";
 import { Divider } from "primereact/divider";
@@ -107,6 +108,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     enableReinitialize: true,
     innerRef: formikModelMetadataRef,
     onSubmit: async (values) => {
+      const tableName = generateTableName(values.module.displayName, values.singularName);
       try {
         const modelData = {
           ...modelMetaData,
@@ -116,7 +118,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
           description: values.description,
           dataSource: values.dataSource,
           dataSourceType: values.dataSourceType,
-          tableName: showTableName === true ? values?.tableName : null,
+          tableName: showTableName === true ? values?.tableName : tableName,
           moduleId: values.moduleId,
           module: values.module,
           isSystem: values.isSystem ? values.isSystem === true : '',
@@ -124,7 +126,6 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
           enableAuditTracking: values.enableAuditTracking === true ? true : '',
           internationalisation: values.internationalisation === true ? true : '',
         };
-
         setModelMetaData(modelData);
         nextTab()
 
@@ -134,6 +135,12 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     },
   });
 
+  function generateTableName(moduleSlug: string, modelName: string): string {
+    const snakeCaseModelName = snakeCase(modelName);
+    const sankeCaseModuleName = snakeCase(moduleSlug);
+    return `${sankeCaseModuleName}_${snakeCaseModelName}`;
+  }
+
   const showError = async () => {
     const errors = await formik.validateForm(); // Trigger validation and get the updated errors
     const errorMessages = Object.values(errors);
@@ -588,7 +595,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                         }
                       }
 
-                    }} checked={showTableName}></Checkbox>
+                    }} checked={showTableName} disabled={params.id !== 'new'}></Checkbox>
                     <label htmlFor="ingredient1" className="form-field-label">
                       Set table name
                     </label>

package/src/components/layout/user-profile-menu.tsx

@@ -10,8 +10,11 @@ import { LayoutConfig } from "@/types";
 import { toggleTheme } from "@/redux/features/themeSlice";
 import { InputSwitch } from "primereact/inputswitch";
 import { Button } from "primereact/button";
+import { useRouter } from "next/navigation";
 
 const UserProfileMenu = () => {
+  const router = useRouter();
+
   // const { user } = useAppSelector((state) => state.auth);
   const { changeTheme } = useContext(PrimeReactContext);
   const { layoutConfig, setLayoutConfig } = useContext(LayoutContext);
@@ -76,7 +79,9 @@ const UserProfileMenu = () => {
             </div>
             <InputSwitch checked={checked} onChange={handleThemeToggle} />
           </div>
-
+          <div className="p-2">
+            <Button icon="pi pi-cog" label="General Settings" size="small" text severity="secondary" className="w-full text-left gap-2" onClick={()=>router.push("/admin/settings") }/>
+          </div>
           <div className="user-profile-body p-3">
             <Button
               text

package/src/index.ts

@@ -432,6 +432,7 @@ export { mediaStorageProviderApi, useCreateMediaStorageProivderMutation, useDele
 // export * from '@/redux/api/modelApi';
 export { modelsApi, useCreatemodelMutation, useDeleteMultipleModelsMutation, useDeletemodelMutation, useGenerateCodeForModelMutation, useGetModelsQuery, useGetmodelByIdQuery, useLazyGetModelsQuery, useLazyGetmodelByIdQuery, useUpdatemodelMutation } from '@/redux/api/modelApi';
 export { modulesApi, useCreatemoduleMutation, useDeleteMultiplemodulesMutation, useDeletemoduleMutation, useGenerateCodeFormoduleMutation, useGetDefaultDataSourceQuery, useGetmoduleByIdQuery, useGetmodulesQuery, useLazyGetDefaultDataSourceQuery, useLazyGetmoduleByIdQuery, useLazyGetmodulesQuery, useRefreshPermissionsMutation, useUpdatemoduleMutation } from '@/redux/api/moduleApi';
+export { testApi, useSeederMutation } from '@/redux/api/testApi';
 // export * from '@/redux/api/orderAttributeApi';
 // export * from '@/redux/api/permissionApi';
 // export * from '@/redux/api/pincodeApi';
@@ -592,6 +593,7 @@ export { default as popupReducer } from '@/redux/features/popupSlice';
 export { default as themeReducer } from '@/redux/features/themeSlice';
 export { default as userReducer } from '@/redux/features/userSlice';
 
+export {default as GenerateModelCodeRowAction } from '@/components/core/extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction'
 
 // types
 export type { LayoutConfig } from '@/types';

package/src/redux/api/solidEntityApi.tsx

@@ -69,6 +69,17 @@ export const createSolidEntityApi = (entityName: string) => {
                     method: 'DELETE',
                 }),
             }),
+            recoverSolidEntityById: builder.query({
+                query: (id) => `/${kebabEntityName}/recover/${id}`,
+            }),
+            recoverSolidEntity: builder.mutation({
+                query: (data) => ({
+                    url: `/${kebabEntityName}/bulk-recover/`,
+                    method: 'POST',
+                    body: data
+                })
+
+            }),
         }),
     });
 };

package/src/redux/api/solidSettingsApi.tsx

@@ -19,7 +19,7 @@ export const solidSettingsApi = createApi({
         }),
         getAuthSettings: builder.query({
             query: () => {
-                return `/setting/getSettings`
+                return `/setting/wrapped`
             },
         }),
         getSolidSettingsById: builder.query({

package/src/redux/api/testApi.ts

@@ -0,0 +1,21 @@
+import { createApi } from '@reduxjs/toolkit/query/react';
+import { baseQueryWithAuth } from './fetchBaseQuery';
+
+export const testApi = createApi({
+    reducerPath: 'testApi',
+    baseQuery: baseQueryWithAuth,
+    endpoints: (builder) => ({
+        seeder: builder.mutation({
+            query: (name) => ({
+                url: '/test/seed',
+                method: 'POST',
+                body: {
+                    "seeder": name
+                }
+            }),
+        }),
+    })
+
+});
+
+export const {useSeederMutation} = testApi