Merge branch 'console' into FEATURE-1649

egovernments · Jan 29, 2025 · 5e35a6d · 5e35a6d
2 parents 7a3265c + 68e3dbd
commit 5e35a6d
Show file tree

Hide file tree

Showing 79 changed files with 6,157 additions and 1,625 deletions.
diff --git a/build/build-config.yml b/build/build-config.yml
@@ -56,7 +56,13 @@ config:
     - work-dir: health/micro-ui/
       dockerfile: health/micro-ui/web/microplan/Dockerfile
       image-name: microplan-ui      
-
+
+  - name: builds/Digit-Frontend/health/console
+    build:
+    - work-dir: health/micro-ui/
+      dockerfile: health/micro-ui/web/console/Dockerfile
+      image-name: console  
+
   - name: builds/Digit-Frontend/health/payments-ui
     build:
     - work-dir: health/micro-ui/

diff --git a/health/micro-ui/web/console/App.js b/health/micro-ui/web/console/App.js
@@ -37,9 +37,7 @@ const initDigitUI = () => {
     commonUiConfig: UICustomizations,
   };
   // initHRMSComponents();
-  initUtilitiesComponents();
-  initWorkbenchComponents();
-  initWorkbenchHCMComponents();
+
   initCampaignComponents();
 
 };

diff --git a/health/micro-ui/web/console/nginx.conf b/health/micro-ui/web/console/nginx.conf
@@ -1,12 +1,22 @@
-server
-{
-  listen 80;
-  underscores_in_headers on;
-
-  location /console
-  {
-    root /var/web;
-    index index.html index.htm;
-    try_files $uri $uri/ /console/index.html;
-  }
-}
+server {
+    listen 80;
+    underscores_in_headers on;
+
+    location /console {
+        root /var/web;
+        index index.html index.htm;
+
+        # Serve static files and fallback to index.html for SPA routing
+        try_files $uri $uri/ /console/index.html;
+
+        # Cache static assets (JS, CSS, images, fonts) for 1 year
+        location ~* \.(?:js|css|png|jpg|jpeg|gif|svg|ico|woff|woff2|ttf|eot|otf|ttc|map)$ {
+            add_header Cache-Control "public, max-age=31536000, immutable";
+        }
+
+        # Cache HTML files for a shorter period to ensure updates are reflected
+        location ~* \.html$ {
+            add_header Cache-Control "no-cache, must-revalidate";
+        }
+    }
+}
diff --git a/health/micro-ui/web/console/package.json b/health/micro-ui/web/console/package.json
@@ -16,6 +16,7 @@
     "@egovernments/digit-ui-module-core": "1.8.20",
     "@egovernments/digit-ui-components": "0.0.2-beta.64",
     "@egovernments/digit-ui-react-components": "1.8.14",
+    "@egovernments/digit-ui-svg-components":"1.0.14",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/health/micro-ui/web/console/webpack.config.js b/health/micro-ui/web/console/webpack.config.js
@@ -1,12 +1,10 @@
 const path = require("path");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const { CleanWebpackPlugin } = require("clean-webpack-plugin");
-// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = {
-  // mode: 'development',
   entry: "./src/index.js",
-  devtool: "none",
+  devtool: "none", // Use "source-map" for development
   module: {
     rules: [
       {
@@ -19,34 +17,54 @@ module.exports = {
         use: ["style-loader", "css-loader"],
       },
       {
-        test: /\.(png|jpe?g|gif)$/i,
+        test: /\.(png|jpe?g|gif|svg|woff2?|ttf|eot)$/i,
         use: [
           {
-            loader: 'file-loader',
+            loader: "file-loader",
+            options: {
+              name: "assets/[hash].[ext]",
+            },
           },
         ],
       },
     ],
   },
   output: {
-    filename: "[name].bundle.js",
+    filename: "[name].[contenthash].js",
+    chunkFilename: "[name].[contenthash].js",
     path: path.resolve(__dirname, "build"),
     publicPath: "/console/",
   },
   optimization: {
+    runtimeChunk: "single",
+    moduleIds: "hashed", // Compatible with Webpack 4.x
     splitChunks: {
-      chunks: 'all',
-      minSize:20000,
-      maxSize:50000,
-      enforceSizeThreshold:50000,
-      minChunks:1,
-      maxAsyncRequests:30,
-      maxInitialRequests:30
+      chunks: "all",
+      minSize: 30000,
+      maxSize: 250000,
+      minChunks: 1,
+      maxAsyncRequests: 30,
+      maxInitialRequests: 30,
+      cacheGroups: {
+        vendor: {
+          test: /[\\/]node_modules[\\/]/,
+          name: "vendors",
+          chunks: "all",
+        },
+        common: {
+          test: /[\\/]src[\\/]/,
+          name: "common",
+          minChunks: 2,
+        },
+      },
     },
   },
   plugins: [
     new CleanWebpackPlugin(),
-    // new BundleAnalyzerPlugin(),
-    new HtmlWebpackPlugin({ inject: true, template: "public/index.html" }),
+    new HtmlWebpackPlugin({
+      inject: true,
+      template: "public/index.html",
+      scriptLoading: "defer",
+    }),
   ],
-};
+};
diff --git a/health/micro-ui/web/health-payments/package.json b/health/micro-ui/web/health-payments/package.json
@@ -10,10 +10,10 @@
   "workspaces": [
     "micro-ui-internals/packages/modules/health-payments"
   ],
-  "homepage": "/microplan-ui",
+  "homepage": "/payments-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-core": "1.8.12",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
     "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
@@ -64,7 +64,7 @@
     "**/babel-loader": "8.2.2",
     "**/@babel/core": "7.14.0",
     "**/@babel/preset-env": "7.14.0",
-    "**/@babel/traverse":"7.25.9",
+    "**/@babel/traverse": "7.25.9",
     "**/styled-components": "5.0.0",
     "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
     "**/polished": "4.2.2",

diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -12,8 +12,7 @@
   <title>DIGIT</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.12/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.44/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.37/dist/index.css" />
-
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.44/dist/index.css" />
 
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->

diff --git a/health/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/health/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
@@ -97,7 +97,13 @@ module.exports = function (app) {
     "/plan-service",
     "/health-project",
     "/service-request",
-    "/census-service"
+    "/census-service",
+    "/health-attendance/v1/_search",
+    "/health-individual/v1/_search",
+    "/health-muster-roll",
+    "/health-expense/bill/v1/_search",
+    "/health-expense-calculator/v1/_calculate",
+    "/filestore/v1/files/id"
   ].forEach((location) => app.use(location, createProxy));
   ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
   ["/mdms-v2/v2/_create"].forEach((location) => app.use(location, mdmsProxy));

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-health-css",
-  "version": "0.2.37",
+  "version": "0.2.44",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
@@ -66,4 +66,4 @@
     "digit-ui",
     "css"
   ]
-}
+}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
@@ -232,6 +232,7 @@
 .data-mapping-filter-switch {
   float: right;
   margin-bottom: 1.5rem;
+  margin-right: 5rem;
 }
 .digit-label-field-pair.multiselect-label-field {
   > div:nth-of-type(1) {
@@ -266,3 +267,31 @@
 .app-config-actionBar {
   z-index: 9999;
 }
+
+.digit-popup-wrapper.custom-pop-up-mapping {
+  max-width: 35rem;
+
+  .digit-popup-footer {
+
+      padding-top: 0 !important;
+
+      .digit-popup-footer-buttons {
+          width: 100% !important;
+          display: grid;
+          grid-template-columns: 1fr 1fr;
+
+          .digit-button-secondary {
+              width: 100%;
+          }
+
+          .digit-button-primary {
+              width: 100%;
+          }
+      }
+  }
+
+  .digit-popup-children-wrap {
+      padding-top: 0 !important;
+      overflow: visible;
+  }
+}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/payment.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/payment.scss
@@ -15,6 +15,10 @@
     }
 }
 
+.bottom-gap-card-payment {
+    margin-bottom: 1.5rem;
+}
+
 .inbox-header-text {
     padding-left: 16px;
     margin-top: 2px;
@@ -27,4 +31,125 @@
     margin-top: 2px;
     @extend .typography.heading-m;
     color: theme(digitv2.lightTheme.primary-2);
+}
+
+.custom-inbox-table-row {
+    border-right: 2px solid #787878;
+    width: 100%;
+    text-align: start;
+}
+
+.custom-register-inbox-screen {
+
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+
+.custom-register-inbox-screen .inner-div-row-section {
+
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    gap: 1.5rem;
+}
+
+.custom-register-inbox-screen .custom-inbox-filter-section {
+
+    width: 30%;
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+    height: 80vh;
+}
+
+
+.custom-register-inbox-screen .custom-inbox-inner-filter-section {
+
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    height: 75vh;
+    overflow-y: auto;
+}
+
+
+
+
+.custom-register-inbox-screen .custom-inbox-outer-table-section {
+
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    gap: 1.5rem;
+}
+
+.custom-inbox-outer-table-section .inner-table-section {
+
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    height: 75vh;
+    min-height: 75vh;
+}
+
+.custom-inbox-outer-table-section .card-overide {
+    max-width: 100%;
+    overflow: auto;
+    margin: 0px;
+    height: 75vh;
+}
+
+
+
+
+
+.on-icon-reset-proximity {
+    border: 1px solid #e0e0e0;
+    padding: 6px;
+    margin-bottom: 10px;
+    cursor: pointer;
+}
+
+
+.custom-bill-inbox {
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+    margin-bottom: 2.5rem;
+
+
+}
+
+.bill-container {
+    display: flex;
+    flex-direction: row;
+    gap: 1.5rem;
+}
+
+.bill-container-margin-bottom {
+    margin-bottom: 2.5rem;
+}
+
+.left-section {
+    width: 30%;
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+.right-section {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+.filter-container {
+    display: flex;
+    flex-direction: row;
+    height: 60vh;
+    overflow-y: auto;
 }