common wb hrms working fine

egovernments · Mar 15, 2024 · e8cde53 · e8cde53
1 parent 011f89b
commit e8cde53
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/micro-ui/web/packages/common/src/CommonWrapper.js b/micro-ui/web/packages/common/src/CommonWrapper.js
@@ -6,7 +6,7 @@ const App = ({ queryClient, title,userType }) => {
   return (
     <QueryClientProvider client={queryClient}>
       <Router>
-        <PaymentModule path={`/${window.contextPath}/${userType}/common`} stateCode={"pg"} cityCode={"citya"} moduleCode={"Payment"} userType={userType}  />
+        <PaymentModule path={`/${window.contextPath}/${userType}/payment`} stateCode={"pg"} cityCode={"citya"} moduleCode={"Payment"} userType={userType}  />
       </Router>
        {/* <div>Common module running thru host {title}</div> */}
     </QueryClientProvider>

diff --git a/micro-ui/web/packages/core/src/modules/registerRemotes.js b/micro-ui/web/packages/core/src/modules/registerRemotes.js
@@ -43,16 +43,16 @@ export default (queryClient) => {
   //   },
   //  });
 
-   registerApplication({
-    name: "Dss",
-    app: () => import("dss/DSSModule"),
-    activeWhen: `/${window.contextPath ? window.contextPath : "core-digit-ui"}/employee/dss`,
-    customProps: {
-      title: "DSS is running on host",
-      queryClient,
-      userType
-    },
-  });
+  //  registerApplication({
+  //   name: "Dss",
+  //   app: () => import("dss/DSSModule"),
+  //   activeWhen: `/${window.contextPath ? window.contextPath : "core-digit-ui"}/employee/dss`,
+  //   customProps: {
+  //     title: "DSS is running on host",
+  //     queryClient,
+  //     userType
+  //   },
+  // });
 
     registerApplication({
     name: "HRMS",

diff --git a/micro-ui/web/packages/core/webpack.dev.js b/micro-ui/web/packages/core/webpack.dev.js
@@ -46,9 +46,9 @@ module.exports = () => {
           hrms: "hrms@https://localhost:8085/remoteEntry.js",
           workbench: "workbench@https://localhost:8086/remoteEntry.js",
           common:"common@https://localhost:8090/remoteEntry.js",
-          pgr:"pgr@https://localhost:8087/remoteEntry.js",
+          // pgr:"pgr@https://localhost:8087/remoteEntry.js",
           // app1: "app1@https://localhost:8001/remoteEntry.js",
-          dss: "dss@https://localhost:8088/remoteEntry.js",
+          // dss: "dss@https://localhost:8088/remoteEntry.js",
           // measurement : "measurement@https://localhost:8088/remoteEntry.js"
         },
         shared: packageJson.dependencies,

diff --git a/micro-ui/web/packages/hrms/src/components/pageComponents/jurisdiction.js b/micro-ui/web/packages/hrms/src/components/pageComponents/jurisdiction.js
@@ -303,7 +303,7 @@ function Jurisdiction({
             <div className="tag-container">
               {jurisdiction?.roles.length > 0 &&
                 jurisdiction?.roles.map((value, index) => {
-                  return <RemoveableTag key={index} text={`${t(value["labelKey"]).slice(0, 22)} ...`} onClick={() => onRemove(index, value)} />;
+                  return <RemoveableTag key={index} text={`${t(value["labelKey"])?.slice(0, 22)} ...`} onClick={() => onRemove(index, value)} />;
                 })}
             </div>
           </div>

diff --git a/micro-ui/web/packages/ui-components/package.json b/micro-ui/web/packages/ui-components/package.json
@@ -66,7 +66,8 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-query": "3.6.1",
-    "react-router-dom": "5.3.0"
+    "react-router-dom": "5.3.0",
+    "react-joyride": "2.5.5"
   },
   "browserslist": {
     "production": [