Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
nipunarora-eGov committed Apr 16, 2024
1 parent ab076ad commit 66c1101
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mfe-core-ui-docker.yml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: core ui service docker Image CI

on:
push:
branches: [ "mf-build-docker", "mf", "mf-stable","mf-stable-common-module","localization-fix-mfe" ]
branches: [ "mf-build-docker", "mf", "mf-stable","mf-stable-common-module","localization-fix-mfe","mf-localisation-test-core" ]
pull_request:
branches: [ "mf-build" ]

Expand Down
11 changes: 1 addition & 10 deletions micro-ui/web/lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,8 @@
"version": "0.0.0",
"packages":[
"packages/core",
"packages/workbench",
"packages/ui-core",
"packages/app1",
"packages/common",
"packages/pgr",
"packages/dss",
"packages/hrms",
"packages/engagement",
"packages/ui-components",
"packages/ui-libraries",
"packages/tqm"
"packages/ui-libraries"
],
"command": {
"run": {
Expand Down
11 changes: 1 addition & 10 deletions micro-ui/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,8 @@
},
"workspaces": [
"packages/core",
"packages/workbench",
"packages/ui-core",
"packages/app1",
"packages/common",
"packages/pgr",
"packages/dss",
"packages/hrms",
"packages/engagement",
"packages/ui-components",
"packages/ui-libraries",
"packages/tqm"
"packages/ui-libraries"
],
"scripts": {
"build": "yarn lerna run build",
Expand Down
2 changes: 2 additions & 0 deletions micro-ui/web/packages/core/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const queryClient = new QueryClient({
},
},
});

//removing this call to test localisation in core app
// registerRemotes(queryClient)


Expand Down
5 changes: 1 addition & 4 deletions micro-ui/web/packages/core/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useEffect } from "react";
import { Redirect, Route, Switch, useHistory, useLocation } from "react-router-dom";
import CitizenApp from "./citizen";
import EmployeeApp from "./employee";
import registerRemotes from "../modules/registerRemotes";

export const DigitApp = ({ stateCode="pg", modules, appTenants, logoUrl, initData ,defaultLanding="employee",queryClient}) => {
const history = useHistory();
const { pathname } = useLocation();
Expand All @@ -17,9 +17,6 @@ export const DigitApp = ({ stateCode="pg", modules, appTenants, logoUrl, initDat

if (window.location.pathname.split("/").includes("employee")) CITIZEN = false;

useEffect(() => {
registerRemotes(queryClient)
}, [])


useEffect(() => {
Expand Down
19 changes: 7 additions & 12 deletions micro-ui/web/packages/core/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,13 @@ module.exports = () => {
new ModuleFederationPlugin({
name: "core-digit-ui",
remotes: {
// landing: `landing@${domain}/landing/remoteEntry.js`,
// auth: `auth@${domain}/auth/remoteEntry.js`,
// header: `header@${domain}/header/remoteEntry.js`,
// dashboard: `dashboard@${domain}/dashboard/remoteEntry.js`,
hrms: `hrms@${domain}/hrms-ui/remoteEntry.js`,
common: `common@${domain}/common-ui/remoteEntry.js`,
pgr: `pgr@${domain}/pgr-ui/remoteEntry.js`,
workbench : `workbench@${domain}/workbench-mfe/remoteEntry.js`,
dss : `dss@${domain}/dss-ui/remoteEntry.js`,
engagement : `engagement@${domain}/engagement-ui/remoteEntry.js`,
tqm : `tqm@${domain}/tqm-ui/remoteEntry.js`,
// measurement : `measurement@${domain}/measurement/remoteEntry.js`
// hrms: `hrms@${domain}/hrms-ui/remoteEntry.js`,
// common: `common@${domain}/common-ui/remoteEntry.js`,
// pgr: `pgr@${domain}/pgr-ui/remoteEntry.js`,
// workbench : `workbench@${domain}/workbench-mfe/remoteEntry.js`,
// dss : `dss@${domain}/dss-ui/remoteEntry.js`,
// engagement : `engagement@${domain}/engagement-ui/remoteEntry.js`,
// tqm : `tqm@${domain}/tqm-ui/remoteEntry.js`,
},
shared: packageJson.dependencies,
}),
Expand Down

0 comments on commit 66c1101

Please sign in to comment.