Merge remote-tracking branch 'origin/master' into develop

build/build-config.yml

@@ -79,10 +79,10 @@ config:
       - work-dir: "frontend/mgramseva"
         image-name: "frontend-mgramseva"
         dockerfile: "frontend/mgramseva/docker/Dockerfile"
-  - name: "builds/mGramSeva/frontend/mgramseva-digit-ui"
+  - name: "builds/mGramSeva/frontend/mgramseva-web"
     build:
       - work-dir: "frontend/micro-ui"
-        image-name: "mgramseva-digit-ui"
+        image-name: "mgramseva-web"
         dockerfile: "frontend/micro-ui/web/docker/Dockerfile"
   - name: "builds/mGramSeva/core-services/user-otp"
     build:

frontend/mgramseva/README.md

@@ -19,7 +19,7 @@ Command:
 - Clone the repository [https://github.com/egovernments/punjab-mgramseva](https://github.com/egovernments/punjab-mgramseva)
 - $ cd /punjab-mgramseva/frontend/mgramseva
 - $ flutter pub get
-- Change the url in the lib/Env/app_config.dart to the desired instance url
+- Change the url in the lib/env/app_config.dart to the desired instance url
 
 ## About Flutter
 For help getting started with Flutter, view our

frontend/mgramseva/lib/providers/reports_provider.dart

@@ -173,7 +173,7 @@ class ReportsProvider with ChangeNotifier {
       ytd = DatePeriod(fromDate,toDate,DateType.YTD);
 
       /// Get months based on selected billing year
-      var months = CommonMethods.getPastMonthUntilFinancialYTD(ytd);
+      var months = CommonMethods.getPastMonthUntilFinancialYTD(ytd,showCurrentMonth: true);
 
       /// if selected year is future year means all the months will be removed
       if(fromDate.year > ytd.endDate.year) months.clear();

frontend/mgramseva/lib/utils/common_methods.dart

@@ -57,15 +57,15 @@ class CommonMethods {
   *
   * */
 
-  static List<DatePeriod> getPastMonthUntilFinancialYTD(DatePeriod ytd) {
+  static List<DatePeriod> getPastMonthUntilFinancialYTD(DatePeriod ytd,{bool showCurrentMonth = false}) {
     var monthList = <DateTime>[];
     final currentTime = DateTime.now();
     if(currentTime.year < ytd.startDate.year){
       return <DatePeriod>[];
     }
     if (currentTime.year == ytd.startDate.year) {
       //when current year is same as start year of financial year
-      for (int i = ytd.startDate.month; i < currentTime.month; i++) {
+      for (int i = ytd.startDate.month; i <= (showCurrentMonth?currentTime.month:currentTime.month-1); i++) {
         monthList.add(DateTime(currentTime.year, i));
       }
     } else if(currentTime.year == ytd.endDate.year){
@@ -74,7 +74,7 @@ class CommonMethods {
         monthList.add(DateTime(ytd.startDate.year, i));
       }
       for (int i = 1;
-      i <= (currentTime.month <= ytd.endDate.month ? currentTime.month-1: ytd.endDate.month);
+      i <= (currentTime.month <= ytd.endDate.month ? showCurrentMonth?currentTime.month:currentTime.month-1: ytd.endDate.month);
       /*
           * if current month is less than or equal to end month of financial year
           * we are using months less than current month and if it is more than

frontend/micro-ui/.gitignore

@@ -1,6 +1,5 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-web/digit-ui-internals
 .env
 .eslintcache
 

frontend/micro-ui/CODEOWNERS

@@ -1 +1 @@
-* @jagankumar-egov @saurabh-egov @sathishp-eGov
+* @jagankumar-egov @sathishp-eGov

frontend/micro-ui/Jenkinsfile

@@ -0,0 +1,3 @@
+library 'ci-libs'
+
+buildPipeline(configFile: './build/build-config.yml')

frontend/micro-ui/package.json

@@ -1,4 +1,4 @@
 {
   "name": "digit-ui",
-  "version": "1.7.0-beta.1"
-}
+  "version": "1.0.0"
+}

frontend/micro-ui/web/.env.sample

@@ -1,2 +1,3 @@
+SKIP_PREFLIGHT_CHECK=true
 REACT_APP_STATE_LEVEL_TENANT_ID=pb
-REACT_APP_PROXY_URL=https://qa.digit.org
+REACT_APP_PROXY_URL=https://works-dev.digit.org

frontend/micro-ui/web/docker/Dockerfile

@@ -1,26 +1,23 @@
-FROM egovio/alpine-node-builder-14:yarn AS build
-#FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
+# FROM egovio/alpine-node-builder-14:yarn AS build
+FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
 RUN apk update && apk upgrade
 RUN apk add --no-cache git>2.30.0
 ARG WORK_DIR
 WORKDIR /app
-ENV NODE_OPTIONS "--max-old-space-size=4096"
-ENV GENERATE_SOURCEMAP "false"
+ENV NODE_OPTIONS "--max-old-space-size=8168"
 
 COPY ${WORK_DIR} .
 RUN ls -lah
 
 #RUN node web/envs.js
 RUN cd web/ \
-    && node envs.js \
-    && node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(1024*1024))' \
     &&  ./install-deps.sh \
     && yarn install \
     && yarn build 
 
 FROM nginx:mainline-alpine
 #FROM ghcr.io/egovernments/nginx:mainline-alpine
-ENV WORK_DIR=/var/web/digit-ui
+ENV WORK_DIR=/var/web/mgramseva-web
 
 RUN mkdir -p ${WORK_DIR}
 

frontend/micro-ui/web/docker/nginx.conf

@@ -3,10 +3,10 @@ server
   listen 80;
   underscores_in_headers on;
 
-  location /digit-ui
+  location /mgramseva-web
   {
     root /var/web;
     index index.html index.htm;
-    try_files $uri $uri/ /digit-ui/index.html;
+    try_files $uri $uri/ /mgramseva-web/index.html;
   }
 }

frontend/micro-ui/web/install-deps.sh

@@ -2,9 +2,13 @@
 
 BRANCH="$(git branch --show-current)"
 
+echo "Main Branch: $BRANCH"
+
 INTERNALS="micro-ui-internals"
 
-cd $INTERNALS && echo "installing packages" && yarn install && echo "starting build" && yarn build && echo "building finished" && find . -name "node_modules" -type d -prune -print -exec rm -rf '{}' \; 
+cp $INTERNALS/example/src/UICustomizations.js src/Customisations
+
+cd $INTERNALS && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && echo "installing packages" && yarn install && echo "starting build" && yarn build && echo "building finished" && find . -name "node_modules" -type d -prune -print -exec rm -rf '{}' \; 
 cd ..
 
 rm -rf node_modules

frontend/micro-ui/web/micro-ui-internals/example/.env-fsm

@@ -0,0 +1,7 @@
+SKIP_PREFLIGHT_CHECK=true
+REACT_APP_USER_TYPE=
+REACT_APP_EMPLOYEE_TOKEN=
+REACT_APP_CITIZEN_TOKEN=
+REACT_APP_PROXY_API=https://unified-dev.digit.org
+REACT_APP_PROXY_ASSETS=https://unified-dev.digit.org
+REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigsFSM.js

frontend/micro-ui/web/micro-ui-internals/example/.env-qa

@@ -4,9 +4,4 @@ REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a
 REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c
 REACT_APP_PROXY_API=https://qa.digit.org
 REACT_APP_PROXY_ASSETS=https://qa.digit.org
-REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js
-REACT_APP_CENTRAL_GLOBAL=https://egov-central-instance-assets.s3.ap-south-1.amazonaws.com/statebglobalConfigs.js
-REACT_APP_QA_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js
-REACT_APP_UAT_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-uat-assets/globalConfigs.js
-REACT_APP_STATEB_GLOBAL=https://egov-central-instance-assets.s3.ap-south-1.amazonaws.com/statebglobalConfigs.js
-staging=https://staging.digit.org
+REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js

frontend/micro-ui/web/micro-ui-internals/example/.env-upyog

@@ -0,0 +1,8 @@
+SKIP_PREFLIGHT_CHECK=true
+REACT_APP_USER_TYPE=EMPLOYEE
+REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a
+REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c
+REACT_APP_PROXY_API=https://upyog.niua.org
+REACT_APP_PROXY_ASSETS=https://upyog.niua.org
+REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/in-egov-assets/globalConfigs.js
+REACT_APP_CONTEXT=digit-ui

frontend/micro-ui/web/micro-ui-internals/example/.env-worksdev

@@ -0,0 +1,8 @@
+SKIP_PREFLIGHT_CHECK=true
+REACT_APP_USER_TYPE=EMPLOYEE
+REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a
+REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c
+REACT_APP_PROXY_API=https://works-dev.digit.org
+REACT_APP_PROXY_ASSETS=https://works-dev.digit.org
+REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/works-dev-asset/globalConfigsWorks.js
+REACT_APP_CONTEXT=works

frontend/micro-ui/web/micro-ui-internals/example/devpackage.json

@@ -9,7 +9,7 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries":"^1.4.0",
+    "@egovernments/digit-ui-libraries":"^1.5.7",
     "@egovernments/digit-ui-module-common":"^1.4.0",
     "@egovernments/digit-ui-module-engagement":"^1.4.0",
     "@egovernments/digit-ui-module-fsm":"^1.4.0",

frontend/micro-ui/web/micro-ui-internals/example/package.json

@@ -1,29 +1,26 @@
 {
   "name": "@egovernments/digit-ui-example",
-  "version": "1.3.0",
+  "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
   "private": true,
-  "homepage": "digit-ui/",
+  "homepage": "digit-ui",
   "scripts": {
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-common": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-engagement": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-fsm": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-mcollect": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-noc": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-hrms":"1.7.0-beta.2",
-    "@egovernments/digit-ui-module-obps": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-pgr": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-pt": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-receipts": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-tl": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-ws": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-bills": "^1.7.0-beta.1",
-    "@egovernments/digit-ui-module-commonpt": "^1.7.0-beta.1",
+    "@egovernments/digit-ui-module-dss": "1.5.37",
+    "@egovernments/digit-ui-module-core": "1.5.42",
+    "@egovernments/digit-ui-module-common": "1.5.30",
+    "@egovernments/digit-ui-module-hrms": "1.5.25",
+    "@egovernments/digit-ui-module-utilities": "0.0.8",
+    "@egovernments/digit-ui-module-engagement": "1.5.20",
+    "@egovernments/digit-ui-react-components": "1.5.28",
+    "@egovernments/digit-ui-svg-components": "0.0.1",
+    "@egovernments/digit-ui-libraries": "1.5.7", 
+    "@egovernments/digit-ui-module-sample": "0.0.1",
+    "@egovernments/digit-ui-module-workbench":"0.0.3",
+    "@egovernments/digit-ui-customisation-mukta": "0.0.1",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

frontend/micro-ui/web/micro-ui-internals/example/public/index.html

@@ -1,19 +1,32 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <link rel="icon" href="https://cdn.jsdelivr.net/npm/@egovernments/digit-ui-css/img/browser-icon.png"/>
-    <link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap" rel='stylesheet' type='text/css'>
-    <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <meta name="theme-color" content="#00bcd1"/>
-    <title>mSeva</title>
-    <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
-    <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script>
-    <script src="%REACT_APP_GLOBAL%"></script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="https://cdn.jsdelivr.net/npm/@egovernments/digit-ui-css/img/browser-icon.png" />
+  <link
+    href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
+    rel='stylesheet' type='text/css'>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="theme-color" content="#00bcd1" />
+  <title>mSeva</title>
+
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
+
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
+
+
+  <!-- <link rel="stylesheet" href="https://unpkg.com/@upyog-niua/[email protected]/dist/index.css" /> -->
+
+  <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
+  <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
+  <script src="%REACT_APP_GLOBAL%"></script>
+
+</head>
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root"></div>
 </body>
 
-</html>
+</html>