From a78c6e4f51934c27505b8574dcd3fda9286e0f00 Mon Sep 17 00:00:00 2001 From: Tulika-eGov Date: Fri, 8 Nov 2024 15:39:18 +0530 Subject: [PATCH 1/2] Updated the develop to run in unified-env --- .github/workflows/publishUIPackages.yml | 1 + .../example/src/setupProxy.js | 24 ++++---- .../src/hooks/expenditure/useMBDataForPB.js | 4 +- .../hooks/mukta/useTEorMBCreateValidation.js | 2 +- .../libraries/src/services/atoms/urls.js | 58 +++++++++---------- .../services/molecules/Measurement/View.js | 2 +- .../viewAttendance/ViewAttendances.js | 2 +- .../TimeExtension/CreateTimeExtension.js | 2 +- .../src/configs/searchContractConfig.js | 2 +- .../src/pages/employee/ViewContractDetails.js | 2 +- .../src/configs/SearchConficMuktaFuzzy.js | 2 +- .../Estimate/src/configs/inboxConfig.js | 2 +- .../Estimate/src/configs/searchConfig.js | 2 +- .../Estimate/src/configs/searchConfigMukta.js | 2 +- .../Estimate/src/configs/viewConfig.js | 2 +- .../CreateDetailedEstimate/CreateEstimate.js | 2 +- .../pages/employee/ViewDetailedEstimate.js | 4 +- .../src/configs/CreatePAWMSConfig.js | 2 +- .../configs/InboxPaymentInstructionConfig.js | 2 +- .../src/configs/SearchBillConfig.js | 2 +- .../src/configs/SearchBillWMSConfig.js | 2 +- .../src/configs/SearchExpenseBillConfig.js | 2 +- .../src/configs/searchWMSWageSeekerConfig.js | 2 +- .../src/configs/searchWageSeekerConfig.js | 2 +- .../src/components/MBHistoryTable.js | 2 +- .../src/pages/employee/CreateMeasurement.js | 2 +- .../src/pages/employee/ViewMeasurement.js | 2 +- .../Project/src/pages/employee/SampleComp.js | 2 +- .../src/hoc/ViewComposer/index.js | 2 +- .../web/micro-ui-internals/publish.sh | 20 +++---- frontend/micro-ui/web/src/setupProxy.js | 18 +++--- frontend/works_shg_app/lib/services/urls.dart | 22 +++---- 32 files changed, 100 insertions(+), 99 deletions(-) diff --git a/.github/workflows/publishUIPackages.yml b/.github/workflows/publishUIPackages.yml index dfea95e621..720d3c726a 100644 --- a/.github/workflows/publishUIPackages.yml +++ b/.github/workflows/publishUIPackages.yml @@ -9,6 +9,7 @@ on: - 'UAT' - 'MUKTA-v2.1-Develop' - 'MUKTA-DEVELOP-v2.1.1' + - 'muktasoft_develop_v2.1.2' paths: - 'frontend/micro-ui/web/micro-ui-internals/**' diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js index 33b87ec4c7..386f6ead35 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js +++ b/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", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/expenditure/useMBDataForPB.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/expenditure/useMBDataForPB.js index 0bee9dce71..b41afa614d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/expenditure/useMBDataForPB.js +++ b/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": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/mukta/useTEorMBCreateValidation.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/mukta/useTEorMBCreateValidation.js index 22e16f9762..e44bd935af 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/mukta/useTEorMBCreateValidation.js +++ b/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, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js index 984d7158c5..328481de22 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js +++ b/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 : { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Measurement/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Measurement/View.js index cafd92699f..df9d289032 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Measurement/View.js +++ b/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, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js index 4df4cc6e42..1717d1e376 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js +++ b/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, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/components/TimeExtension/CreateTimeExtension.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/components/TimeExtension/CreateTimeExtension.js index 5ec447398f..e237fdfb43 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/components/TimeExtension/CreateTimeExtension.js +++ b/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: { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/configs/searchContractConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/configs/searchContractConfig.js index be738091dd..347ca52003 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/configs/searchContractConfig.js +++ b/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": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/ViewContractDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/ViewContractDetails.js index ca946fde2f..1829627cde 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/ViewContractDetails.js +++ b/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, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/SearchConficMuktaFuzzy.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/SearchConficMuktaFuzzy.js index 9bc99ea723..50e3d937ee 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/SearchConficMuktaFuzzy.js +++ b/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": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/inboxConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/inboxConfig.js index ebed2fb623..c01e992be4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/inboxConfig.js +++ b/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: { }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfig.js index 958f20c46e..deb3ad5d17 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfig.js +++ b/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: { }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfigMukta.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfigMukta.js index fbc1b4fdf5..1bc67283f8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/searchConfigMukta.js +++ b/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, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewConfig.js index fbaa50bf01..817920dba5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewConfig.js +++ b/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 diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js index 30ff42e88b..f5691dad88 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js +++ b/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, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewDetailedEstimate.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewDetailedEstimate.js index 12803fbd35..0107c44bb8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewDetailedEstimate.js +++ b/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 diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/CreatePAWMSConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/CreatePAWMSConfig.js index 6d9c7dd232..d95765d469 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/CreatePAWMSConfig.js +++ b/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": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/InboxPaymentInstructionConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/InboxPaymentInstructionConfig.js index 3d8dc190e6..df0b25d935 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/InboxPaymentInstructionConfig.js +++ b/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": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillConfig.js index 33e6c131bb..0e6155c2b2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillConfig.js +++ b/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": {} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillWMSConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillWMSConfig.js index 70cbb9788c..bda8269e3b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchBillWMSConfig.js +++ b/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: { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchExpenseBillConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchExpenseBillConfig.js index e26534aeb7..3ccd28ada1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/SearchExpenseBillConfig.js +++ b/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: {} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js index 7b93700c4e..32fd707564 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js +++ b/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": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWageSeekerConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWageSeekerConfig.js index 960fd519e1..191c373c48 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWageSeekerConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWageSeekerConfig.js @@ -6,7 +6,7 @@ const searchWageSeekerConfig = () => { actionRole: "INDIVIDUAL_CREATOR", actionLink: "masters/create-wageseeker", apiDetails: { - serviceName: "/individual/v1/_search", + serviceName: "/mukta-individual/v1/_search", requestParam: {}, requestBody: { apiOperation: "SEARCH", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MBHistoryTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MBHistoryTable.js index 609e4b4282..455952fe2d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MBHistoryTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MBHistoryTable.js @@ -25,7 +25,7 @@ const MeasurementHistory = ({ contractNumber, measurementNumber }) => { }; const requestCriteria = { - url : "/mukta-services/measurement/_search", + url : "/mukta-mukta-services/measurement/_search", body: { "contractNumber" : contractNumber, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/CreateMeasurement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/CreateMeasurement.js index 2b31ef9edf..7e727dd7cf 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/CreateMeasurement.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/CreateMeasurement.js @@ -57,7 +57,7 @@ const CreateMeasurement = ({ props }) => { // for BFF service const requestCriteria = { - url: "/mukta-services/measurement/_search", + url: "/mukta-mukta-services/measurement/_search", body: { contractNumber: contractNumber, tenantId: tenantId, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/ViewMeasurement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/ViewMeasurement.js index f3bc6cb1bc..6443a22b68 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/ViewMeasurement.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/ViewMeasurement.js @@ -11,7 +11,7 @@ const ViewMeasurement = () => { const [thumbnails, setThumbnails] = useState("") const requestCriteria = { - url: "/mukta-services/measurement/_search", + url: "/mukta-mukta-services/measurement/_search", body: { contractNumber: workOrderNumber, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/SampleComp.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/SampleComp.js index 58b1158752..7c6b5206b1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/SampleComp.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/SampleComp.js @@ -342,7 +342,7 @@ const data = { project: null, ProcessInstances: null, }, - url: "/estimate/v1/_update", + url: "/mukta-estimate/v1/_update", moduleCode: "Estimate", editApplicationNumber: undefined, }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js index a8b3669f1e..7897bce478 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js @@ -97,7 +97,7 @@ import {Card,Divider,TextBlock,Tab} from "@egovernments/digit-ui-components"; // applicationNo: "ES/2023-24/000828", // tenantId: "pg.citya", // applicationDetails: {}, -// url: "/estimate/v1/_update", +// url: "/mukta-estimate/v1/_update", // moduleCode: "Estimate", // editApplicationNumber: undefined, // }, diff --git a/frontend/micro-ui/web/micro-ui-internals/publish.sh b/frontend/micro-ui/web/micro-ui-internals/publish.sh index a0d925471a..8fc8ed62bb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/publish.sh +++ b/frontend/micro-ui/web/micro-ui-internals/publish.sh @@ -17,7 +17,7 @@ yarn # sleep 5 msg "Building and publishing css" -cd "$BASEDIR/packages/css" && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/css" && yarn&& npm publish --tag mukta-2.1.2 # sleep 10 # msg "Updating dependencies" @@ -25,28 +25,28 @@ cd "$BASEDIR/packages/css" && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 # sleep 5 msg "Building and publishing AttendenceMgmt module" -cd "$BASEDIR/packages/modules/AttendenceMgmt" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/AttendenceMgmt" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2 msg "Building and publishing Expenditure module" -cd "$BASEDIR/packages/modules/Expenditure" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/Expenditure" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2 msg "Building and publishing RateAnalysis module" -cd "$BASEDIR/packages/modules/RateAnalysis" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/RateAnalysis" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2 msg "Building and publishing Contracts module" -cd "$BASEDIR/packages/modules/Contracts" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/Contracts" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2 msg "Building and publishing Masters module" -cd "$BASEDIR/packages/modules/Masters" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/Masters" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2 msg "Building and publishing Works module" -cd "$BASEDIR/packages/modules/works" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/works" && rm -rf node_modules && rm -rf dist && yarn&& npm publish --tag mukta-2.1.2 msg "Building and publishing Project module" -cd "$BASEDIR/packages/modules/Project" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/Project" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag mukta-2.1.2 msg "Building and publishing Estimate module" -cd "$BASEDIR/packages/modules/Estimate" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/Estimate" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag mukta-2.1.2 msg "Building and publishing Measurement module" -cd "$BASEDIR/packages/modules/Measurement" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag mukta-2.1.2-uicomp-v0.2 +cd "$BASEDIR/packages/modules/Measurement" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag mukta-2.1.2 diff --git a/frontend/micro-ui/web/src/setupProxy.js b/frontend/micro-ui/web/src/setupProxy.js index d15e20a6d8..71c444c218 100644 --- a/frontend/micro-ui/web/src/setupProxy.js +++ b/frontend/micro-ui/web/src/setupProxy.js @@ -13,7 +13,7 @@ module.exports = function (app) { '/contract', '/filestore', '/egov-hrms', - '/user-otp', + '/mukta-user-otp', '/user', '/fsm', '/billing-service', @@ -29,17 +29,17 @@ module.exports = function (app) { '/inbox/v2/_search', '/individual', '/org-services', - '/wms/contract/_search', + '/wms/mukta-contract/_search', '/contract', '/expensebilling', '/bankaccount-service', - '/expense-calculator/v1/_estimate', - '/expense-calculator/purchase/v1/_createbill', - '/expense/bill/v1', + '/mukta-expense-calculator/v1/_estimate', + '/mukta-expense-calculator/purchase/v1/_createbill', + '/mukta-expense/bill/v1', '/egov-pdf/bill/_search', - '/expense/bill', - "/expense-calculator/v1/_search", - "/expense/payment/v1/_create", - "/expense-calculator/purchase/v1/_updatebill" + '/mukta-expense/bill', + "/mukta-expense-calculator/v1/_search", + "/mukta-expense/payment/v1/_create", + "/mukta-expense-calculator/purchase/v1/_updatebill" ].forEach((location) => app.use(location, createProxy)); }; diff --git a/frontend/works_shg_app/lib/services/urls.dart b/frontend/works_shg_app/lib/services/urls.dart index 88fb966713..39bdd6757a 100644 --- a/frontend/works_shg_app/lib/services/urls.dart +++ b/frontend/works_shg_app/lib/services/urls.dart @@ -37,14 +37,14 @@ class ORGServices { class BillServices { const BillServices(); - String get searchMyBills => '/expense-calculator/v1/_search'; + String get searchMyBills => '/mukta-expense-calculator/v1/_search'; } class WageSeekerServices { const WageSeekerServices(); // unified-qa // String get individualCreate => 'mukta-individual/v1/_create'; - String get individualCreate => 'individual/v1/_create'; + String get individualCreate => 'mukta-individual/v1/_create'; String get bankCreate => '/bankaccount-service/bankaccount/v1/_create'; String get adharVerifyUrl=>'http://164.100.141.79/authekycv4/api/authenticate'; @@ -62,19 +62,19 @@ class UserServices { const UserServices(); String get authenticate => 'user/oauth/token'; String get resetPassword => 'user/password/nologin/_update'; - String get otpResetPassword => 'user-otp/v1/_send'; + String get otpResetPassword => 'mukta-user-otp/v1/_send'; String get userSearchProfile => 'user/_search'; String get editProfile => 'user/profile/_update'; String get changePassword => 'user/password/_update'; - String get sendOtp => 'user-otp/v1/_send'; + String get sendOtp => 'mukta-user-otp/v1/_send'; String get logOut => 'user/_logout'; } class WorkServices { const WorkServices(); - String get myWorks => 'contract/v1/_search'; - String get updateWorkOrder => 'contract/v1/_update'; - String get createWorkOrder => 'contract/v1/_create'; + String get myWorks => 'mukta-contract/v1/_search'; + String get updateWorkOrder => 'mukta-contract/v1/_update'; + String get createWorkOrder => 'mukta-contract/v1/_create'; } @@ -106,8 +106,8 @@ class AttendanceRegisterServices { String get createAttendanceLog => 'attendance/log/v1/_create'; String get updateAttendanceLog => 'attendance/log/v1/_update'; String get deEnrollAttendee => 'attendance/attendee/v1/_delete'; - String get individualSearch => 'individual/v1/_search'; - String get wmsIndividualSearch => 'wms/individual/_search'; + String get individualSearch => 'mukta-individual/v1/_search'; + String get wmsIndividualSearch => 'wms/mukta-individual/_search'; // // unified-qa // String get createAttendanceRegister => 'attendance/v1/_create'; @@ -127,7 +127,7 @@ class MeasurementService{ const MeasurementService(); String get measurementInbox=>'inbox/v2/_search'; - String get measurementDetail=>"mukta-services/measurement/_search"; + String get measurementDetail=>"mukta-mukta-services/measurement/_search"; String get updateMeasurement => "measurement-service/v1/_update"; String get createMeasurement=>"measurement-service/v1/_create"; } @@ -138,6 +138,6 @@ class MeasurementService{ class EstimateService{ const EstimateService(); - String get estimateSearch=>'estimate/v1/_search'; + String get estimateSearch=>'mukta-estimate/v1/_search'; } From e353a1143a2da9d3e4cd81ecfb3b7aba487f6c1f Mon Sep 17 00:00:00 2001 From: Tulika-eGov Date: Fri, 8 Nov 2024 15:54:32 +0530 Subject: [PATCH 2/2] Removing the unwanted develop file --- .github/workflows/publishUIPackages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publishUIPackages.yml b/.github/workflows/publishUIPackages.yml index 720d3c726a..c2ff0310b3 100644 --- a/.github/workflows/publishUIPackages.yml +++ b/.github/workflows/publishUIPackages.yml @@ -7,8 +7,6 @@ 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/**'