@solidstarters/solid-core-ui 1.1.8 → 1.1.9

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/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

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';

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