RAIN-3253 : DIGIT-2.5 Release changes and sem version incremented to …

…1.3.0 (#28)

* added paymentconfig to componentRegistryService

* fixed build failure

* Add quick pay links in the enabledModules

* changed source branch to bug/fsm-hotfixes-3

* reverted back to development branch as source

* added DSS module

* added dss initializations

* imported PT components

* Added and enabled Mcollect module

* Digit UI Added , enabled HRMS and TL Modules

* RAIN-2725 : Digit UI Added Receipts Module

* Initial commit for develop branch

* Create CODEOWNERS

* Revert the deletion of yarnlock file (#26)

* Revert the deletion of yarnlock file

This reverts commit aa221d2.

* modified branch name to develop from dev

* RAIN-3253 : DIGIT-2.5  Release sem version incremented to 1.3.0

* Updated the branch to build as Main for master branch

Co-authored-by: ssaurabh <[email protected]>
Co-authored-by: Ayan Majumder <[email protected]>
Co-authored-by: abhinav-egov <[email protected]>
Co-authored-by: saurabh-egov <[email protected]>
Co-authored-by: nikesh-eGov <[email protected]>

package.json

@@ -1,4 +1,4 @@
 {
   "name": "digit-ui",
-  "version": "1.2.0"
+  "version": "1.3.0"
 }

web/install-deps.sh

@@ -4,11 +4,11 @@ BRANCH="$(git branch --show-current)"
 
 echo "Main Branch: $BRANCH"
 
-if [ "$BRANCH" != "dev" ] || [ "$BRANCH" != "master" ]; then
+if [ "$BRANCH" != "develop" ] || [ "$BRANCH" != "master" ]; then
 
   INTERNALS="digit-ui-internals"
   rm -rf $INTERNALS
-  git clone -b development https://github.com/egovernments/digit-ui-internals.git $INTERNALS
+  git clone -b main https://github.com/egovernments/digit-ui-internals.git $INTERNALS
   cd $INTERNALS && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && yarn && yarn build && find . -name "node_modules" -type d -prune -print -exec rm -rf '{}' \;
   cd ..
 

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "digit-ui",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "private": true,
   "workspaces": [
     "digit-ui-internals/packages/*",
@@ -9,13 +9,17 @@
   "homepage": "/digit-ui",
   "dependencies": {
     "@egovernments/digit-ui-css": "^1.0.0",
-    "@egovernments/digit-ui-libraries": "^1.0.0",
-    "@egovernments/digit-ui-module-common": "^1.0.0",
-    "@egovernments/digit-ui-module-core": "^1.0.0",
-    "@egovernments/digit-ui-module-fsm": "^1.0.0",
-    "@egovernments/digit-ui-module-pgr": "^1.0.0",
-    "@egovernments/digit-ui-module-pt": "^1.0.0",
-    "@egovernments/digit-ui-react-components": "^1.0.0",
+    "@egovernments/digit-ui-libraries": "^1.3.0",
+    "@egovernments/digit-ui-module-common": "^1.3.0",
+    "@egovernments/digit-ui-module-core": "^1.3.0",
+    "@egovernments/digit-ui-module-fsm": "^1.3.0",
+    "@egovernments/digit-ui-module-pgr": "^1.3.0",
+    "@egovernments/digit-ui-module-pt": "^1.3.0",
+    "@egovernments/digit-ui-module-mcollect": "^1.3.0",
+    "@egovernments/digit-ui-module-tl": "^1.3.0",
+    "@egovernments/digit-ui-module-hrms": "^1.3.0",
+    "@egovernments/digit-ui-module-receipts": "^1.3.0",
+    "@egovernments/digit-ui-react-components": "^1.3.0",
     "babel-loader": "8.1.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

web/src/App.js

@@ -3,24 +3,40 @@ import React from 'react';
 import { initPGRComponents, PGRReducers } from "@egovernments/digit-ui-module-pgr";
 import { initFSMComponents } from "@egovernments/digit-ui-module-fsm";
 import { PTModule, PTLinks, PTComponents } from "@egovernments/digit-ui-module-pt";
+import { MCollectModule, MCollectLinks, initMCollectComponents } from "@egovernments/digit-ui-module-mcollect";
+import { initDSSComponents } from "@egovernments/digit-ui-module-dss";
 import { PaymentModule, PaymentLinks, paymentConfigs } from "@egovernments/digit-ui-module-common";
 import { DigitUI } from "@egovernments/digit-ui-module-core";
 import { initLibraries } from "@egovernments/digit-ui-libraries";
+import { HRMSModule ,initHRMSComponents  } from "@egovernments/digit-ui-module-hrms";
+import { TLModule, TLLinks,initTLComponents } from "@egovernments/digit-ui-module-tl";
+import { initReceiptsComponents, ReceiptsModule } from "@egovernments/digit-ui-module-receipts";
 
 initLibraries();
 
-const enabledModules = ["PGR", "FSM", "Payment","PT", "QuickPayLinks"];
+const enabledModules = ["PGR", "FSM", "Payment", "PT", "QuickPayLinks", "DSS", "MCollect","HRMS", "TL","Receipts"];
 window.Digit.ComponentRegistryService.setupRegistry({
-  PaymentModule,
-  PaymentLinks,
   ...paymentConfigs,
   PTModule,
   PTLinks,
+  PaymentModule,
+  PaymentLinks,
   ...PTComponents,
+  MCollectLinks,
+  MCollectModule,
+  HRMSModule,
+  TLModule,
+  TLLinks,
+  ReceiptsModule
 });
 
 initPGRComponents();
 initFSMComponents();
+initDSSComponents();
+initMCollectComponents();
+initHRMSComponents()
+initTLComponents();
+initReceiptsComponents();
 
 const moduleReducers = (initData) => ({
   pgr: PGRReducers(initData),

web/yarn.lock

@@ -3417,9 +3417,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.1.tgz#dac101898a87f8ebb57fea69617e8096523c628c"
-  integrity sha512-46ZA4TalFcLLqX1dEU3dhdY38wAtDydJ4e7QQTVekLUTzXkb1LfqU6VOBXC/a9wiv4T094WURqJH6ZitF92Kqw==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.2.tgz#1396e27f208ed56dd5638ab5a251edeb1c91d402"
+  integrity sha512-V0HGxJd0PiDF0ecHYIesTOqfd1gJguwQUOYfMfAWnRsWQEXfc5ifbUFhD3Wjc+O+y7VAqL+g07prq9gHQ/JOZQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -5501,27 +5501,27 @@ copy-to-clipboard@^3.3.1:
     toggle-selection "^1.0.6"
 
 core-js-compat@^3.6.2, core-js-compat@^3.8.1, core-js-compat@^3.9.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455"
-  integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.0.tgz#3600dc72869673c110215ee7a005a8609dea0fe1"
+  integrity sha512-9yVewub2MXNYyGvuLnMHcN1k9RkvB7/ofktpeKTIaASyB88YYqGzUnu0ywMMhJrDHOMiTjSHWGzR+i7Wb9Z1kQ==
   dependencies:
     browserslist "^4.16.3"
     semver "7.0.0"
 
 core-js-pure@^3.0.0, core-js-pure@^3.8.2:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.9.1.tgz#677b322267172bd490e4464696f790cbc355bec5"
-  integrity sha512-laz3Zx0avrw9a4QEIdmIblnVuJz8W51leY9iLThatCsFawWxC3sE4guASC78JbCin+DkwMpCdp1AVAuzL/GN7A==
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.0.tgz#dab9d6b141779b622b40567e7a536d2276646c15"
+  integrity sha512-CC582enhrFZStO4F8lGI7QL3SYx7/AIRc+IdSi3btrQGrVsTawo5K/crmKbRrQ+MOMhNX4v+PATn0k2NN6wI7A==
 
 core-js@^2.4.0:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
-  integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.0.tgz#9a020547c8b6879f929306949e31496bbe2ae9b3"
+  integrity sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==
 
 [email protected], core-util-is@~1.0.0:
   version "1.0.2"