Skip to content

Commit 2ae5fc4

Browse files
Swathi-eGovprerna-egovabishekTa-egovnabeelmd-eGovcoderabbitai[bot]
authored
ICCD v0.1 :: Common Dashbaord changes (#2872)
* FEATURE/HCMPRE-2716 : Added Helth-DSS Module for ICCD (#2391) * FEATURE/HCMPRE-2752 : Static Inbox Screens for live and past campaigns (#2405) * FEATURE/HCMPRE-2752 : Static Inbox Screens for live and past campaigns * FEATURE/HCMPRE-2752 : added review changes * Added date filters * FEATURE/HCMPRE-2753 : Updated InboxScreens and Filters (#2425) * FEATURE/HCMPRE-2751 : Updated css version (#2429) * FEATURE/HCMPRE-2820 : My Campaigns New Inbox Screen (#2486) * FEATURE/HCMPRE-2820 : My Campaigns Inbox Screen * FEATURE/HCMPRE-2820 : MY CAMPAIGNS NEW INBOX SCREEN * Updated Component name * Updated edit campaign logic * FEATURE/HCMPRE-2826 : Updated labels and incremented css version (#2489) * FEATURE/HCMPRE-2827 : Added My Campaigns link in DSS card (#2507) * FEATURE/HCMPRE-2827 : Added My Campaigns link in DSS card * updated breadcrumb * FEATURE/HCMPRE-2778 : Adding customizations (#2529) FEATURE/HCMPRE-277* : Adding customizations * FEATURE/HCMPRE-2874 : Added ICCD Dashboard (#2716) * iccd-dev-tasks * Fixed pie chart * fixed l2 redirection issue (#2592) * Updated options and icons * Iccd dev custom table fix (#2598) * fixed localization for iccd * fixed custom table * Updated components * CustomDataTable-react data table transition (#2601) * Table to react-data-table in cudtomData * css package update * package decrement * searchQuery to onSearch --------- Co-authored-by: Swathi-eGov <[email protected]> * Updated charts * replaced useGetChart hook with useCustomAPIHook for the chart api (#2612) * reverted version changes * FEATURE/HCMPRE-2869 : Added project search inbox (#2638) added project search inbox * FEATURE/HCMPRE-2871 : added dummy screen * added check for tenantId * Added useAPIHook as a replacement to useCustomAPIHook * Updated redirection link * Updated useGetChart to useGetChartV2 * Stable version upgrade (#2683) * reverting commit with id 10eedd5 * updated libraries version to 1.8.17 * removing config from useCustomMDMS hook call * Fixed heatmapchart and latlongmapchart * added getDuration util in health-dss module (#2708) * Updated loader and chips * Fixes for ProgressBar, SortFunction, and SortIcon for DataTable and CustomDate selection (#2625) * Css change for sort * Progress bar fix * Date showing in datePicker fix * Updated components version and fixed some css * Fixed heatmap issue * Updated css version * REmoved logs --------- Co-authored-by: prerna-egov <[email protected]> Co-authored-by: abishekTa-egov <[email protected]> * FEATURE/HCMPRE-2877 : Fixed some css issues and data range selection (#2720) * FEATURE/HCMPRE-2973 : Added Loader and build issue check (#2730) FEATURE/HCMPRE-2873 : Added loader, and build issue check * FEATURE/HCMPRE-2880 : Removing hardcoded values (#2744) * FEATURE/HCMPRE-2880 : Updating core version,map iframe css,url change * removed hardcoded boundary value from L2Main * Updated url * Updated css version --------- Co-authored-by: prerna-egov <[email protected]> * FEATURE/HCMPRE-2881 : Updated breadcrumbs (#2749) * FEATURE/HCMPRE-2885 : Fixed some css issues and removed unnecessary code (#2767) * FEATURE/HCMPRE-0003 : Fixed Responsive css (#2792) * FEATURE/HCMPRE-0003 : Fixed localization issue (#2793) * BUGFIX/HCMPRE-3029 : Fixed Boundary Code Issue (#2812) * BUGFIX/HCMPRE-3029 : Fixed Boundary Code Issue * review changes * FEATURE/HCMPRE-3029 : Removing custom report button (#2814) * FEATURE/HCMPRE-2873 : Added custom function to add filters in kibana url (#2858) FETURE/HCMPRE-2873 : Added custom function to add filters in kibana url * BUGFIX/HCMPRE-3001 : Fixed statecode and sharing funcationality (#2871) * BUGFIX/HCMPRE-3001 : Fixed statecode and sharing funcationality * Update health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/pages/employee/L2Main.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * FEATURE/HCMPRE-2878 : removed hardcoded boundary types (#2768) * FEATURE/HCMPRE-2878 : removed hardcoded boundary types * added getBoundaryTypeByLevel to utils * BUGFIX/HCMPRE-2878 : calling the mdms using useCustomMDMS in latlong chart (#2770) * BUGFIX/HCMPRE-2878 : calling the mdms using useCustomMDMS in latlong chart * fix: fixed the loader not rendering issue * Fixed loader and search bar css * removed commented code --------- Co-authored-by: Swathi-eGov <[email protected]> Co-authored-by: Swathi-eGov <[email protected]> * BUGFIX/HCMPRE-2875 : Filter Removal for level-2 Distict wise data Table (#2726) * Filter removing change * In customTable.js If bigger hierarchy is removed in filter fix * Removing uneccesary variable * syntax correction --------- Co-authored-by: nabeelmd-eGov <[email protected]> * BUGFIX/HCMPRE-0004: Adding Filter by cycle in L1, L2 Dashboard (#2738) * BUGFIX/HCMPRE-0004 * BUGFIX/HCMPRE-0004 : Removing unused variable * BUGFIX/HCMPRE-0004 : Null issue fixed * BUGFIX/HCMPRE-0004 : Change of functionName * BUGFIX/HCMPRE-0005 : Removing default Cycle filter for getDashboardRequest and CSS for HeatMap (#2743) * BUGFIX/HCMPRE-0004 * BUGFIX/HCMPRE-0004 : Removing unused variable * BUGFIX/HCMPRE-0004 : Null issue fixed * BUGFIX/HCMPRE-0004 : Change of functionName * BUGFIX/HCMPRE-0004 : Removing default Cycle filter for getDashboardRequest * BUGFIX/HCMPRE-0005: Css Fix for Heatmap * BUGFIX/HCMPRE-0005: Reverting changes in L2 Main * BUGFIX/HCMPRE-0005: Resolving changes in L2 Main * BUGFIX/HCMPRE-0005: Commenting out province * BUGFIX/HCMPRE-0005: Adding back fynamic filters * Updated css version * Reverting unnecessary changes * Code cleanup * Fixed CSS Issues * Clean up * Removed fsm releated ids * Removing multiple project staff search calls * added code review changes * Added note for localization of bounday value to debug in future * Seperate UI build for health-dss * Fixed syntax issue * added translation for caption * fixed charts issue * Bugfix/hcmpre 0009- Filter By cycle fix (#2911) * BUGFIX/HCMPRE-0008: Filter By Cycle change * BUGFIX/HCMPRE-0009: If cycles>1 then show the filter by cycle * BUGFIX/HCMPRE-0009: Cycle filter is for individual only * FEATURE/HCMPRE-8888: Removing unneccesary packages * FEATURE/HCMPRE-8888: Adding utils for functions * FEATTURE/HCMPRE-8888: Resolving comments * FEATURE/HCMPRE-8888: Removing unneccessary silters and console log * FEATURE/HCMPRE-8888: Nitpick issues * FEATURE/HCMPRE-8888: Undoing nitpick changes * FEATURE/HCMPRE-8888: Nitpick issue and package addition * FEATURE/HCMPRE-8888: Increment css version --------- Co-authored-by: prerna-egov <[email protected]> Co-authored-by: abishekTa-egov <[email protected]> Co-authored-by: prerna-egov <[email protected]> Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent 503b2e9 commit 2ae5fc4

File tree

85 files changed

+266519
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+266519
-5
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- sandbox-ui
1616
- microplan-ui
1717
- console
18+
- dashboard-ui
1819
- payments-ui
1920
- storybook-svg
2021
- storybook

build/build-config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ config:
6868
- work-dir: health/micro-ui/
6969
dockerfile: health/micro-ui/web/core/Dockerfile
7070
image-name: core-ui
71+
72+
- name: builds/Digit-Frontend/health/dashboard-ui
73+
build:
74+
- work-dir: health/micro-ui/
75+
dockerfile: health/micro-ui/web/health-dss/Dockerfile
76+
image-name: dashboard-ui
7177

7278
# Others
7379
- name: builds/Digit-Frontend/storybook-svg

health/micro-ui/web/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"homepage": "/core-ui",
1414
"dependencies": {
15-
"@egovernments/digit-ui-libraries": "1.8.19",
15+
"@egovernments/digit-ui-libraries": "1.8.19",
1616
"@egovernments/digit-ui-module-core": "1.8.42",
1717
"@egovernments/digit-ui-module-campaign-manager": "0.4.0",
1818
"@egovernments/digit-ui-react-components": "1.8.24",
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import React from "react";
2+
import { initLibraries } from "@egovernments/digit-ui-libraries";
3+
4+
import { DigitUI } from "@egovernments/digit-ui-module-core";
5+
6+
import { UICustomizations } from "./Customisations/UICustomizations";
7+
import { initDSSComponents } from "@egovernments/digit-ui-module-health-dss";
8+
9+
window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
10+
11+
const enabledModules = [
12+
"DSS",
13+
"NDSS",
14+
"Utilities",
15+
"HRMS",
16+
"Engagement",
17+
"Workbench",
18+
"Microplanning",
19+
"Microplan",
20+
"Campaign"
21+
];
22+
23+
const moduleReducers = (initData) => ({
24+
initData,
25+
});
26+
27+
const initDigitUI = () => {
28+
window.Digit.ComponentRegistryService.setupRegistry({
29+
30+
});
31+
32+
initDSSComponents();
33+
34+
window.Digit.Customizations = {
35+
PGR: {},
36+
commonUiConfig: {...UICustomizations,HCM_MODULE_NAME:"health-dss"},
37+
};
38+
};
39+
40+
initLibraries().then(() => {
41+
initDigitUI();
42+
});
43+
44+
function App() {
45+
window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
46+
const stateCode =
47+
window.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") ||
48+
process.env.REACT_APP_STATE_LEVEL_TENANT_ID;
49+
if (!stateCode) {
50+
return <h1>stateCode is not defined</h1>;
51+
}
52+
return (
53+
<DigitUI
54+
stateCode={stateCode}
55+
enabledModules={enabledModules}
56+
moduleReducers={moduleReducers}
57+
defaultLanding="employee"
58+
allowedUserTypes={["employee"]}
59+
/>
60+
);
61+
}
62+
63+
export default App;
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
FROM node:14-alpine3.16 AS build
2+
RUN apk update
3+
RUN apk add --no-cache 'git>2.30.0'
4+
ARG WORK_DIR
5+
WORKDIR /app
6+
ENV NODE_OPTIONS="--max-old-space-size=4792"
7+
ENV YARN_DEBUG=true
8+
9+
COPY ${WORK_DIR} .
10+
RUN ls -lah
11+
12+
# Set working directory
13+
WORKDIR /app/web
14+
15+
# Show heap size limit
16+
RUN node -e "console.log('Heap limit (MB):', v8.getHeapStatistics().heap_size_limit / (1024 * 1024))"
17+
18+
# Print a marker log (optional debug message)
19+
RUN node -e "console.log('core only')"
20+
21+
# Move into health-dss and run install script
22+
WORKDIR /app/web/health-dss
23+
RUN chmod +x ./install-deps.sh
24+
RUN ./install-deps.sh
25+
26+
# Return to main directory for install/build
27+
WORKDIR /app/web
28+
29+
# Increase timeout before install (recommended for GitHub Actions)
30+
RUN yarn config set network-timeout 600000
31+
32+
# Install dependencies
33+
RUN yarn install
34+
35+
# Build the project
36+
RUN yarn build:webpack
37+
38+
FROM nginx:mainline-alpine
39+
#FROM ghcr.io/egovernments/nginx:mainline-alpine
40+
ENV WORK_DIR=/var/web/dashboard-ui
41+
42+
RUN mkdir -p ${WORK_DIR}
43+
44+
COPY --from=build /app/web/build ${WORK_DIR}/
45+
COPY --from=build /app/web/health-dss/nginx.conf /etc/nginx/conf.d/default.conf
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
BRANCH="$(git branch --show-current)"
4+
5+
echo "Main Branch: $BRANCH"
6+
7+
INTERNALS="micro-ui-internals"
8+
cd ..
9+
10+
cp health-dss/App.js src
11+
cp health-dss/package.json package.json
12+
cp health-dss/webpack.config.js webpack.config.js
13+
cp health-dss/inter-package.json $INTERNALS/package.json
14+
15+
cp $INTERNALS/example/src/UICustomizations.js src/Customisations
16+
17+
echo "UI :: health-dss " && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && echo "installing packages"
18+
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"name": "egovernments",
3+
"version": "1.0.0",
4+
"main": "index.js",
5+
"workspaces": [
6+
"packages/modules/microplan",
7+
"packages/modules/campaign-manager",
8+
"packages/modules/health-dss"
9+
],
10+
"author": "JaganKumar <[email protected]>",
11+
"license": "MIT",
12+
"private": true,
13+
"engines": {
14+
"node": ">=14"
15+
},
16+
"scripts": {
17+
"start": "SKIP_PREFLIGHT_CHECK=true run-s build start:dev",
18+
"sprint": "SKIP_PREFLIGHT_CHECK=true run-s start:script",
19+
"start:dev": "run-p dev:**",
20+
"start:script": "./scripts/create.sh",
21+
"dev:css": "cd packages/css && yarn start",
22+
"publish:css": "cd packages/css && yarn publish --access public",
23+
"dev:example": "cd example && yarn start",
24+
"dev:hcm-microplanning": "cd packages/modules/hcm-microplanning && yarn start",
25+
"dev:microplan": "cd packages/modules/microplan && yarn start",
26+
"dev:health-dss": "cd packages/modules/health-dss && yarn start",
27+
"dev:campaign": "cd packages/modules/campaign-manager && yarn start",
28+
"build": "run-p build:**",
29+
"build:campaign": "cd packages/modules/campaign-manager && yarn build",
30+
"buildD:hcm-microplanning": "cd packages/modules/hcm-microplanning && yarn build",
31+
"build:microplan": "cd packages/modules/microplan && yarn build",
32+
"build:health-dss": "cd packages/modules/health-dss && yarn build",
33+
"deploy:jenkins": "./scripts/jenkins.sh",
34+
"clean": "rm -rf node_modules"
35+
},
36+
"resolutions": {
37+
"**/@babel/runtime": "7.20.1",
38+
"**/@babel/traverse":"7.25.9",
39+
"**/babel-preset-react-app": "10.0.0",
40+
"**/babel-loader": "8.2.2",
41+
"**/@babel/core": "7.14.0",
42+
"**/@babel/preset-env": "7.14.0",
43+
"**/@babel/plugin-transform-modules-commonjs": "7.14.0",
44+
"**/@jridgewell/gen-mapping": "0.3.5",
45+
"**/polished":"4.2.2",
46+
"fast-uri":"2.1.0"
47+
},
48+
"devDependencies": {
49+
"husky": "7.0.4",
50+
"lint-staged": "12.3.7",
51+
"npm-run-all": "4.1.5",
52+
"prettier": "2.1.2"
53+
},
54+
"husky": {},
55+
"lint-staged": {
56+
"*.{js,css,md}": "prettier --write"
57+
},
58+
"dependencies": {
59+
"lodash": "4.17.21",
60+
"microbundle-crl": "0.13.11",
61+
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
62+
"react": "17.0.2",
63+
"react-dom": "17.0.2",
64+
"react-hook-form": "6.15.8",
65+
"react-i18next": "11.16.2",
66+
"react-query": "3.6.1",
67+
"react-router-dom": "5.3.0"
68+
}
69+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
server
2+
{
3+
listen 80;
4+
underscores_in_headers on;
5+
6+
location /dashboard-ui
7+
{
8+
root /var/web;
9+
index index.html index.htm;
10+
try_files $uri $uri/ /dashboard-ui/index.html;
11+
}
12+
}
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
{
2+
"name": "micro-ui",
3+
"version": "1.0.0",
4+
"author": "Jagankumar <[email protected]>",
5+
"license": "MIT",
6+
"private": true,
7+
"engines": {
8+
"node": ">=14"
9+
},
10+
"workspaces": [
11+
"micro-ui-internals/packages/modules/microplan",
12+
"micro-ui-internals/packages/modules/campaign-manager",
13+
"micro-ui-internals/packages/modules/health-dss"
14+
],
15+
"homepage": "/dashboard-ui",
16+
"dependencies": {
17+
"@egovernments/digit-ui-libraries": "1.8.17",
18+
"@egovernments/digit-ui-module-core": "1.8.30",
19+
"@egovernments/digit-ui-react-components": "1.8.19",
20+
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
21+
"@egovernments/digit-ui-components": "0.0.2-beta.58",
22+
"@egovernments/digit-ui-module-health-dss":"0.0.1",
23+
"babel-loader": "8.1.0",
24+
"clean-webpack-plugin": "4.0.0",
25+
"react": "17.0.2",
26+
"react-dom": "17.0.2",
27+
"jsonpath": "^1.1.1",
28+
"react-router-dom": "5.3.0",
29+
"react-scripts": "4.0.1",
30+
"react-hook-form": "6.15.8",
31+
"react-i18next": "11.16.2",
32+
"react-query": "3.6.1",
33+
"css-loader": "5.2.6",
34+
"webpack-cli": "4.10.0",
35+
"style-loader": "2.0.0"
36+
},
37+
"devDependencies": {
38+
"@babel/plugin-proposal-private-property-in-object": "7.21.0",
39+
"file-loader": "^6.2.0",
40+
"http-proxy-middleware": "1.3.1",
41+
"lodash": "4.17.21",
42+
"microbundle-crl": "0.13.11",
43+
"react": "17.0.2",
44+
"react-dom": "17.0.2",
45+
"react-hook-form": "6.15.8",
46+
"react-i18next": "11.16.2",
47+
"react-query": "3.6.1",
48+
"react-router-dom": "5.3.0",
49+
"husky": "7.0.4",
50+
"lint-staged": "12.3.7",
51+
"npm-run-all": "4.1.5",
52+
"prettier": "2.1.2"
53+
},
54+
"scripts": {
55+
"start": "react-scripts start",
56+
"build": "GENERATE_SOURCEMAP=false SKIP_PREFLIGHT_CHECK=true react-scripts build",
57+
"build:prepare": "./build.sh",
58+
"build:libraries": "cd micro-ui-internals && yarn build",
59+
"build:prod": "webpack --mode production",
60+
"build:webpack": "yarn build:libraries &&cd .. && ls && cd ./web && ls && yarn build:prod",
61+
"clean": "rm -rf node_modules"
62+
},
63+
"resolutions": {
64+
"**/babel-loader": "8.2.2",
65+
"**/@babel/core": "7.14.0",
66+
"**/@babel/preset-env": "7.14.0",
67+
"**/@babel/traverse":"7.25.9",
68+
"**/styled-components": "5.0.0",
69+
"**/minimatch": "7.4.6",
70+
"**/@babel/plugin-transform-modules-commonjs": "7.14.0",
71+
"**/polished": "4.2.2",
72+
"**/@jridgewell/gen-mapping": "0.3.5",
73+
"fast-uri": "2.1.0"
74+
},
75+
"eslintConfig": {
76+
"extends": [
77+
"react-app"
78+
]
79+
},
80+
"browserslist": {
81+
"production": [
82+
">0.2%",
83+
"not dead",
84+
"not op_mini all"
85+
],
86+
"development": [
87+
"last 1 chrome version",
88+
"last 1 firefox version",
89+
"last 1 safari version"
90+
]
91+
}
92+
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
const path = require("path");
2+
const HtmlWebpackPlugin = require("html-webpack-plugin");
3+
const { CleanWebpackPlugin } = require("clean-webpack-plugin");
4+
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
5+
6+
module.exports = {
7+
// mode: 'development',
8+
entry: "./src/index.js",
9+
devtool: "none",
10+
module: {
11+
rules: [
12+
{
13+
test: /\.(js)$/,
14+
exclude: /node_modules/,
15+
use: ["babel-loader"],
16+
},
17+
{
18+
test: /\.css$/i,
19+
use: ["style-loader", "css-loader"],
20+
},
21+
{
22+
test: /\.(png|jpe?g|gif)$/i,
23+
use: [
24+
{
25+
loader: 'file-loader',
26+
},
27+
],
28+
},
29+
],
30+
},
31+
output: {
32+
filename: "[name].bundle.js",
33+
path: path.resolve(__dirname, "build"),
34+
publicPath: "/dashboard-ui/",
35+
},
36+
optimization: {
37+
splitChunks: {
38+
chunks: 'all',
39+
minSize:20000,
40+
maxSize:50000,
41+
enforceSizeThreshold:50000,
42+
minChunks:1,
43+
maxAsyncRequests:30,
44+
maxInitialRequests:30
45+
},
46+
},
47+
plugins: [
48+
new CleanWebpackPlugin(),
49+
// new BundleAnalyzerPlugin(),
50+
new HtmlWebpackPlugin({ inject: true, template: "public/index.html" }),
51+
],
52+
};

0 commit comments

Comments
 (0)