Merge pull request #192 from egovernments/mf-hrms-build

DPG-2222 Implementing microfrontend Single Spa React for HRMS module
egovernments · Mar 6, 2024 · 6d2fb31 · 6d2fb31
2 parents 899ce30 + 36aa390
commit 6d2fb31
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 32 deletions.
diff --git a/micro-ui/web/lerna.json b/micro-ui/web/lerna.json
@@ -7,8 +7,12 @@
     "packages/workbench",
     "packages/pgr",
     "packages/ui-core",
+
+    "packages/hrms",
+
     "packages/app1",
     "packages/dss"
+
   ],
   "command": {
     "run": {

diff --git a/micro-ui/web/packages/core/src/modules/Hrms.js b/micro-ui/web/packages/core/src/modules/Hrms.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react";
-import { mount } from "hrms/HrmsModule";
+import { mount } from "hrms/HRMSModule";
 import { History } from "history";
 
 // interface AuthProps {

diff --git a/micro-ui/web/packages/core/src/modules/registerRemotes.js b/micro-ui/web/packages/core/src/modules/registerRemotes.js
@@ -16,6 +16,8 @@ export default (queryClient) => {
   //   },
   // });
 
+
+
   // registerApplication({
   //   name: "PGR",
   //   app: () => import("pgr/PGRModule"),
@@ -39,15 +41,15 @@ export default (queryClient) => {
   //   },
   // });
 
-  registerApplication({
-    name: "Dss",
-    app: () => import("dss/DSSModule"),
-    activeWhen: "/workbench-ui/employee/dss",
-    customProps: {
-      title: "DSS is running on host",
-      queryClient,
-    },
-  });
+//   registerApplication({
+//     name: "Dss",
+//     app: () => import("dss/DSSModule"),
+//     activeWhen: "/workbench-ui/employee/dss",
+//     customProps: {
+//       title: "DSS is running on host",
+//       queryClient,
+//     },
+//   });
 
   // registerApplication({
   //   name: "app1",
@@ -59,15 +61,16 @@ export default (queryClient) => {
   //   },
   // });
 
-  // registerApplication({
-  //   name: "HRMS",
-  //   app: () => import("hrms/HRMSModule"),
-  //   activeWhen: "/workbench-ui/employee/hrms",
-  //   customProps: {
-  //     title: "HRMS is running on host",
-  //     queryClient,
-  //   },
-  // }); 
+
+//   registerApplication({
+//     name: "HRMS",
+//     app: () => import("hrms/HRMSModule"),
+//     activeWhen: "/workbench-ui/employee/hrms",
+//     customProps: {
+//       title: "HRMS is running on host",
+//       queryClient,
+//     },
+//   }); 
 
   start();
 }

diff --git a/micro-ui/web/packages/core/webpack.dev.js b/micro-ui/web/packages/core/webpack.dev.js
@@ -45,12 +45,17 @@ module.exports = () => {
           // auth: "auth@http://localhost:8082/remoteEntry.js",
           // header: "header@http://localhost:8083/remoteEntry.js",
           // dashboard: "dashboard@http://localhost:8084/remoteEntry.js",
+
+//           hrms: "hrms_ui@https://localhost:8085/remoteEntry.js",
+
+
           // pgr: "pgr@https://localhost:8087/remoteEntry.js",
-          // hrms: "hrms@https://localhost:8085/remoteEntry.js",
+
 
           // workbench: "workbench@https://localhost:8086/remoteEntry.js",
           // common:"common@https://localhost:8090/remoteEntry.js"
 
+
           // app1: "app1@https://localhost:8001/remoteEntry.js",
           //dss: "dss_ui@https://localhost:8087/remoteEntry.js",
           // measurement : "measurement@https://localhost:8088/remoteEntry.js"

diff --git a/micro-ui/web/packages/core/webpack.prod.js b/micro-ui/web/packages/core/webpack.prod.js
@@ -19,12 +19,17 @@ module.exports = () => {
           // auth: `auth@${domain}/auth/remoteEntry.js`,
           // header: `header@${domain}/header/remoteEntry.js`,
           // dashboard: `dashboard@${domain}/dashboard/remoteEntry.js`,
+
+//           hrms: `hrms_ui@${domain}/hrms/remoteEntry.js`,
+
+
           // pgr : `pgr-ui@${domain}/pgr/remoteEntry.js`,
           // hrms: `hrms@${domain}/hrms/remoteEntry.js`,
            //dss : `dss_ui@${domain}/dss/remoteEntry.js`,
 
           // common: `common-ui@${domain}/common-ui/remoteEntry.js`,
           // workbench : `workbench_web@${domain}/workbench/remoteEntry.js`,
+
           // dss : `dss@${domain}/dss/remoteEntry.js`,
 
           // measurement : `measurement@${domain}/measurement/remoteEntry.js`

diff --git a/micro-ui/web/packages/hrms/src/HRMSWrapper.js b/micro-ui/web/packages/hrms/src/HRMSWrapper.js
@@ -5,7 +5,9 @@ import { initHRMSComponents } from './Module';
 import EmployeeApp from './pages';
 
 const App = ({ queryClient, title }) => {
+
     console.log("qc in remote hrms",queryClient);
+
 initHRMSComponents();
 
   return (

diff --git a/micro-ui/web/packages/hrms/src/components/InboxFilter.js b/micro-ui/web/packages/hrms/src/components/InboxFilter.js
@@ -38,7 +38,7 @@ const Filter = ({ searchParams, onFilterChange, onSearch, removeParam, ...props
     )[0];
   });
   const { isLoading, isError, errors, data: data, ...rest } = Digit.Hooks.hrms.useHrmsMDMS(
-    tenantId ? tenantId.code : searchParams?.tenantId,
+    tenantId ? tenantId?.code : searchParams?.tenantId,
     "egov-hrms",
     "HRMSRolesandDesignation"
   );
@@ -54,8 +54,8 @@ const Filter = ({ searchParams, onFilterChange, onSearch, removeParam, ...props
   });
 
   useEffect(() => {
-    if (tenantId.code) {
-      setSearchParams({ ..._searchParams, tenantId: tenantId.code });
+    if (tenantId?.code) {
+      setSearchParams({ ..._searchParams, tenantId: tenantId?.code });
     }
   }, [tenantId]);
 

diff --git a/micro-ui/web/packages/hrms/src/components/pageComponents/jurisdiction.js b/micro-ui/web/packages/hrms/src/components/pageComponents/jurisdiction.js
@@ -113,7 +113,7 @@ const Jurisdictions = ({ t, config, onSelect, userType, formData }) => {
   const [focusIndex, setFocusIndex] = useState(-1);
 
   function gethierarchylistdata() {
-    return data?.MdmsRes?.["egov-location"]["TenantBoundary"].map((ele) => ele.hierarchyType);
+    return data?.MdmsRes?.["egov-location"]["TenantBoundary"]?.map((ele) => ele.hierarchyType);
   }
 
   function getboundarydata() {
@@ -173,8 +173,7 @@ function Jurisdiction({
   const [Boundary, selectboundary] = useState([]);
   useEffect(() => {
     selectBoundaryType(
-      data?.MdmsRes?.["egov-location"]["TenantBoundary"]
-        .filter((ele) => {
+      data?.MdmsRes?.["egov-location"]["TenantBoundary"]?.filter((ele) => {
           return ele?.hierarchyType?.code == jurisdiction?.hierarchy?.code;
         })
         .map((item) => { return { ...item.boundary, i18text: Digit.Utils.locale.convertToLocale(item.boundary.label, 'EGOV_LOCATION_BOUNDARYTYPE') } })

diff --git a/micro-ui/web/packages/hrms/src/pages/Response.js b/micro-ui/web/packages/hrms/src/pages/Response.js
@@ -37,7 +37,7 @@ const Response = (props) => {
   const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_HAPPENED", false);
   const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_SUCCESS_DATA", false);
   const [errorInfo, setErrorInfo, clearError] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_ERROR_DATA", false);
-  const mutation = state.key === "UPDATE" ? Digit.Hooks.hrms.useHRMSUpdate(tenantId) : Digit.Hooks.hrms.useHRMSCreate(tenantId);
+  const mutation = state?.key === "UPDATE" ? Digit.Hooks.hrms.useHRMSUpdate(tenantId) : Digit.Hooks.hrms.useHRMSCreate(tenantId);
 
   const employeeCreateSession = Digit.Hooks.useSessionStorage("NEW_EMPLOYEE_CREATE", {});
   const [sessionFormData,setSessionFormData, clearSessionFormData] = employeeCreateSession;
@@ -63,7 +63,7 @@ const Response = (props) => {
       setMutationHappened(true);
     };
     if (!mutationHappened ) {
-      if (state.key === "UPDATE") {
+      if (state?.key === "UPDATE") {
         mutation.mutate(
           {
             Employees: state.Employees,
@@ -97,12 +97,12 @@ const Response = (props) => {
       <BannerPicker
         t={t}
         data={mutation?.data|| successData}
-        action={state.action}
+        action={state?.action}
         isSuccess={!successData ? mutation?.isSuccess : true}
         isLoading={(mutation.isIdle && !mutationHappened) || mutation?.isLoading}
         isEmployee={props.parentRoute.includes("employee")}
       />
-      <CardText>{t(DisplayText(state.action, mutation.isSuccess || !!successData, props.parentRoute.includes("employee"), t), t)}</CardText>
+      <CardText>{t(DisplayText(state?.action, mutation.isSuccess || !!successData, props.parentRoute.includes("employee"), t), t)}</CardText>
 
       <ActionBar>
         <Link to={`${props.parentRoute.includes("employee") ?  `/${window?.contextPath}/employee` :  `/${window?.contextPath}/citizen`}`}>

diff --git a/micro-ui/web/packages/hrms/webpack.dev.js b/micro-ui/web/packages/hrms/webpack.dev.js
@@ -38,7 +38,7 @@ module.exports = () => {
     },
     plugins: [
       new ModuleFederationPlugin({
-        name: "hrms",
+        name: "hrms_ui",
         filename: "remoteEntry.js",
         exposes: {
           "./HRMSModule": "./src/SingleSpaEntry",

diff --git a/micro-ui/web/packages/hrms/webpack.prod.js b/micro-ui/web/packages/hrms/webpack.prod.js
@@ -12,7 +12,7 @@ module.exports = () => {
     },
     plugins: [
       new ModuleFederationPlugin({
-        name: "hrms-ui",
+        name: "hrms_ui",
         filename: "remoteEntry.js",
         exposes: {
           "./HRMSModule": "./src/SingleSpaEntry",