DUCE-10 :: added country code and validation for MOZ and ET

micro-ui/web/core/App.js

@@ -1,20 +1,25 @@
 import React from "react";
 import { initLibraries } from "@egovernments/digit-ui-libraries";
-import { DigitUI } from "@egovernments/digit-ui-module-core";
+
+import {
+ initPGRComponents,
+ PGRReducers,
+} from "@egovernments/digit-ui-module-pgr";
+import { DigitUI,initCoreComponents } from "@egovernments/digit-ui-module-core";
+import { initDSSComponents } from "@egovernments/digit-ui-module-dss";
 import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
 import { UICustomizations } from "./Customisations/UICustomizations";
-import { initWorkbenchComponents } from "@egovernments/digit-ui-module-workbench";
 import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
-import { initPGRComponents,PGRReducers } from "@egovernments/digit-ui-module-pgr";
+
+
 window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
 
 const enabledModules = [
  "DSS",
- "NDSS",
- "Utilities",
  "HRMS",
- "Engagement",
- "Workbench",
+ "Utilities",
+
+ // "Workbench",
  "PGR"
 ];
 
@@ -23,15 +28,18 @@ const moduleReducers = (initData) => ({
 });
 
 const initDigitUI = () => {
- window.Digit.ComponentRegistryService.setupRegistry({});
+ window.Digit.ComponentRegistryService.setupRegistry({
+ });
+ initPGRComponents();
+ initCoreComponents();
+ initDSSComponents();
+ initHRMSComponents();
+ initUtilitiesComponents();
+
  window.Digit.Customizations = {
  PGR: {},
  commonUiConfig: UICustomizations,
  };
- initHRMSComponents();
- initUtilitiesComponents();
- initWorkbenchComponents();
- initPGRComponents();
 };
 
 initLibraries().then(() => {
@@ -51,7 +59,7 @@ function App() {
  stateCode={stateCode}
  enabledModules={enabledModules}
  moduleReducers={moduleReducers}
- defaultLanding="employee"
+ // defaultLanding="employee"
  />
  );
 }

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

@@ -4,9 +4,10 @@
  "main": "index.js",
  "workspaces": [
  "packages/libraries",
+ "example",
  "packages/react-components",
- "packages/modules/core",
- "packages/modules/workbench"
+ "packages/svg-components",
+ "packages/modules/*"
  ],
  "author": "JaganKumar <[email protected]>",
  "license": "MIT",
@@ -19,38 +20,41 @@
  "sprint": "SKIP_PREFLIGHT_CHECK=true run-s start:script",
  "start:dev": "run-p dev:**",
  "start:script": "./scripts/create.sh",
- "dev:css": "cd packages/css && yarn start",
+ "devD:css": "cd packages/css && yarn start",
  "publish:css": "cd packages/css && yarn publish --access public",
  "dev:libraries": "cd packages/libraries && yarn start",
  "dev:components": "cd packages/react-components && yarn start",
  "dev:example": "cd example && yarn start",
  "dev:core": "cd packages/modules/core && yarn start",
  "dev:dss": "cd packages/modules/dss && yarn start",
  "dev:hrms": "cd packages/modules/hrms && yarn start",
- "dev:pgr": "cd packages/modules/pgr && yarn start",
  "devD:common": "cd packages/modules/common && yarn start",
  "devD:utilities": "cd packages/modules/utilities && yarn start",
- "dev:workbench": "cd packages/modules/workbench && yarn start",
- "dev:engagement": "cd packages/modules/engagement && yarn start",
+ "devD:workbench": "cd packages/modules/workbench && yarn start",
+ "dev:pgr": "cd packages/modules/pgr && yarn start",
+ "devD:openpayment": "cd packages/modules/open-payment && yarn start",
+ "devD:engagement": "cd packages/modules/engagement && yarn start",
+ "devD:sandbox": "cd packages/modules/sandbox && yarn start",
  "build": "run-p build:**",
  "build:libraries": "cd packages/libraries && yarn build",
  "build:components": "cd packages/react-components && yarn build",
  "build:svgcomponents": "cd packages/svg-components && yarn build",
- "buildD:dss": "cd packages/modules/dss && yarn build",
+ "build:dss": "cd packages/modules/dss && yarn build",
  "build:core": "cd packages/modules/core && yarn build",
- "buildD:hrms": "cd packages/modules/hrms && yarn build",
- "buildD:pgr": "cd packages/modules/pgr && yarn build",
+ "build:hrms": "cd packages/modules/hrms && yarn build",
  "buildD:common": "cd packages/modules/common && yarn build",
- "buildD:utilities": "cd packages/modules/utilities && yarn build",
+ "build:utilities": "cd packages/modules/utilities && yarn build",
  "buildD:engagement": "cd packages/modules/engagement && yarn build",
- "build:workbench": "cd packages/modules/workbench && yarn build",
+ "buildD:workbench": "cd packages/modules/workbench && yarn build",
+ "build:pgr": "cd packages/modules/pgr && yarn build",
+ "buildD:openpayment": "cd packages/modules/open-payment && yarn build",
+ "buildD:sandbox": "cd packages/modules/sandbox && yarn build",
  "deploy:jenkins": "./scripts/jenkins.sh",
  "clean": "rm -rf node_modules"
  },
  "resolutions": {
  "**/@babel/runtime": "7.20.1",
  "**/babel-preset-react-app": "10.0.0",
- "**/ajv": "8.11.2",
  "fast-uri":"2.1.0"
  },
  "devDependencies": {
@@ -66,8 +70,8 @@
  "dependencies": {
  "lodash": "4.17.21",
  "microbundle-crl": "0.13.11",
- "@egovernments/digit-ui-react-components": "1.8.1-beta.11",
  "@egovernments/digit-ui-components": "0.0.2-beta.18",
+ "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
  "react": "17.0.2",
  "react-dom": "17.0.2",
  "react-hook-form": "6.15.8",

micro-ui/web/core/package.json

@@ -10,20 +10,18 @@
  "workspaces": [
  "micro-ui-internals/packages/libraries",
  "micro-ui-internals/packages/react-components",
- "micro-ui-internals/packages/modules/core",
- "micro-ui-internals/packages/modules/workbench"
+ "micro-ui-internals/packages/modules/*"
  ],
  "homepage": "/core-ui",
  "dependencies": {
- "@egovernments/digit-ui-components": "0.0.2-beta.18",
  "@egovernments/digit-ui-libraries": "1.8.2-beta.6",
- "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
  "@egovernments/digit-ui-module-core": "1.8.2-beta.13",
- "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
- "@egovernments/digit-ui-module-open-payment":"0.0.1",
  "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
  "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
  "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+ "@egovernments/digit-ui-components": "0.0.2-beta.18",
+ "@egovernments/digit-ui-module-dss": "1.8.1",
+ "@egovernments/digit-ui-module-utilities":"1.0.1-beta.39",
  "babel-loader": "8.1.0",
  "react": "17.0.2",
  "react-dom": "17.0.2",
@@ -33,9 +31,13 @@
  "web-vitals": "1.1.2",
  "react-hook-form": "6.15.8",
  "react-i18next": "11.16.2",
+ "terser-brunch": "^4.1.0",
+ "css-loader": "5.2.6",
+ "style-loader": "2.0.0",
  "react-query": "3.6.1"
  },
  "devDependencies": {
+ "@babel/plugin-proposal-private-property-in-object": "7.21.0",
  "http-proxy-middleware": "1.3.1",
  "lodash": "4.17.21",
  "microbundle-crl": "0.13.11",
@@ -84,4 +86,4 @@
  "last 1 safari version"
  ]
  }
-}
+}

micro-ui/web/core/webpack.config.js

@@ -34,12 +34,12 @@ module.exports = {
  optimization: {
  splitChunks: {
  chunks: 'all',
- minSize:20000,
- maxSize:50000,
- enforceSizeThreshold:50000,
- minChunks:1,
- maxAsyncRequests:30,
- maxInitialRequests:30
+ minSize: 20000,
+ maxSize: 50000,
+ enforceSizeThreshold: 50000,
+ minChunks: 1,
+ maxAsyncRequests: 30,
+ maxInitialRequests: 30
  },
  },
  plugins: [

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

@@ -15,7 +15,7 @@
  "@egovernments/digit-ui-module-dss": "1.8.1",
  "@egovernments/digit-ui-module-core": "1.8.2-beta.13",
  "@egovernments/digit-ui-module-common": "1.8.0",
- "@egovernments/digit-ui-module-hrms": "1.8.0",
+ "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
  "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
  "@egovernments/digit-ui-module-open-payment":"0.0.1",
  "@egovernments/digit-ui-module-engagement": "1.5.20",

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

@@ -11,17 +11,28 @@
  <meta name="theme-color" content="#00bcd1" />
  <title>DIGIT</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/@egovernments/digit-ui-css/dist/index.css"/> -->
  <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
  <script src="%REACT_APP_GLOBAL%"></script>
 
+ <!-- Adding custom style directly in the HTML -->
+<!-- 
+ <style>
+ .custom-margin-bottom .citizen-card-input--front {
+ margin-bottom: 0 !important;
+
+ }
+
+ </style> -->
+
+
 </head>
 
 <body>
  <noscript>You need to enable JavaScript to run this app.</noscript>
  <div id="root"></div>
 </body>
 
-</html>
+</html>

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

@@ -28,7 +28,7 @@
  "dev:example": "cd example && yarn start",
  "dev:core": "cd packages/modules/core && yarn start",
  "devD:dss": "cd packages/modules/dss && yarn start",
- "devD:hrms": "cd packages/modules/hrms && yarn start",
+ "dev:hrms": "cd packages/modules/hrms && yarn start",
  "devD:common": "cd packages/modules/common && yarn start",
  "devD:utilities": "cd packages/modules/utilities && yarn start",
  "dev:workbench": "cd packages/modules/workbench && yarn start",

micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss

@@ -120,7 +120,7 @@
  white-space: nowrap;
  height: calc(100vh - 36px);
  padding-bottom: 5rem;
-
+ padding-left: 0.1rem;
  .actions {
  cursor: pointer;
  display: flex;

micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Complaint.js

@@ -14,11 +14,13 @@ export const Complaint = {
  uploadedImages,
  mobileNumber,
  name,
+
  }) => {
  const tenantId = Digit.ULBService.getCurrentTenantId();
  const defaultData = {
  service: {
  tenantId: cityCode,
+ active :true,
  serviceCode: complaintType,
  description: description,
  additionalDetail: {},
@@ -36,15 +38,24 @@ export const Complaint = {
  },
  geoLocation: {},
  },
+ citizen:{
+ mobileNumber,
+ name,
+ type:"CITIZEN"
+ },
+
+
  },
  workflow: {
  action: "APPLY",
- verificationDocuments: uploadedImages,
+ verificationDocuments: uploadedImages,
+ //action: "CREATE", assignes: [], hrmsAssignes: [], comments: ""
  },
  };
 
+
  if (Digit.SessionStorage.get("user_type") === "employee") {
- defaultData.service.citizen = {
+ defaultData.service.user = {
  name: name,
  type: "CITIZEN",
  mobileNumber: mobileNumber,
@@ -59,6 +70,7 @@ export const Complaint = {
  tenantId: tenantId,
  };
  }
+
  const response = await Digit.PGRService.create(defaultData, cityCode);
  return response;
  },
@@ -79,8 +91,7 @@ export const Complaint = {
  : null;
 
  if (!uploadedDocument) complaintDetails.workflow.verificationDocuments = [];
-
- //TODO: get tenant id
+
  const response = await Digit.PGRService.update(complaintDetails, tenantId);
  return response;
  },

micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js

@@ -1,5 +1,4 @@
 import {
- BackButton,
  CitizenHomeCard,
  CitizenInfoLabel,
  Loader,
@@ -94,8 +93,8 @@ const CitizenHome = ({
  <div className="citizen-all-services-wrapper">
  {location.pathname.includes(
  "sanitation-ui/citizen/all-services"
- ) ? null : (
- <BackButton />
+ // ) ? null : (
+ // <BackButton />
  )}
  <div className="citizenAllServiceGrid">
  {moduleArray

micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LanguageSelection.js

@@ -13,7 +13,7 @@ const LanguageSelection = () => {
  const texts = useMemo(
  () => ({
  header: t("CS_COMMON_CHOOSE_LANGUAGE"),
- submitBarLabel: t("CORE_COMMON_CONTINUE"),
+  submitBarLabel: t("CORE_COMMON_CONTINUE"),
  }),
  [t]
  );
@@ -41,6 +41,13 @@ const LanguageSelection = () => {
  <CardHeader>{t("CS_COMMON_CHOOSE_LANGUAGE")}</CardHeader>
  <RadioButtons {...RadioButtonProps} />
  </PageBasedInput>
+ <style>
+ {`
+ .digit-submit-bar-container {
+ display: none;
+ }
+ `}
+ </style>
  </div>
  );
 };

micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js

@@ -1,4 +1,4 @@
-import { BackButton, CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-components";
+import { CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-react-components";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory, useLocation } from "react-router-dom";
@@ -29,7 +29,7 @@ const LocationSelection = () => {
  return {
  options: cities,
  optionsKey: "i18nKey",
- additionalWrapperClass: "digit-reverse-radio-selection-wrapper",
+ additionalWrapperClass: "reverse-radio-selection-wrapper",
  onSelect: selectCity,
  selectedOption: selectedCity,
  };
@@ -51,7 +51,7 @@ const LocationSelection = () => {
  <loader />
  ) : (
  <div className="selection-card-wrapper">
- <BackButton />
+ {/* <BackButton /> */}
  <PageBasedInput texts={texts} onSubmit={onSubmit} className="location-selection-container">
  <CardHeader>{t("CS_COMMON_CHOOSE_LOCATION")}</CardHeader>
  <SearchOnRadioButtons {...RadioButtonProps} placeholder={t("COMMON_TABLE_SEARCH")} />
@@ -61,4 +61,4 @@ const LocationSelection = () => {
  );
 };
 
-export default LocationSelection;
+export default LocationSelection;