@asaleh37/ui-base 25.9.3-1 → 25.9.5-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.9.3-1",
+  "version": "25.9.5-1",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/administration/admin/PersonGrid.tsx

@@ -23,7 +23,7 @@ const PersonGrid: React.FC = () => {
   );
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
-    findAll: "api/v1/public/person/all",
+    commonStoreKey: "persons",
     deleteById: "api/v1/admin/person",
     save: "api/v1/admin/person",
     findById: "api/v1/admin/person",
@@ -276,10 +276,10 @@ const PersonGrid: React.FC = () => {
         data={data}
         setData={setData}
         editMode={{
-          editMode: "modal",
+          editMode: "modal",          
           specs: {
             modalIcon: "user",
-            modalTitle: "Person Profile",
+            modalTitle: "Person Profile",             
             modalWidth: 300,
           },
         }}
@@ -320,7 +320,7 @@ const PersonGrid: React.FC = () => {
         ]}
         girdIcon="users"
         editAction={{
-          isEnabled: true,
+          isEnabled: true,          
           authority: "PERSON_EDIT",
           preActionValidation: (data) => {
             if (

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormElementField.tsx

@@ -30,7 +30,7 @@ const FormElementField: React.FC<FormElementFieldProps> = (
         return element?.fieldInfo?.fieldLabel;
       }
     };
-    return !element.hiddenFields.includes(fieldName) ? (
+    return (
       <Grid2
         size={
           props?.formProps?.fieldSize || {
@@ -49,16 +49,8 @@ const FormElementField: React.FC<FormElementFieldProps> = (
             {...props.muiTextFieldProps}
             fullWidth
             type={fieldType}
-            disabled={
-              props?.disabled || element.disabledFields.includes(fieldName)
-                ? true
-                : false
-            }
-            // hidden={
-            //   props?.hidden || element.hiddenFields.includes(fieldName)
-            //     ? true
-            //     : false
-            // }
+            disabled={element.disabledFields.includes(fieldName)}
+            hidden={element.hiddenFields.includes(fieldName)}
             label={getFieldLabel()}
             value={formValues[fieldName]}
             onChange={(event) => {
@@ -99,16 +91,8 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           <Datefield
             format={props?.dateFormat || DATE_FORMAT}
             sx={props?.formProps?.style || { width: "100%" }}
-            disabled={
-              props?.disabled || element.disabledFields.includes(fieldName)
-                ? true
-                : false
-            }
-            // hidden={
-            //   props?.hidden || element.hiddenFields.includes(fieldName)
-            //     ? true
-            //     : false
-            // }
+            disabled={element.disabledFields.includes(fieldName)}
+            hidden={element.hiddenFields.includes(fieldName)}
             label={getFieldLabel()}
             onChangeCallBack={(v: any) => {
               formManager.setValue(fieldName, v);
@@ -132,11 +116,8 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           <DatetimeField
             format={props?.dateFormat || DATE_TIME_FORMAT}
             sx={props?.formProps?.style || { width: "100%" }}
-            disabled={
-              props?.disabled || element.disabledFields.includes(fieldName)
-                ? true
-                : false
-            }
+            disabled={element.disabledFields.includes(fieldName)}
+            hidden={element.hiddenFields.includes(fieldName)}
             label={getFieldLabel()}
             onChangeCallBack={(v: any) => {
               formManager.setValue(fieldName, v);
@@ -150,11 +131,6 @@ const FormElementField: React.FC<FormElementFieldProps> = (
                 );
               }
             }}
-            // hidden={
-            //   props?.hidden || element.hiddenFields.includes(fieldName)
-            //     ? true
-            //     : false
-            // }
             value={formValues[fieldName]}
             error={formManager.formState.errors[fieldName] != undefined}
             errorMessage={formManager?.formState?.errors[
@@ -176,35 +152,19 @@ const FormElementField: React.FC<FormElementFieldProps> = (
                 );
               }
             }}
-            // hidden={
-            //   props?.hidden || element.hiddenFields.includes(fieldName)
-            //     ? true
-            //     : false
-            // }
             value={formValues[fieldName]}
             checkedValue={props?.checkedValue || true}
             unCheckedValue={props?.unCheckedValue || false}
-            disabled={
-              props?.disabled || element.disabledFields.includes(fieldName)
-                ? true
-                : false
-            }
+            disabled={element.disabledFields.includes(fieldName)}
+            hidden={element.hiddenFields.includes(fieldName)}
             sx={props?.formProps?.style}
           />
         ) : props?.fieldType === "combobox" ? (
           <ComboBox
             sx={props?.formProps?.style || { width: "100%" }}
             label={getFieldLabel()}
-            disabled={
-              props?.disabled || element.disabledFields.includes(fieldName)
-                ? true
-                : false
-            }
-            // hidden={
-            //   props?.hidden || element.hiddenFields.includes(fieldName)
-            //     ? true
-            //     : false
-            // }
+            disabled={element.disabledFields.includes(fieldName)}
+            hidden={element.hiddenFields.includes(fieldName)}
             onChangeCallBack={(v: any, selectedRecord: any) => {
               let newValue = null;
               if (v) {
@@ -234,16 +194,8 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           <SystemLookupCombobox
             sx={props?.formProps?.style || { width: "100%" }}
             label={getFieldLabel()}
-            disabled={
-              props?.disabled || element.disabledFields.includes(fieldName)
-                ? true
-                : false
-            }
-            // hidden={
-            //   props?.hidden || element.hiddenFields.includes(fieldName)
-            //     ? true
-            //     : false
-            // }
+            disabled={element.disabledFields.includes(fieldName)}
+            hidden={element.hiddenFields.includes(fieldName)}
             onChangeCallBack={(v: any, selectedRecord: any) => {
               let newValue = null;
               if (v) {
@@ -269,8 +221,6 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           />
         ) : null}
       </Grid2>
-    ) : (
-      <></>
     );
   } else {
     return <></>;

package/src/components/templates/DataEntryTemplates/TemplateDataForm/TemplateForm.tsx

@@ -47,11 +47,18 @@ const TemplateForm: React.FC<TemplateFormProps> = (
   const { t } = useTranslation();
   const fields = getAllFields(props.elements);
   const initiallyHiddenFields = [];
+  const initiallyDisabledFields = [];
   for (const field of fields) {
     if (field?.hidden) {
       initiallyHiddenFields.push(field.fieldName);
     }
+    if (field?.disabled) {
+      initiallyDisabledFields.push(field.fieldName);
+    }
   }
+  const [disabledFields, setDisabledFields] = useState<string[]>(
+    initiallyDisabledFields
+  );
   const [hiddenFields, setHiddenFields] = useState<string[]>(
     initiallyHiddenFields
   );
@@ -65,7 +72,7 @@ const TemplateForm: React.FC<TemplateFormProps> = (
       initialValues[element.props.fieldName] = element.props.defaultValue;
     }
   }
-  const [disabledFields, setDisabledFields] = useState<string[]>([]);
+
   let formSchema = null;
   if (props?.validationSchema) {
     formSchema = props.validationSchema;

package/src/redux/features/administration/AdministrationStoresMetaData.ts

@@ -145,4 +145,9 @@ export const ADMINISTRATION_STORES: CommonStores = {
     authority: "SYSTEM_ADMIN",
     url: "api/v1/admin/systemapplicationrole/all",
   },
+  persons: {
+    autoLoad: true,
+    data: [],
+    url: "api/v1/public/person/all",
+  },
 };