@asaleh37/ui-base 1.2.16 → 1.2.18

package/package.json

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

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

@@ -3,39 +3,22 @@ import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/Te
 import { useApiActions, useAxios } from "../../../hooks";
 import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
 
-type OrganizationApplicationModuleGridProps = {
-  selectedOrganization: any;
-};
-
-const OrganizationApplicationModuleGrid: React.FC<
-  OrganizationApplicationModuleGridProps
-> = (props) => {
+const OrganizationApplicationModuleGrid: React.FC = () => {
   const { t } = useTranslation();
   const { handleGetRequest } = useAxios();
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
-    findAll: "api/v1/admin/organizationapplicationmodule/all",
-    deleteById: "api/v1/admin/organizationapplicationmodule",
-    save: "api/v1/admin/organizationapplicationmodule",
-    findById: "api/v1/admin/organizationapplicationmodule",
+    findAll: "api/v1/org/admin/organizationapplicationmodule/all",
+    deleteById: "api/org/v1/admin/organizationapplicationmodule",
+    save: "api/v1/org/admin/organizationapplicationmodule",
+    findById: "api/org/v1/admin/organizationapplicationmodule",
     setData: setData,
   });
-  const [systemApplicationModules, setSystemApplicationModules] = useState([]);
-
-  const getSystemApplicationModules = async () => {
-    await handleGetRequest({
-      endPointURI: "api/v1/admin/systemapplicationmodule/all",
-      showMask: true,
-      successCallBkFn: (response: any) => {
-        setSystemApplicationModules(response.data);
-      },
-    });
-  };
-
-  useEffect(() => {
-    getSystemApplicationModules();
-  }, []);
+  const SystemApplicationModules = useSelector(
+    (state: any) => state.commonStores.stores.SystemApplicationModules.data
+  );
 
   const formElements: Array<FormElementProps> = [
     {
@@ -47,7 +30,7 @@ const OrganizationApplicationModuleGrid: React.FC<
         fieldName: "systemApplicationModuleId",
         required: false,
         fieldType: "combobox",
-        options: systemApplicationModules,
+        options: SystemApplicationModules,
         optionDisplayField: "moduleName",
         optionValueField: "id",
       },
@@ -102,9 +85,6 @@ const OrganizationApplicationModuleGrid: React.FC<
     <TemplateGrid
       apiActions={apiActions}
       data={data}
-      gridLoadParametersValues={{
-        organizationId: props?.selectedOrganization?.id,
-      }}
       hideInfoBar={true}
       setData={setData}
       editMode={{ editMode: "row" }}
@@ -115,10 +95,6 @@ const OrganizationApplicationModuleGrid: React.FC<
       editAction={{
         isEnabled: true,
         authority: "ORGANIZATION_APPLICATION_MODULE_EDIT",
-        preActionValidation: async (data) => {
-          data.organizationId = props?.selectedOrganization?.id;
-          return true;
-        },
       }}
       deleteAction={{
         isEnabled: true,

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

@@ -12,37 +12,12 @@ const OrganizationGrid: React.FC = () => {
   const { t } = useTranslation();
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
-    findAll: "api/v1/admin/organization/all",
-    deleteById: "api/v1/admin/organization",
-    save: "api/v1/admin/organization",
-    findById: "api/v1/admin/organization",
+    commonStoreKey: "SystemOrganizations",
+    deleteById: "api/v1/org/admin/organization",
+    save: "api/v1/org/admin/organization",
+    findById: "api/v1/org/admin/organization",
     setData: setData,
   });
-  const {
-    Window: ApplicationModulesWindow,
-    setWindowState: setApplicationWindowState,
-  } = useWindow({
-    windowTitle: "Organization Subscriped Application Modules",
-    windowIcon: "layer-group",
-  });
-  const {
-    Window: OrgUnitTypesWindow,
-    setWindowState: setOrgUnitTypesWindowState,
-  } = useWindow({
-    windowTitle: "Organization Unit Types",
-    windowIcon: "tags",
-  });
-  const { Window: OrgUnitsWindow, setWindowState: setOrgUnitsWindowState } =
-    useWindow({
-      windowTitle: "Organization Units",
-      windowIcon: "folder-tree",
-    });
-  const { Window: OrgRanksWindow, setWindowState: setOrgRanksWindowState } =
-    useWindow({
-      windowTitle: "Organization Ranks",
-      windowIcon: "street-view",
-    });
-  const [selectedRecord, setSelectedRecord] = useState<any>(null);
   const formElements: Array<FormElementProps> = [
     {
       type: "field",
@@ -84,73 +59,15 @@ const OrganizationGrid: React.FC = () => {
         fieldType: "checkbox",
       },
     },
-    {
-      type:'field',
-      mode:'props',
-      props:{
-        fieldLabel:'Status',
-        fieldName:'status',
-        fieldType:'lookup',
-        lookupType:'STATUS'
-      }
-    }
   ];
 
   return (
     <>
-      <ApplicationModulesWindow>
-        <OrganizationApplicationModuleGrid
-          selectedOrganization={selectedRecord}
-        />
-      </ApplicationModulesWindow>
-      <OrgUnitTypesWindow>
-        <OrganizationUnitTypeGrid selectedOrganization={selectedRecord} />
-      </OrgUnitTypesWindow>
-      <OrgUnitsWindow>
-        <OrganizationUnitGrid selectedOrganization={selectedRecord} />
-      </OrgUnitsWindow>
-      <OrgRanksWindow>
-        <OrganizationRankGrid selectedOrganization={selectedRecord} />
-      </OrgRanksWindow>
       <TemplateGrid
         apiActions={apiActions}
         data={data}
         setData={setData}
         editMode={{ editMode: "row" }}
-        rowActions={[
-          {
-            icon: "layer-group",
-            actionFn: async (data) => {
-              setSelectedRecord(data);
-              setApplicationWindowState(true);
-            },
-            label: "modules",
-          },
-          {
-            icon: "tags",
-            actionFn: async (data) => {
-              setSelectedRecord(data);
-              setOrgUnitTypesWindowState(true);
-            },
-            label: "Organization Unit Types",
-          },
-          {
-            icon: "folder-tree",
-            actionFn: async (data) => {
-              setSelectedRecord(data);
-              setOrgUnitsWindowState(true);
-            },
-            label: "Organization Units",
-          },
-          {
-            icon: "street-view",
-            actionFn: async (data) => {
-              setSelectedRecord(data);
-              setOrgRanksWindowState(true);
-            },
-            label: "Organization Ranks",
-          },
-        ]}
         formElements={formElements}
         keyColumnName={"id"}
         gridTitle="ORGANIZATION_PLURAL"

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

@@ -1,24 +1,46 @@
 import { useState } from "react";
 import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import { useApiActions } from "../../../hooks";
+import { useApiActions, useAxios } from "../../../hooks";
 import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
+import { useDispatch, useSelector } from "react-redux";
+import { setStoreData } from "../../../redux/features/common/CommonStoreSlice";
 
-type OrganizationRankGridProps = {
-  selectedOrganization: any;
-};
-
-const OrganizationRankGrid: React.FC<OrganizationRankGridProps> = (props) => {
+const OrganizationRankGrid: React.FC = () => {
   const { t } = useTranslation();
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
-    findAll: "api/v1/admin/organizationrank/all",
+    findAll: "api/v1/public/organizationrank/all",
     deleteById: "api/v1/admin/organizationrank",
     save: "api/v1/admin/organizationrank",
     findById: "api/v1/admin/organizationrank",
     setData: setData,
   });
 
+  const { handleGetRequest } = useAxios();
+  const SystemOrganizationRanks = useSelector(
+    (state: any) => state.commonStores.stores.SystemOrganizationRanks
+  );
+  const dispatch = useDispatch();
+  const loadOrganizationRanks = async () => {
+    await handleGetRequest({
+      endPointURI: SystemOrganizationRanks.url,
+      showMask: false,
+      successCallBkFn: (response) => {
+        dispatch(
+          setStoreData({
+            storeKey: "SystemOrganizationRanks",
+            data: response.data,
+          })
+        );
+      },
+      failureCallBkFn: () => {
+        dispatch(
+          setStoreData({ storeKey: "SystemOrganizationRanks", data: [] })
+        );
+      },
+    });
+  };
   const formElements: Array<FormElementProps> = [
     {
       type: "field",
@@ -29,7 +51,7 @@ const OrganizationRankGrid: React.FC<OrganizationRankGridProps> = (props) => {
         fieldLabel: "ORGANIZATION_RANK_ORGANIZATION_ID",
         fieldName: "organizationId",
         required: false,
-        fieldType: "text",
+        fieldType: "number",
       },
     },
     {
@@ -39,7 +61,7 @@ const OrganizationRankGrid: React.FC<OrganizationRankGridProps> = (props) => {
         fieldLabel: "ORGANIZATION_RANK_RANK_ORDER",
         fieldName: "rankOrder",
         required: true,
-        fieldType: "text",
+        fieldType: "number",
       },
     },
     {
@@ -90,11 +112,8 @@ const OrganizationRankGrid: React.FC<OrganizationRankGridProps> = (props) => {
       apiActions={apiActions}
       data={data}
       hideInfoBar={true}
-      gridLoadParametersValues={{
-        organizationId: props?.selectedOrganization?.id,
-      }}
       setData={setData}
-      editMode={{ editMode: "row" }}
+      editMode={{ editMode: "row", reloadAfterSave: true }}
       formElements={formElements}
       keyColumnName={"id"}
       gridTitle="ORGANIZATION_RANK_PLURAL"
@@ -102,9 +121,8 @@ const OrganizationRankGrid: React.FC<OrganizationRankGridProps> = (props) => {
       editAction={{
         isEnabled: true,
         authority: "ORGANIZATION_RANK_EDIT",
-        preActionValidation: async (data) => {
-          data.organizationId = props?.selectedOrganization?.id;
-          return true;
+        postActionCallBack: () => {
+          loadOrganizationRanks();
         },
       }}
       deleteAction={{ isEnabled: true, authority: "ORGANIZATION_RANK_DELETE" }}

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

@@ -3,39 +3,47 @@ import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/Te
 import { useApiActions, useAxios } from "../../../hooks";
 import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
+import { useDispatch, useSelector } from "react-redux";
+import { setStoreData } from "../../../redux/features/common/CommonStoreSlice";
 
-type OrganizationUnitGridProps = {
-  selectedOrganization: any;
-};
-
-const OrganizationUnitGrid: React.FC<OrganizationUnitGridProps> = (props) => {
+const OrganizationUnitGrid: React.FC = () => {
   const { t } = useTranslation();
   const [data, setData] = useState([]);
-  const apiActions = useApiActions({
-    findAll: "api/v1/admin/organizationunit/all",
-    deleteById: "api/v1/admin/organizationunit",
-    save: "api/v1/admin/organizationunit",
-    findById: "api/v1/admin/organizationunit",
-    setData: setData,
-  });
-  const [organizationUnitTypes, setOrganizationUnitTypes] = useState([]);
   const { handleGetRequest } = useAxios();
-  const getOrganizationUnitTypes = async () => {
+  const SystemOrganizationUnits = useSelector(
+    (state: any) => state.commonStores.stores.SystemOrganizationUnits
+  );
+  const dispatch = useDispatch();
+  const loadOrganizationUnits = async () => {
     await handleGetRequest({
-      endPointURI: "api/v1/admin/organizationunittype/all",
-      showMask: true,
-      parameters: {
-        organizationId: props.selectedOrganization.id,
+      endPointURI: SystemOrganizationUnits.url,
+      showMask: false,
+      successCallBkFn: (response) => {
+        dispatch(
+          setStoreData({
+            storeKey: "SystemOrganizationUnits",
+            data: response.data,
+          })
+        );
       },
-      successCallBkFn: (response: any) => {
-        setOrganizationUnitTypes(response.data);
+      failureCallBkFn: () => {
+        dispatch(
+          setStoreData({ storeKey: "SystemOrganizationUnits", data: [] })
+        );
       },
     });
   };
+  const apiActions = useApiActions({
+    findAll: "api/v1/public/organizationunit/all",
+    deleteById: "api/v1/admin/organizationunit",
+    save: "api/v1/admin/organizationunit",
+    findById: "api/v1/admin/organizationunit",
+    setData: setData,
+  });
 
-  useEffect(() => {
-    getOrganizationUnitTypes();
-  }, []);
+  const organizationUnitTypes = useSelector(
+    (state: any) => state.commonStores.stores.SystemOrganizationUnitType.data
+  );
 
   const formElements: Array<FormElementProps> = [
     {
@@ -47,7 +55,7 @@ const OrganizationUnitGrid: React.FC<OrganizationUnitGridProps> = (props) => {
         fieldLabel: "ORGANIZATION_UNIT_ORGANIZATION_ID",
         fieldName: "organizationId",
         required: false,
-        fieldType: "text",
+        fieldType: "number",
       },
     },
 
@@ -114,9 +122,6 @@ const OrganizationUnitGrid: React.FC<OrganizationUnitGridProps> = (props) => {
       apiActions={apiActions}
       data={data}
       hideInfoBar={true}
-      gridLoadParametersValues={{
-        organizationId: props?.selectedOrganization?.id,
-      }}
       setData={setData}
       editMode={{ editMode: "row" }}
       formElements={formElements}
@@ -126,9 +131,8 @@ const OrganizationUnitGrid: React.FC<OrganizationUnitGridProps> = (props) => {
       editAction={{
         isEnabled: true,
         authority: "ORGANIZATION_UNIT_EDIT",
-        preActionValidation: async (data) => {
-          data.organizationId = props?.selectedOrganization?.id;
-          return true;
+        postActionCallBack: () => {
+          loadOrganizationUnits();
         },
       }}
       deleteAction={{ isEnabled: true, authority: "ORGANIZATION_UNIT_DELETE" }}

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

@@ -4,17 +4,11 @@ import { useApiActions } from "../../../hooks";
 import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
 
-type OrganizationUnitTypeGridProps = {
-  selectedOrganization: any;
-};
-
-const OrganizationUnitTypeGrid: React.FC<OrganizationUnitTypeGridProps> = (
-  props
-) => {
+const OrganizationUnitTypeGrid: React.FC = () => {
   const { t } = useTranslation();
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
-    findAll: "api/v1/admin/organizationunittype/all",
+    commonStoreKey: "SystemOrganizationUnitType",
     deleteById: "api/v1/admin/organizationunittype",
     save: "api/v1/admin/organizationunittype",
     findById: "api/v1/admin/organizationunittype",
@@ -93,11 +87,8 @@ const OrganizationUnitTypeGrid: React.FC<OrganizationUnitTypeGridProps> = (
       apiActions={apiActions}
       data={data}
       hideInfoBar={true}
-      gridLoadParametersValues={{
-        organizationId: props?.selectedOrganization?.id,
-      }}
       setData={setData}
-      editMode={{ editMode: "row" }}
+      editMode={{ editMode: "row", reloadAfterSave: true }}
       formElements={formElements}
       keyColumnName={"id"}
       gridTitle="ORGANIZATION_UNIT_TYPE_PLURAL"
@@ -105,10 +96,6 @@ const OrganizationUnitTypeGrid: React.FC<OrganizationUnitTypeGridProps> = (
       editAction={{
         isEnabled: true,
         authority: "ORGANIZATION_UNIT_TYPE_EDIT",
-        preActionValidation: async (data) => {
-          data.organizationId = props?.selectedOrganization?.id;		  
-          return true;
-        },
       }}
       deleteAction={{
         isEnabled: true,

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

@@ -5,13 +5,15 @@ import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTy
 import { useTranslation } from "react-i18next";
 import { toast } from "react-toastify";
 import OrganizationMemberGrid from "./OrganizationMemberGrid";
+import { Box } from "@mui/material";
+import AttachmentImageViewer from "../../templates/attachment/AttachmentImageViewer";
 
 const PersonGrid: React.FC = () => {
   const { t } = useTranslation();
   const [selectedPerson, setSelectedPerson] = useState<any>(null);
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
-    findAll: "api/v1/admin/person/all",
+    findAll: "api/v1/public/person/all",
     deleteById: "api/v1/admin/person",
     save: "api/v1/admin/person",
     findById: "api/v1/admin/person",
@@ -37,6 +39,39 @@ const PersonGrid: React.FC = () => {
         fieldType: "text",
       },
     },
+    {
+      type: "field",
+      mode: "props",
+      props: {
+        fieldLabel: "",
+        fieldName: "custom",
+        fieldType: "custom",
+        gridProps: {
+          muiProps: {
+            align: "center",
+            headerAlign: "center",
+            renderCell: (params) => {
+              return (
+                <Box
+                  sx={{
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    height: "100%",
+                  }}
+                >
+                  <AttachmentImageViewer
+                    showAsAvatar={true}
+                    attachmentCode="PERSON_IMG"
+                    refKey={params.id + ""}
+                  />
+                </Box>
+              );
+            },
+          },
+        },
+      },
+    },
     {
       type: "field",
       mode: "props",
@@ -128,6 +163,8 @@ const PersonGrid: React.FC = () => {
         <OrganizationMemberGrid selectedPerson={selectedPerson} />
       </OrganizationMembersWindow>
       <TemplateGrid
+        attachment={{ attachmentCode: "PERSON_IMG" }}
+        workFlowDocumentCode="DOC"
         apiActions={apiActions}
         data={data}
         setData={setData}

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

@@ -6,7 +6,6 @@ import { useAxios } from "../../../hooks";
 
 type RoleAuthoritiesFormProps = {
   roleId: number;
-  appId: number;
   closeModalFn: () => void;
 };
 
@@ -20,7 +19,6 @@ const RoleAuthoritiesForm: React.FC<RoleAuthoritiesFormProps> = (props) => {
       endPointURI: "api/v1/admin/systemApplicationRoleAuthorities",
       showMask: true,
       parameters: {
-        appId: props.appId,
         roleId: props.roleId,
       },
       successCallBkFn: (response: any) => {
@@ -31,10 +29,10 @@ const RoleAuthoritiesForm: React.FC<RoleAuthoritiesFormProps> = (props) => {
   };
 
   useEffect(() => {
-    if (props.roleId && props.appId) {
+    if (props.roleId) {
       getRoleAuthorities();
     }
-  }, [props.roleId, props.appId]);
+  }, [props.roleId]);
   const saveRoleAuthorities = async () => {
     await handlePostRequest({
       endPointURI: "api/v1/admin/systemApplicationRoleAuthorities",

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

@@ -4,13 +4,7 @@ import { useApiActions, useAxios } from "../../../hooks";
 import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
 
-type SystemApplicationAuthorityGridProps = {
-  selectedApplication: any;
-};
-
-const SystemApplicationAuthorityGrid: React.FC<
-  SystemApplicationAuthorityGridProps
-> = (props) => {
+const SystemApplicationAuthorityGrid: React.FC = () => {
   const { t } = useTranslation();
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
@@ -27,9 +21,6 @@ const SystemApplicationAuthorityGrid: React.FC<
     await handleGetRequest({
       endPointURI: "api/v1/admin/systemapplicationmodule/application/all",
       showMask: true,
-      parameters: {
-        applicationId: props.selectedApplication.id,
-      },
       successCallBkFn: (response: any) => {
         setSystemApplicationModules(response.data);
       },
@@ -65,7 +56,7 @@ const SystemApplicationAuthorityGrid: React.FC<
         optionDisplayField: "moduleName",
       },
     },
-    
+
     {
       type: "field",
       mode: "props",
@@ -114,9 +105,6 @@ const SystemApplicationAuthorityGrid: React.FC<
       apiActions={apiActions}
       data={data}
       hideInfoBar={true}
-      gridLoadParametersValues={{
-        applicationId: props?.selectedApplication?.id,
-      }}
       setData={setData}
       editMode={{ editMode: "row" }}
       formElements={formElements}
@@ -126,10 +114,6 @@ const SystemApplicationAuthorityGrid: React.FC<
       editAction={{
         isEnabled: true,
         authority: "SYSTEM_APPLICATION_AUTHORITY_EDIT",
-        preActionValidation: async (data) => {
-          data.systemApplicationId = props?.selectedApplication?.id;
-          return true;
-        },
       }}
       deleteAction={{
         isEnabled: true,