Updated the develop to run in unified-env

.github/workflows/publishUIPackages.yml

@@ -7,8 +7,7 @@ on:
       - 'master'
       # Push events to branches matching refs/heads/mona/octocat
       - 'UAT'
-      - 'MUKTA-v2.1-Develop'
-      - 'MUKTA-DEVELOP-v2.1.1'
+      - 'muktasoft_develop_v2.1.2'
     paths:
       - 'frontend/micro-ui/web/micro-ui-internals/**'
 

frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js

@@ -23,7 +23,7 @@ module.exports = function (app) {
     "/pgr-services",
     "/filestore",
     "/egov-hrms",
-    "/user-otp",
+    "/mukta-user-otp",
     "/user",
     "/fsm",
     "/billing-service",
@@ -43,7 +43,7 @@ module.exports = function (app) {
     "/egov-searcher/bill-genie/seweragebills/_get",
     "/egov-pdf/download/UC/mcollect-challan",
     "/egov-pdf/",
-    "/egov-hrms/employees/_count",
+    "/mukta-egov-hrms/employees/_count",
     "/tl-services/v1/_create",
     "/tl-services/v1/_search",
     "/egov-url-shortening/shortener",
@@ -75,23 +75,23 @@ module.exports = function (app) {
     "/inbox/v2/_search",
     "/individual",
     "/org-services",
-    "/wms/contract/_search",
+    "/wms/mukta-contract/_search",
     "/org-services/organisation/v1/_search",
     "/expensebilling",
     "/bankaccount-service",
     "/wms",
     "/ifms",
-    "/wms/estimate/_search",
-    "/expense-calculator/v1/_estimate",
-    "/expense/bill",
-    "/expense-calculator/purchase/v1/_createbill",
-    "/expense/bill/v1",
+    "/wms/mukta-estimate/_search",
+    "/mukta-expense-calculator/v1/_estimate",
+    "/mukta-expense/bill",
+    "/mukta-expense-calculator/purchase/v1/_createbill",
+    "/mukta-expense/bill/v1",
     "/egov-pdf/bill/_search",
-    "/expense-calculator/v1/_search",
-    "/expense/payment/",
-    "/expense-calculator/",
+    "/mukta-expense-calculator/v1/_search",
+    "/mukta-expense/payment/",
+    "/mukta-expense-calculator/",
     "/measurement-service/",
-    "/mukta-services/",
+    "/mukta-mukta-services/",
     "/mdms-v2/",
     "/egov-idgen/",
     "/rate-analysis/v1/_calculate",

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/expenditure/useMBDataForPB.js

@@ -3,7 +3,7 @@ import { transformEstimateData } from "../../../../modules/Measurement/src/utils
 const useMBDataForPB=({workOrderNumber, tenantId})=>{
 
     const requestCriteriaForMeasurement = {
-        url : "/mukta-services/measurement/_search",
+        url : "/mukta-mukta-services/measurement/_search",
 
         body: {
           "contractNumber" : workOrderNumber,
@@ -39,7 +39,7 @@ const useMBDataForPB=({workOrderNumber, tenantId})=>{
     const { isLoading : isRatesLoading, data : RatesData} = Digit.Hooks.useCustomAPIHook(requestCriteria);
 
      const requestCriteriaBill = {
-        url : "/expense-calculator/v1/_search",
+        url : "/mukta-expense-calculator/v1/_search",
 
         body: {
             "searchCriteria": {

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/mukta/useTEorMBCreateValidation.js

@@ -5,7 +5,7 @@ const useTEorMBCreateValidation=({estimateNumber, tenantId, t})=>{
 
   //To get all the Estimates associated with the contract
   const requestrevisionCriteria = {
-      url: "/estimate/v1/_search",
+      url: "/mukta-estimate/v1/_search",
       params : {tenantId : tenantId , estimateNumber : estimateNumber},
       config : {
         cacheTime : 0,

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js

@@ -18,13 +18,13 @@ const Urls = {
   PGR_Create: `/pgr-services/v2/request/_create`,
   pgr_count: `/pgr-services/v2/request/_count`,
 
-  OTP_Send: "/user-otp/v1/_send",
+  OTP_Send: "/mukta-user-otp/v1/_send",
   Authenticate: "/user/oauth/token",
   RegisterUser: "/user/citizen/_create",
   ChangePassword: "/user/password/nologin/_update",
   ChangePassword1: "/user/password/_update",
   UserProfileUpdate: "/user/profile/_update",
-  EmployeeSearch: "/egov-hrms/employees/_search",
+  EmployeeSearch: "/mukta-egov-hrms/employees/_search",
 
   InboxSearch: "/works-inbox-service/v2/_search",
 
@@ -35,13 +35,13 @@ const Urls = {
 
   works: {
     create: "/loi-service/v1/_create",
-    estimateSearch: "/estimate/v1/_search",
+    estimateSearch: "/mukta-estimate/v1/_search",
     loiSearch: "/loi-service/v1/_search",
-    createEstimate: "/estimate/v1/_create",
-    approvedEstimateSearch: "/estimate/v1/_search",
-    searchEstimate: "/estimate/v1/_search",
+    createEstimate: "/mukta-estimate/v1/_create",
+    approvedEstimateSearch: "/mukta-estimate/v1/_search",
+    searchEstimate: "/mukta-estimate/v1/_search",
     updateLOI: "/loi-service/v1/_update",
-    updateEstimate: "/estimate/v1/_update",
+    updateEstimate: "/mukta-estimate/v1/_update",
     download_pdf: "/egov-pdf/download/WORKSESTIMATE/estimatepdf",
     createProject: "/project/v1/_create",
     searchProject: "/project/v1/_search",
@@ -54,9 +54,9 @@ const Urls = {
   },
 
   contracts: {
-    createWO: "/contract/v1/_create",
-    search: "/contract/v1/_search",
-    update: "/contract/v1/_update",
+    createWO: "/mukta-contract/v1/_create",
+    search: "/mukta-contract/v1/_search",
+    update: "/mukta-contract/v1/_update",
   },
 
   fsm: {
@@ -92,13 +92,13 @@ const Urls = {
     obps_Reciept_Search: "/collection-services/payments/_search",
     billAmendmentSearch: "/billing-service/amendment/_search",
     getBulkPdfRecordsDetails: "/pdf-service/v1/_getBulkPdfRecordsDetails",
-    createPayment: "/expense/payment/v1/_create",
+    createPayment: "/mukta-expense/payment/v1/_create",
     ifms_funds_search : "/ifms-adapter/funds/v1/_search"
   },
   expense:{
-    createPayment: "/expense/payment/v1/_create",
+    createPayment: "/mukta-expense/payment/v1/_create",
     searchPayment: "/mukta-ifix-adapter/v1/pi/_search",
-    updatePayment: "/expense/payment/v1/_update",
+    updatePayment: "/mukta-expense/payment/v1/_update",
     regenerate : '/egov-pdf/bill/_generate',
     searchPaymentWMS:"/wms/mukta-pi/_search",
     updatePI:"/mukta-ifix-adapter/v1/disburse/_create",
@@ -136,10 +136,10 @@ const Urls = {
     count: "/echallan-services/eChallan/v1/_count",
   },
   hrms: {
-    search: "/egov-hrms/employees/_search",
-    count: "/egov-hrms/employees/_count",
-    create: "/egov-hrms/employees/_create",
-    update: "/egov-hrms/employees/_update",
+    search: "/mukta-egov-hrms/employees/_search",
+    count: "/mukta-egov-hrms/employees/_count",
+    create: "/mukta-egov-hrms/employees/_create",
+    update: "/mukta-egov-hrms/employees/_update",
   },
   tl: {
     create: "/tl-services/v1/_create",
@@ -152,7 +152,7 @@ const Urls = {
   receipts: {
     receipt_download: "/egov-pdf/download/PAYMENT/consolidatedreceipt",
     payments: "/collection-services/payments",
-    count: "/egov-hrms/employees/_count",
+    count: "/mukta-egov-hrms/employees/_count",
   },
   obps: {
     scrutinyDetails: "/edcr/rest/dcr/scrutinydetails",
@@ -235,11 +235,11 @@ const Urls = {
   },
 
   wageseeker: {
-    create: "/individual/v1/_create",
-    search: "/individual/v1/_search",
-    wmssearch: "/wms/individual/_search",
-    update: "/individual/v1/_update",
-    delete: "/individual/v1/_delete",
+    create: "/mukta-individual/v1/_create",
+    search: "/mukta-individual/v1/_search",
+    wmssearch: "/wms/mukta-individual/_search",
+    update: "/mukta-individual/v1/_update",
+    delete: "/mukta-individual/v1/_delete",
   },
 
   noc: {
@@ -251,9 +251,9 @@ const Urls = {
   bills: {
     cancelBill: "/billing-service/bill/v2/_cancelbill",
     createBill: "/expensebilling/demand/v1/_create",
-    searchBill: "/expense/bill/v1/_search",
-    createPurchaseBill: "/expense-calculator/purchase/v1/_createbill",
-    updatePurchaseBill:"/expense-calculator/purchase/v1/_updatebill"
+    searchBill: "/mukta-expense/bill/v1/_search",
+    createPurchaseBill: "/mukta-expense-calculator/purchase/v1/_createbill",
+    updatePurchaseBill:"/mukta-expense-calculator/purchase/v1/_updatebill"
   },
 
   organisation: {
@@ -272,12 +272,12 @@ const Urls = {
   billgenie: "/egov-searcher",
 
   bill: {
-    search: "/expense/bill/v1/_search",
-    searchCalculator: "/expense-calculator/v1/_search",
+    search: "/mukta-expense/bill/v1/_search",
+    searchCalculator: "/mukta-expense-calculator/v1/_search",
   },
 
   calculator: {
-    expenseBill: "/expense-calculator/v1/_estimate",
+    expenseBill: "/mukta-expense-calculator/v1/_estimate",
   },
 
   measurement : {

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Measurement/View.js

@@ -157,7 +157,7 @@ export const View = {
   fetchMeasurementDetails: async (t, tenantId, data, searchParams, revisedWONumber) => {
     try {
 
-      const url = "/mukta-services/measurement/_search"
+      const url = "/mukta-mukta-services/measurement/_search"
 
       const allData = await CustomService.getResponse({
         url, 

frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js

@@ -28,7 +28,7 @@ const ViewAttendance = () => {
   const {isLoading, data, isError, isSuccess, error} = Digit.Hooks.attendance.useViewAttendance(tenantId, { musterRollNumber },{},isStateChanged);
 
   const requestCriteria = {
-    url : "/mukta-services/musterRollValidations/_validate",
+    url : "/mukta-mukta-services/musterRollValidations/_validate",
 
     body: {
       "tenantId" : tenantId,

frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/components/TimeExtension/CreateTimeExtension.js

@@ -60,7 +60,7 @@ const CreateTimeExtension = ({isEdit,revisedWONumber,...props}) => {
   }, [approvers]);
 
   const reqCriteriaUpdate = {
-    url: isEdit ? `/contract/v1/_update` : `/contract/v1/_create`,
+    url: isEdit ? `/mukta-contract/v1/_update` : `/mukta-contract/v1/_create`,
     params: {},
     body: {},
     config: {

frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/configs/searchContractConfig.js

@@ -4,7 +4,7 @@ return  {
   "label": "WORKS_SEARCH_CONTRACT",
   "type": "search",
   "apiDetails": {
-    "serviceName": "/wms/contract/_search",
+    "serviceName": "/wms/mukta-contract/_search",
     "requestParam": {},
     "requestBody": {
       "inbox": {

frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/ViewContractDetails.js

@@ -91,7 +91,7 @@ const ViewContractDetails = () => {
 
     //fetching measurement data
     const requestCriteria = {
-        url : "/mukta-services/measurement/_search",
+        url : "/mukta-mukta-services/measurement/_search",
 
         body: {
           "contractNumber" : contractId,

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/SearchConficMuktaFuzzy.js

@@ -3,7 +3,7 @@ const searchConfigMuktaFuzzy = () => {
     "label": "WORKS_SEARCH_ESTIMATES",
     "type": "search",
     "apiDetails": {
-      "serviceName": "/wms/estimate/_search",
+      "serviceName": "/wms/mukta-estimate/_search",
       "requestParam": {},
       "requestBody": {
         "inbox": {

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/inboxConfig.js

@@ -3,7 +3,7 @@
         label: "ACTION_TEST_ESTIMATE_INBOX",
         type: 'inbox',
         apiDetails: {
-            serviceName: "/estimate/v1/_search",
+            serviceName: "/mukta-estimate/v1/_search",
             requestParam: {
 
             },

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfig.js

@@ -3,7 +3,7 @@ const searchConfig = () => {
         label: "WORKS_SEARCH_ESTIMATES",
         type: 'search',
         apiDetails: {
-            serviceName: "/estimate/v1/_search",
+            serviceName: "/mukta-estimate/v1/_search",
             requestParam: {
 
             },

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfigMukta.js

@@ -3,7 +3,7 @@ const searchConfigMukta = () => {
             "label": "WORKS_SEARCH_ESTIMATES",
             "type": "search",
             "apiDetails": {
-                "serviceName": "/estimate/v1/_search",
+                "serviceName": "/mukta-estimate/v1/_search",
                 "requestParam": {},
                 "requestBody": {},
                 "minParametersForSearchForm": 1,

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewConfig.js

@@ -193,7 +193,7 @@ export const data = (projectDetails, estimateDetails, overheadDetails, revisionN
             applicationNo: revisionNumber ? revisionNumber : estimateDetails?.estimateNumber,
             tenantId: estimateDetails?.tenantId,
             applicationDetails: estimateDetails,
-            url: "/estimate/v1/_update",
+            url: "/mukta-estimate/v1/_update",
             moduleCode: "Estimate",
             editApplicationNumber: undefined,
             editCallback : getRedirectionCallback

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js

@@ -86,7 +86,7 @@ const CreateEstimate = ({ props }) => {
 
   //fetching all the estimates for revision original values
   const requestrevisionCriteria = {
-    url: "/estimate/v1/_search",
+    url: "/mukta-estimate/v1/_search",
     params: { tenantId: tenantId, estimateNumber: estimateNumber },
     config: {
       cacheTime: 0,

frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewDetailedEstimate.js

@@ -25,7 +25,7 @@ const ViewDetailedEstimate = () => {
   Digit.Hooks.useClickOutside(menuRef, closeMenu, showActions);
 
   const requestCriteria = {
-    url: "/estimate/v1/_search",
+    url: "/mukta-estimate/v1/_search",
     params : revisionNumber ? {tenantId : tenantId , revisionNumber : revisionNumber} : {tenantId : tenantId , estimateNumber : estimateNumber}
   };
 
@@ -34,7 +34,7 @@ const ViewDetailedEstimate = () => {
 
   //fetching all the estimates for revision original values
   const requestrevisionCriteria = {
-    url: "/estimate/v1/_search",
+    url: "/mukta-estimate/v1/_search",
     params : {tenantId : tenantId , estimateNumber : estimateNumber},
     config : {
       cacheTime : 0

frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/CreatePAWMSConfig.js

@@ -7,7 +7,7 @@ export const CreatePAWMSConfig = {
       "type": "search",
       "actionRole": "BILL_ACCOUNTANT",
       "apiDetails": {
-        "serviceName": "/wms/expense/_search",
+        "serviceName": "/wms/mukta-expense/_search",
         "requestParam": {},
         "requestBody": {
           "inbox": {

frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/InboxPaymentInstructionConfig.js

@@ -7,7 +7,7 @@ export const InboxPaymentInstructionConfig = {
       "postProcessResult": false,
       "type": "inbox",
       "apiDetails": {
-        "serviceName": "/expense/payment/v1/_search",
+        "serviceName": "/mukta-expense/payment/v1/_search",
         "requestParam": {},
         "requestBody": {
           "paymentCriteria": {

frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillConfig.js

@@ -9,7 +9,7 @@ export const SearchBillConfig = {
         "actionRole": "BILL_ACCOUNTANT",
         "actionLink": "expenditure/download-bill",
         "apiDetails": {
-          "serviceName": "/expense-calculator/v1/_search",
+          "serviceName": "/mukta-expense-calculator/v1/_search",
           "requestParam": {},
           "requestBody": {
             "searchCriteria": {}

frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillWMSConfig.js

@@ -9,7 +9,7 @@ export const SearchBillWMSConfig = {
             actionRole: "BILL_CREATOR",
             actionLink: "expenditure/download-bill",
             apiDetails: {
-                serviceName: "/wms/expense/_search",
+                serviceName: "/wms/mukta-expense/_search",
                 requestParam: {},
                 requestBody: {
                     inbox: {

frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchExpenseBillConfig.js

@@ -9,7 +9,7 @@ export const SearchExpenseBillConfig = {
             actionRole: "BILL_CREATOR",
             actionLink: "expenditure/download-bill",
             apiDetails: {
-                serviceName: "/expense/bill/v1/_search",
+                serviceName: "/mukta-expense/bill/v1/_search",
                 requestParam: {},
                 requestBody: {
                     billCriteria: {}

frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js

@@ -6,7 +6,7 @@ const searchWMSWageSeekerConfig = () => {
       "actionRole": "INDIVIDUAL_CREATOR",
       "actionLink": "masters/create-wageseeker",
       "apiDetails": {
-        "serviceName": "/wms/individual/_search",
+        "serviceName": "/wms/mukta-individual/_search",
         "requestParam": {},
         "requestBody": {
           "inbox": {