diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a02c62fbaf..0e4016fcfe 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,6 @@ on: - sandbox-ui - microplan-ui - console - - dashboard-ui - payments-ui - storybook-svg - storybook diff --git a/build/build-config.yml b/build/build-config.yml index 33194cc236..d79ccd0030 100644 --- a/build/build-config.yml +++ b/build/build-config.yml @@ -69,11 +69,6 @@ config: dockerfile: health/micro-ui/web/core/Dockerfile image-name: core-ui - - name: builds/Digit-Frontend/health/dashboard-ui - build: - - work-dir: health/micro-ui/ - dockerfile: health/micro-ui/web/health-dss/Dockerfile - image-name: dashboard-ui # Others - name: builds/Digit-Frontend/storybook-svg diff --git a/health/micro-ui/web/health-dss/Dockerfile b/health/micro-ui/web/health-dss/Dockerfile index a5ddd1eac0..4fb036a840 100644 --- a/health/micro-ui/web/health-dss/Dockerfile +++ b/health/micro-ui/web/health-dss/Dockerfile @@ -37,9 +37,9 @@ RUN yarn build:webpack FROM nginx:mainline-alpine #FROM ghcr.io/egovernments/nginx:mainline-alpine -ENV WORK_DIR=/var/web/dashboard-ui +ENV WORK_DIR=/var/web/microplan-ui RUN mkdir -p ${WORK_DIR} COPY --from=build /app/web/build ${WORK_DIR}/ -COPY --from=build /app/web/health-dss/nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=build /app/web/health-dss/nginx.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/health/micro-ui/web/health-dss/nginx.conf b/health/micro-ui/web/health-dss/nginx.conf index 81c8360bb3..616f7d3ca2 100644 --- a/health/micro-ui/web/health-dss/nginx.conf +++ b/health/micro-ui/web/health-dss/nginx.conf @@ -3,7 +3,7 @@ server listen 80; underscores_in_headers on; - location /dashboard-ui + location /microplan-ui { root /var/web; index index.html index.htm; diff --git a/health/micro-ui/web/health-dss/package.json b/health/micro-ui/web/health-dss/package.json index 3b9e5ba5fa..a0a8635f05 100644 --- a/health/micro-ui/web/health-dss/package.json +++ b/health/micro-ui/web/health-dss/package.json @@ -12,7 +12,7 @@ "micro-ui-internals/packages/modules/campaign-manager", "micro-ui-internals/packages/modules/health-dss" ], - "homepage": "/dashboard-ui", + "homepage": "/microplan-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.17", "@egovernments/digit-ui-module-core": "1.8.30", diff --git a/health/micro-ui/web/health-dss/webpack.config.js b/health/micro-ui/web/health-dss/webpack.config.js index a8aba0f532..c803636460 100644 --- a/health/micro-ui/web/health-dss/webpack.config.js +++ b/health/micro-ui/web/health-dss/webpack.config.js @@ -31,7 +31,7 @@ module.exports = { output: { filename: "[name].bundle.js", path: path.resolve(__dirname, "build"), - publicPath: "/dashboard-ui/", + publicPath: "/microplan-ui/", }, optimization: { splitChunks: { diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json index a35fe4a668..c73fb05c40 100644 --- a/health/micro-ui/web/microplan/package.json +++ b/health/micro-ui/web/microplan/package.json @@ -9,7 +9,8 @@ }, "workspaces": [ "micro-ui-internals/packages/modules/microplan", - "micro-ui-internals/packages/modules/campaign-manager" + "micro-ui-internals/packages/modules/campaign-manager", + "micro-ui-internals/packages/modules/health-dss" ], "homepage": "/microplan-ui", "dependencies": { diff --git a/health/micro-ui/web/package.json b/health/micro-ui/web/package.json index a7d97b3680..d8f6ff6cad 100644 --- a/health/micro-ui/web/package.json +++ b/health/micro-ui/web/package.json @@ -10,7 +10,8 @@ "workspaces": [ "micro-ui-internals/packages/modules/campaign-manager", "micro-ui-internals/packages/modules/health-hrms", - "micro-ui-internals/packages/modules/pgr" + "micro-ui-internals/packages/modules/pgr", + "micro-ui-internals/packages/modules/health-dss" ], "homepage": "/workbench-ui", "dependencies": { @@ -21,6 +22,7 @@ "@egovernments/digit-ui-module-hcmworkbench": "0.1.5", "@egovernments/digit-ui-module-utilities": "1.0.12", "@egovernments/digit-ui-module-campaign-manager": "0.4.0", + "@egovernments/digit-ui-module-health-dss": "0.0.1", "@egovernments/digit-ui-module-health-pgr": "0.0.1", "@egovernments/digit-ui-react-components": "1.8.24", "@egovernments/digit-ui-svg-components": "1.0.21",