From 385f65eea50f88effeaa5a551352b429979928c5 Mon Sep 17 00:00:00 2001 From: Swathi-eGov Date: Mon, 30 Sep 2024 19:36:36 +0530 Subject: [PATCH] redirection issue fix, breadcrumb update --- .../micro-ui-internals/example/package.json | 20 +++++----- .../example/public/index.html | 2 +- .../example/src/UICustomizations.js | 6 --- .../packages/Mukta/package.json | 4 +- .../Mukta/src/configs/UICustomizations.js | 38 +++++++++---------- .../packages/css/package.json | 2 +- .../packages/css/src/index.scss | 3 +- .../css/src/pages/employee/override.scss | 8 +++- .../css/src/pages/works/inboxSearch.scss | 4 +- .../packages/libraries/package.json | 2 +- .../modules/AttendenceMgmt/package.json | 4 +- .../src/pages/employee/index.js | 5 ++- .../packages/modules/Contracts/package.json | 4 +- .../src/pages/employee/CreateContract.js | 3 -- .../src/pages/employee/ViewContractDetails.js | 2 - .../Contracts/src/pages/employee/index.js | 5 ++- .../packages/modules/Estimate/package.json | 4 +- .../src/components/ViewTotalEstAmount.js | 1 - .../Estimate/src/pageComponents/SearchBar.js | 1 - .../CreateDetailedEstimate/CreateEstimate.js | 5 ++- .../Estimate/src/pages/employee/index.js | 4 +- .../packages/modules/Expenditure/package.json | 4 +- .../pages/employee/Payments/ViewPayment.js | 1 - .../Payments/viewPaymentInstruction.js | 1 - .../Expenditure/src/pages/employee/index.js | 5 ++- .../packages/modules/Masters/package.json | 4 +- .../Masters/src/pages/employee/index.js | 5 ++- .../packages/modules/Measurement/package.json | 4 +- .../Measurement/src/pages/employee/index.js | 5 ++- .../packages/modules/Project/package.json | 4 +- .../Project/src/pages/employee/index.js | 5 ++- .../modules/RateAnalysis/package.json | 4 +- .../components/PropertyDocuments.js | 1 - .../packages/react-components/package.json | 2 +- .../src/atoms/SearchComponent.js | 1 - .../src/atoms/WorkflowTimeline.js | 3 -- .../react-components/src/hoc/FormComposer.js | 21 ++++++---- .../src/hoc/InboxSearchComposer.js | 12 ++++-- .../src/hoc/ViewComposer/index.js | 1 - .../src/molecules/ApiDropdown.js | 10 ++--- .../src/molecules/RenderFormFields.js | 1 - frontend/micro-ui/web/package.json | 20 +++++----- frontend/micro-ui/web/public/index.html | 4 +- .../src/Customisations/UICustomizations.js | 5 --- 44 files changed, 124 insertions(+), 126 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 6ed66328c8..48ec5e8840 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -10,20 +10,20 @@ }, "devDependencies": { "@egovernments/digit-ui-react-components": "1.5.12", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "@egovernments/digit-ui-libraries": "1.5.0", "@egovernments/digit-ui-module-core": "1.8.2-beta.18", "@egovernments/digit-ui-module-hrms": "1.5.26", "@egovernments/digit-ui-module-dss": "1.5.52", - "@egovernments/digit-ui-module-attendencemgmt": "0.4.8", - "@egovernments/digit-ui-module-contracts": "0.4.7", - "@egovernments/digit-ui-module-measurement":"0.2.6", - "@egovernments/digit-ui-module-estimate": "0.4.11", - "@egovernments/digit-ui-module-masters": "0.4.10", - "@egovernments/digit-ui-module-project": "0.4.7", - "@egovernments/digit-ui-module-expenditure": "0.4.5", - "@egovernments/digit-ui-customisation-mukta": "0.2.5", - "@egovernments/digit-ui-module-rate-analysis": "0.4.5", + "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", + "@egovernments/digit-ui-module-contracts": "0.4.8", + "@egovernments/digit-ui-module-measurement":"0.2.7", + "@egovernments/digit-ui-module-estimate": "0.4.12", + "@egovernments/digit-ui-module-masters": "0.4.11", + "@egovernments/digit-ui-module-project": "0.4.8", + "@egovernments/digit-ui-module-expenditure": "0.4.6", + "@egovernments/digit-ui-customisation-mukta": "0.2.6", + "@egovernments/digit-ui-module-rate-analysis": "0.4.6", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html index cbad6206b5..1fd5f9945c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html @@ -11,7 +11,7 @@ MUKTASoft - + diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js index 4ea44fb6f1..fd23596e5f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js +++ b/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js @@ -651,8 +651,6 @@ export const UICustomizations = { SearchMeasurementConfig: { preProcess: (data) => { - - // console.log(data); const mbNumber=data?.body?.Individual?.MBNumber || null; const refId= data?.body?.Individual?.MBReference || null; @@ -673,7 +671,6 @@ export const UICustomizations = { }, additionalCustomizations: (row, key, column, value, t, searchResult) => { - // console.log(key,value); //here we can add multiple conditions //like if a cell is link then we return link //first we can identify which column it belongs to then we can return relevant result @@ -803,9 +800,6 @@ export const UICustomizations = { }, additionalCustomizations: (row, key, column, value, t, searchResult) => { - // console.log(key,value); - // console.log(row,"qwertyuiop"); - //here we can add multiple conditions //like if a cell is link then we return link //first we can identify which column it belongs to then we can return relevant result diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json index 4ffac9d0e4..25976c5716 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-customisation-mukta", - "version": "0.2.5", + "version": "0.2.6", "description": "MUKTA Customisation of Works UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "react": "17.0.2", "react-date-range": "^1.4.0", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js index 8c5870c763..a81b3fd63a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js @@ -426,11 +426,11 @@ export const UICustomizations = { //here iterate over defaultValues and set from presets in the api - const presets = Digit.Hooks.useQueryParams(); - if (Object.keys(presets).length > 0) { - Object.keys(presets).forEach((preset) => { + const presets = Digit.Hooks.useQueryParams(); + if (Object?.keys(presets)?.length > 0) { + Object?.keys(presets)?.forEach((preset) => { //if present in defaultValues object then only set it - if (Object.keys(defaultValues).some((key) => key === preset)) { + if (Object?.keys(defaultValues)?.some((key) => key === preset)) { data.body.inbox.moduleSearchCriteria[preset] = presets[preset]; } }); @@ -1117,10 +1117,10 @@ export const UICustomizations = { }; const presets = Digit.Hooks.useQueryParams(); - if (Object.keys(presets).length > 0) { - Object.keys(presets).forEach((preset) => { + if (Object?.keys(presets)?.length > 0) { + Object?.keys(presets)?.forEach((preset) => { //if present in defaultValues object then only set it - if (Object.keys(defaultValues).some((key) => key === preset)) { + if (Object?.keys(defaultValues)?.some((key) => key === preset)) { data.body.inbox.moduleSearchCriteria[preset] = presets[preset]; } }); @@ -1630,10 +1630,10 @@ export const UICustomizations = { data.body.inbox.moduleSearchCriteria = { ...SearchCriteria, tenantId: Digit.ULBService.getCurrentTenantId() }; const presets = Digit.Hooks.useQueryParams(); - if (Object.keys(presets).length > 0) { - Object.keys(presets).forEach((preset) => { + if (Object?.keys(presets)?.length > 0) { + Object?.keys(presets)?.forEach((preset) => { //if present in defaultValues object then only set it - if (Object.keys(defaultValues).some((key) => key === preset)) { + if (Object?.keys(defaultValues)?.some((key) => key === preset)) { data.body.inbox.moduleSearchCriteria[preset] = presets[preset]; } }); @@ -1834,10 +1834,10 @@ export const UICustomizations = { data.body.inbox.moduleSearchCriteria = { ...SearchCriteria, tenantId: Digit.ULBService.getCurrentTenantId() }; const presets = Digit.Hooks.useQueryParams(); - if (Object.keys(presets).length > 0) { - Object.keys(presets).forEach((preset) => { + if (Object?.keys(presets)?.length > 0) { + Object?.keys(presets)?.forEach((preset) => { //if present in defaultValues object then only set it - if (Object.keys(defaultValues).some((key) => key === preset)) { + if (Object?.keys(defaultValues)?.some((key) => key === preset)) { data.body.inbox.moduleSearchCriteria[preset] = presets[preset]; } }); @@ -2055,10 +2055,10 @@ export const UICustomizations = { data.body.inbox.moduleSearchCriteria = { ...SearchCriteria, tenantId: Digit.ULBService.getCurrentTenantId() }; const presets = Digit.Hooks.useQueryParams(); - if (Object.keys(presets).length > 0) { - Object.keys(presets).forEach((preset) => { + if (Object?.keys(presets)?.length > 0) { + Object?.keys(presets)?.forEach((preset) => { //if present in defaultValues object then only set it - if (Object.keys(defaultValues).some((key) => key === preset)) { + if (Object?.keys(defaultValues)?.some((key) => key === preset)) { data.body.inbox.moduleSearchCriteria[preset] = presets[preset]; } }); @@ -2194,10 +2194,10 @@ export const UICustomizations = { data.body.paymentCriteria.status = "INITIATED"; const presets = Digit.Hooks.useQueryParams(); - if (Object.keys(presets).length > 0) { - Object.keys(presets).forEach((preset) => { + if (Object?.keys(presets)?.length > 0) { + Object?.keys(presets)?.forEach((preset) => { //if present in defaultValues object then only set it - if (Object.keys(defaultValues).some((key) => key === preset)) { + if (Object?.keys(defaultValues)?.some((key) => key === preset)) { data.body.paymentCriteria[preset] = presets[preset]; } }); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json index c8997afeb2..0b2635f665 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-works-css", - "version": "0.2.47", + "version": "0.2.48", "license": "MIT", "author": "Jagankumar ", "main": "dist/index.css", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss index 76fe4bda2d..edc4ac6112 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss @@ -956,7 +956,7 @@ input[type="number"] { } .search-instruction-header { - margin-bottom: 1rem; + margin-bottom: 1.5rem; font-size: 16px; font-weight: 500; color: theme(colors.text.secondary); @@ -1080,6 +1080,7 @@ input[type="number"] { } .h1 { + margin-bottom: 1.5rem; &.works-header-search { font-size: 36px; } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss index 8e95df8d24..13429b5654 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss @@ -149,4 +149,10 @@ } } - \ No newline at end of file + .digit-sidebar{ + top:4.5rem; + } + + .digit-bread-crumb{ + margin-bottom: 1.5rem; + } \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearch.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearch.scss index 22e8a97747..862f8b9143 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearch.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearch.scss @@ -1,7 +1,7 @@ .search-wrapper { height: 100%; width: 100%; - padding: 1rem; + padding: theme(digitv2.spacers.spacer6); .popup-label { display: flex; @@ -60,7 +60,7 @@ .search-field-wrapper { display: grid; - row-gap: 0.25rem; + row-gap: 1.5rem; column-gap: 1rem; &.inbox { grid-template-columns: repeat(3, 1fr); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json index dd6bdddb20..900ca5428a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json @@ -23,7 +23,7 @@ "react-scripts": "^4.0.1" }, "dependencies": { - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "axios": "1.4.0", "babel-preset-react": "6.24.1", "lodash": "^4.17.21", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json index 7d7141b985..f0c47cf996 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-attendencemgmt", - "version": "0.4.8", + "version": "0.4.9", "description": "Attendence Management Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "react": "17.0.2", "react-date-range": "^1.4.0", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/index.js index 66905b25d5..505e7378ac 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/index.js @@ -1,7 +1,8 @@ import React from "react"; import { Switch, useLocation } from "react-router-dom"; import { useTranslation } from "react-i18next"; -import { PrivateRoute, AppContainer, BreadCrumb } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer } from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; import Response from "../../components/Response"; import SearchAttendance from "./SearchAttendance"; import SearchAttendancePlainSearch from "./SearchAttendencePlainSearch"; @@ -41,7 +42,7 @@ const AttendanceBreadCrumbs = ({ location }) => { isBack: fromScreen && true, } ]; - return ; + return ; }; const App = ({ path }) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json index c378c062d6..be530dd4dc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-contracts", - "version": "0.4.7", + "version": "0.4.8", "description": "Contracts Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "lodash": "^4.17.21", "react": "17.0.2", "react-date-range": "^1.4.0", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/CreateContract.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/CreateContract.js index 493c99c8f2..3b0aed87b2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/CreateContract.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/CreateContract.js @@ -142,9 +142,6 @@ const CreateContract = (props) => { }; const onModalSubmit = (data) => { - - //console.log(createFormData); - //console.log(sessionFormData); //here you can handle the data submitted in the modal and call the api //access comments from data and details such as dept,desig,approver are stored locally in this comp } 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 b99fdd5b64..eec4d21f20 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 @@ -99,7 +99,6 @@ const ViewContractDetails = () => { } } - console.log(requestCriteria,"requestcriteria"); const {isLoading, data:measurementData} = Digit.Hooks.useCustomAPIHook(requestCriteria); @@ -137,7 +136,6 @@ const ViewContractDetails = () => { } let isCreeateMBUser = verifiedRolesForAction?.["CREATE_MB"].some(role => loggedInUserRoles.includes(role)); - console.log(isInWorkflowMeasurementPresent,measurementData,actionsMenu,isCreeateMBUser); if(!isInWorkflowMeasurementPresent && measurementData && !actionsMenu?.find((ob) => ob?.name === "WF_CONTRACT_ACTION_CREATE_MEASUREMENT_REQUEST") && isCreeateMBUser) setActionsMenu((prevState => [...prevState,{ name:"WF_CONTRACT_ACTION_CREATE_MEASUREMENT_REQUEST", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/index.js index 248c408bb4..975297bbf6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/index.js @@ -1,6 +1,7 @@ import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { PrivateRoute, BreadCrumb, AppContainer } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer } from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; import { Switch, useLocation } from "react-router-dom"; import CreateContract from "./CreateContract"; import Inbox from "./ContractsInbox/Inbox.js"; @@ -48,7 +49,7 @@ const ContractsBreadCrumbs = ({ location }) => { isBack: fromScreen && true, }, ]; - return ; + return ; }; const App = ({ path }) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json index b37480e1e9..9b6e5ab8e2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-estimate", - "version": "0.4.11", + "version": "0.4.12", "description": "Estimate Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "react": "17.0.2", "react-date-range": "^1.4.0", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js index 7494be0545..895346580e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js @@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next"; import { TextBlock } from "@egovernments/digit-ui-components"; const ViewTotalEstAmount = ({ detail, ...props }) => { - console.log("viewtotalestamount") const { t } = useTranslation(); return (
{ }, }; try { - console.log("selectedSOR", selectedSOR); const data = stateData?.SORType && (await Digit.CustomService.getResponse(requestCriteria)); if (data?.MdmsRes?.["WORKS-SOR"]?.SOR?.length > 0) { setSuggestions(data?.MdmsRes?.["WORKS-SOR"]?.SOR); 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 933f0de6f6..ff8937f966 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 @@ -34,7 +34,6 @@ const configNavItems = [ }, ]; const CreateEstimate = ({ props }) => { - console.log("buttonnnnnnnnnn") const tenant = Digit.ULBService.getStateId(); const { t } = useTranslation(); const [showToast, setShowToast] = useState(null); @@ -660,7 +659,9 @@ const CreateEstimate = ({ props }) => { if (isConfigLoading || isEstimateLoading || isUomLoading || isOverheadsLoading || isDocLoading || isAllEstimateLoading || isRatesLoading) { return ; } - if ((isEdit || isCreateRevisionEstimate || isEditRevisionEstimate) && Object.keys(sessionFormData).length === 0) return ; + if ((isEdit || isCreateRevisionEstimate || isEditRevisionEstimate) && Object.keys(sessionFormData).length === 0) { + return ; + } return ( {showModal && setShowModal(false)} onSubmit={onModalSubmit} config={config} isDisabled={isButtonDisabled} />} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/index.js index aed5436324..64daa963a7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/index.js @@ -1,7 +1,8 @@ import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { Switch, useLocation } from "react-router-dom"; -import { PrivateRoute, AppContainer, BreadCrumb } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer } from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; import CreateEstimate from "./Estimates/CreateEstimate/CreateEstimate"; import EstimateSearch from "./EstimateSearch"; import EstimateSearchPlain from "./EstimateSearchPlain"; @@ -104,7 +105,6 @@ const EstimateBreadCrumbs = ({ location }) => { return ( { const handleUpdatePI = async () => { const paDetails = data?.[0]?.applicationData - // console.log("pi update"); const payloadForUpdate = { tenantId, } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/Payments/viewPaymentInstruction.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/Payments/viewPaymentInstruction.js index 5678fecab2..2733ffada0 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/Payments/viewPaymentInstruction.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/Payments/viewPaymentInstruction.js @@ -37,7 +37,6 @@ const ViewPaymentInstruction = () => { const handleUpdatePI = async () => { const piDetails = data?.[0]?.applicationData - // console.log("pi update"); const payloadForUpdate = { tenantId, } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/index.js index 248d1be03f..093b11cb2e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/pages/employee/index.js @@ -1,6 +1,7 @@ import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { PrivateRoute, BreadCrumb, AppContainer } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer } from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; import { Switch, useLocation } from "react-router-dom"; import CreateBill from "./CreateBill"; import ViewSupervisionbill from "./Bills/ViewSupervisionbill"; @@ -104,7 +105,7 @@ const ExpenditureBreadCrumbs = ({ location }) => { isBack: fromScreen && true, }, ]; - return ; + return ; }; const App = ({ path }) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json index 5f576e8361..1e8f0d6aed 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-masters", - "version": "0.4.10", + "version": "0.4.11", "description": "Masters Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "lodash": "^4.17.21", "react": "17.0.2", "react-date-range": "^1.4.0", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/index.js index 2a3a0355c8..b15abfdbab 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/index.js @@ -1,7 +1,8 @@ import React, { useEffect } from "react"; import { Switch, useLocation } from "react-router-dom"; import { useTranslation } from "react-i18next"; -import { PrivateRoute, AppContainer, BreadCrumb } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer } from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; const MastersBreadCrumb = ({ location }) => { const { t } = useTranslation(); @@ -68,7 +69,7 @@ const MastersBreadCrumb = ({ location }) => { isBack: fromScreen && true, }, ]; - return ; + return ; }; const App = ({ path }) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json index 3f1812cc72..6a1886d888 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-measurement", - "version": "0.2.6", + "version": "0.2.7", "description": "Measurement Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "react": "17.0.2", "react-date-range": "^1.4.0", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/index.js index 204232f247..26aa248dad 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/index.js @@ -1,6 +1,7 @@ import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { PrivateRoute, BreadCrumb, AppContainer } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer } from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; import { Switch, useLocation } from "react-router-dom"; import ViewMeasurement from "./ViewMeasurement"; import SearchMeasurement from "./SearchMeasurement"; @@ -61,7 +62,7 @@ const MeasurementBreadCrumbs = ({ location }) => { isBack: fromScreen && true, }, ]; - return ; + return ; }; const App = ({ path }) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json index af813db486..bd00cc015f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-project", - "version": "0.4.7", + "version": "0.4.8", "description": "Project Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "lodash": "^4.17.21", "react": "17.0.2", "react-date-range": "^1.4.0", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/index.js index ec3b28c278..871c128c18 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/index.js @@ -1,7 +1,8 @@ import React, { useEffect } from "react"; import { Switch, useLocation } from "react-router-dom"; import { useTranslation } from "react-i18next"; -import { PrivateRoute, AppContainer, BreadCrumb } from "@egovernments/digit-ui-react-components"; +import { PrivateRoute, AppContainer} from "@egovernments/digit-ui-react-components"; +import { BreadCrumb } from "@egovernments/digit-ui-components"; import WorkflowCompTest from "./WorkflowCompTest"; import SampleComp from "./SampleComp"; @@ -40,7 +41,7 @@ const ProjectBreadCrumb = ({ location }) => { isBack: fromScreen && true, } ]; - return ; + return ; }; const App = ({ path }) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json index e3af7801bd..ea2cf0d036 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-rate-analysis", - "version": "0.4.5", + "version": "0.4.6", "description": "Rate Analysis Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { "@egovernments/digit-ui-react-components": "^1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "react": "17.0.2", "react-date-range": "^1.4.0", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/PropertyDocuments.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/PropertyDocuments.js index 6610d49ced..120d4fa811 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/PropertyDocuments.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/PropertyDocuments.js @@ -43,7 +43,6 @@ function PropertyDocuments({ documents, svgStyles = {}, isSendBackFlow=false }) const checkLocation = window.location.href.includes("employee/tl") || window.location.href.includes("/obps") || window.location.href.includes("employee/ws"); const isStakeholderApplication = window.location.href.includes("stakeholder"); - console.log("propertydocs") return (
{!isStakeholderApplication && documents?.map((document, index) => ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json index 3201001185..1068eb6743 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json @@ -42,7 +42,7 @@ ], "dependencies": { "@googlemaps/js-api-loader": "1.13.10", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "lodash": "^4.17.21", "react-date-range": "1.3.0", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js index 48511f508f..5462561af4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js @@ -28,7 +28,6 @@ const SearchComponent = ({ uiConfig, header = "", screenType = "search", fullCon const [showToast,setShowToast] = useState(null) let updatedFields = []; const {apiDetails} = fullConfig -console.log(fullConfig?.type,"type") if (fullConfig?.postProcessResult){ //conditions can be added while calling postprocess function to pass different params Digit?.Customizations?.[apiDetails?.masterName]?.[apiDetails?.moduleName]?.postProcess(data, uiConfig) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowTimeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowTimeline.js index 700bbb4b35..ed286f4eb9 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowTimeline.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowTimeline.js @@ -31,7 +31,6 @@ const WorkflowTimeline = ({ const { t } = useTranslation(); const getTimelineCaptions = (checkpoint, index) => { - console.log("ffff", checkpoint, index); let captionDetails = { name: "", date: "", @@ -69,7 +68,6 @@ const WorkflowTimeline = ({ thumbnailsToShow: checkpoint?.thumbnailsToShow, }; - console.log("caption", caption); const data = caption; @@ -140,7 +138,6 @@ const WorkflowTimeline = ({ } }, [workflowDetails]); - console.log("work", workflowDetails); return ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js index ffddf5a6d2..dfe94416d7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js @@ -40,7 +40,7 @@ import { ErrorMessage, StringManipulator, Header, - TextBlock, + TextBlock } from "@egovernments/digit-ui-components"; const wrapperStyles = { @@ -582,6 +582,13 @@ export const FormComposer = (props) => { const titleStyle = { color: "#505A5F", fontWeight: "700", fontSize: "16px" }; + function convertToSentenceCase(inputString) { + // Convert the string to lowercase and capitalize the first letter of each sentence + return inputString.toLowerCase().replace(/(^\s*\w|[\.\!\?]\s*\w)/g, function(c) { + return c.toUpperCase(); + }); + } + const getCombinedComponent = (section) => { if (section.head && section.subHead) { return ( @@ -679,7 +686,9 @@ export const FormComposer = (props) => { style={ props?.showWrapperContainers && !field.hideContainer ? { ...wrapperStyles, ...field?.populators?.customStyle } - : props?.fieldPairNoMargin ? {marginBottom : "0px"} : { border: "none", background: "white", ...field?.populators?.customStyle } + : props?.fieldPairNoMargin + ? { marginBottom: "0px" } + : { border: "none", background: "white", ...field?.populators?.customStyle } } > {/* {!field.withoutLabel && ( @@ -700,8 +709,7 @@ export const FormComposer = (props) => {
- {StringManipulator( - "TOSENTENCECASE", + {convertToSentenceCase( StringManipulator("TRUNCATESTRING", t(field.label), { maxLength: 64, }) @@ -726,10 +734,9 @@ export const FormComposer = (props) => { lineHeight: "1.5rem", }} > - {StringManipulator( - "TOSENTENCECASE", + {convertToSentenceCase( StringManipulator("TRUNCATESTRING", t(description), { - maxLength: 256, + maxLength: 64, }) )} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js index 7823edac19..b6dfd976b2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js @@ -27,6 +27,9 @@ const InboxSearchComposer = ({ configs, headerLabel, additionalConfig, onFormVal const apiDetails = configs?.apiDetails; const mobileSearchSession = Digit.Hooks.useSessionStorage("MOBILE_SEARCH_MODAL_FORM", {}); const [sessionFormData, setSessionFormData, clearSessionFormData] = mobileSearchSession; + + const [activeLink,setActiveLink] = useState(configs?.sections?.search?.uiConfig?.configNavItems?.filter(row=>row.activeByDefault)?.[0]) + //for mobile view useEffect(() => { if (type) setPopup(true); @@ -92,9 +95,7 @@ const InboxSearchComposer = ({ configs, headerLabel, additionalConfig, onFormVal // } // }; // }, [location]); - const updatedReqCriteria = Digit?.Customizations?.[apiDetails?.masterName]?.[apiDetails?.moduleName]?.preProcess - ? Digit?.Customizations?.[apiDetails?.masterName]?.[apiDetails?.moduleName]?.preProcess(requestCriteria, configs.additionalDetails) - : requestCriteria; + const updatedReqCriteria = Digit?.Customizations?.[apiDetails?.masterName]?.[apiDetails?.moduleName]?.preProcess ? Digit?.Customizations?.[apiDetails?.masterName]?.[apiDetails?.moduleName]?.preProcess(requestCriteria,configs?.sections?.search?.uiConfig?.defaultValues,activeLink?.name) : requestCriteria if (configs.customHookName) { var { isLoading, data, revalidate, isFetching, refetch, error } = eval(`Digit.Hooks.${configs.customHookName}(updatedReqCriteria)`); } else { @@ -151,6 +152,8 @@ const InboxSearchComposer = ({ configs, headerLabel, additionalConfig, onFormVal screenType={configs.type} fullConfig={configs} data={data} + activeLink={activeLink} + setActiveLink={setActiveLink} />
)} @@ -162,6 +165,8 @@ const InboxSearchComposer = ({ configs, headerLabel, additionalConfig, onFormVal screenType={configs.type} fullConfig={configs} data={data} + activeLink={activeLink} + setActiveLink={setActiveLink} />
)} @@ -234,6 +239,7 @@ const InboxSearchComposer = ({ configs, headerLabel, additionalConfig, onFormVal isFetching={isFetching} fullConfig={configs} additionalConfig={additionalConfig} + activeLink={activeLink} /> 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 c1d504c2c5..1f314df076 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 @@ -144,7 +144,6 @@ const renderCardSectionJSX = (section) => { const ViewComposer = ({ isLoading = false,data, ...props }) => { const { cards } = data; const [activeNav,setActiveNav] = useState(data?.horizontalNav?.activeByDefault) - console.log(activeNav); if (isLoading) return ; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/ApiDropdown.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/ApiDropdown.js index 94b0124d6a..6c6c46c502 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/ApiDropdown.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/ApiDropdown.js @@ -1,9 +1,7 @@ import React, { Fragment, useState, useEffect } from "react"; -// import MultiSelectDropdown from "../atoms/MultiSelectDropdown"; -// import Dropdown from "../atoms/Dropdown"; +import {MultiSelectDropdown} from "@egovernments/digit-ui-components"; +import {Dropdown} from "@egovernments/digit-ui-components"; import { Loader } from "../atoms/Loader"; -import MultiSelectDropdown from "@egovernments/digit-ui-components"; -import Dropdown from "@egovernments/digit-ui-components"; import { useTranslation } from "react-i18next"; import _ from "lodash"; const ApiDropdown = ({ populators, formData, props, inputRef, errors }) => { @@ -82,8 +80,8 @@ const ApiDropdown = ({ populators, formData, props, inputRef, errors }) => { select={(e) => { props.onChange([e], populators.name); }} - selected={props.value?.[0] || props?.value || populators.defaultValue} - defaultValue={props.value?.[0] || props?.value || populators.defaultValue} + selected={props?.value?.[0] || props?.value || populators?.defaultValue} + defaultValue={props?.value?.[0] || props?.value || populators?.defaultValue} t={t} errorStyle={errors?.[populators.name]} optionCardStyles={populators?.optionsCustomStyle} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/RenderFormFields.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/RenderFormFields.js index 7eddb5cd21..8973b347b7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/RenderFormFields.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/RenderFormFields.js @@ -27,7 +27,6 @@ const RenderFormFields = ({data,...props}) => { const Component = typeof component === "string" ? Digit.ComponentRegistryService.getComponent(component) : component; let customValidations = config?.additionalValidation ? Digit?.Customizations?.[apiDetails?.masterName]?.[apiDetails?.moduleName]?.additionalValidations(config?.additionalValidation?.type, formData, config?.additionalValidation?.keys) : null const customRules = customValidations ? { validate: customValidations} : {} - console.log(type,"typeoffield") switch (type) { case "date": case "text": diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 0009ee3bdd..bf01738849 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -18,19 +18,19 @@ "dependencies": { "@egovernments/digit-ui-react-components": "1.5.12", "@egovernments/digit-ui-libraries": "1.5.0", - "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-components": "0.0.2-beta.43", "@egovernments/digit-ui-module-core": "1.8.2-beta.18", "@egovernments/digit-ui-module-hrms": "1.5.26", "@egovernments/digit-ui-module-dss": "1.5.52", - "@egovernments/digit-ui-module-attendencemgmt": "0.4.8", - "@egovernments/digit-ui-module-contracts": "0.4.7", - "@egovernments/digit-ui-module-measurement":"0.2.6", - "@egovernments/digit-ui-module-estimate": "0.4.11", - "@egovernments/digit-ui-module-masters": "0.4.10", - "@egovernments/digit-ui-module-project": "0.4.7", - "@egovernments/digit-ui-module-expenditure": "0.4.5", - "@egovernments/digit-ui-customisation-mukta": "0.2.5", - "@egovernments/digit-ui-module-rate-analysis": "0.4.5", + "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", + "@egovernments/digit-ui-module-contracts": "0.4.8", + "@egovernments/digit-ui-module-measurement":"0.2.7", + "@egovernments/digit-ui-module-estimate": "0.4.12", + "@egovernments/digit-ui-module-masters": "0.4.11", + "@egovernments/digit-ui-module-project": "0.4.8", + "@egovernments/digit-ui-module-expenditure": "0.4.6", + "@egovernments/digit-ui-customisation-mukta": "0.2.6", + "@egovernments/digit-ui-module-rate-analysis": "0.4.6", "babel-loader": "8.1.0", "clean-webpack-plugin": "4.0.0", "react": "17.0.2", diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index 28390522cf..6bb896737f 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -8,8 +8,8 @@ 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'> - - + + diff --git a/frontend/micro-ui/web/src/Customisations/UICustomizations.js b/frontend/micro-ui/web/src/Customisations/UICustomizations.js index 3ca529406b..f821537012 100644 --- a/frontend/micro-ui/web/src/Customisations/UICustomizations.js +++ b/frontend/micro-ui/web/src/Customisations/UICustomizations.js @@ -648,8 +648,6 @@ export const UICustomizations = { SearchMeasurementConfig: { preProcess: (data) => { - - // console.log(data); const mbNumber=data?.body?.Individual?.MBNumber || null; const refId= data?.body?.Individual?.MBReference || null; @@ -670,7 +668,6 @@ export const UICustomizations = { }, additionalCustomizations: (row, key, column, value, t, searchResult) => { - // console.log(key,value); //here we can add multiple conditions //like if a cell is link then we return link //first we can identify which column it belongs to then we can return relevant result @@ -800,8 +797,6 @@ export const UICustomizations = { }, additionalCustomizations: (row, key, column, value, t, searchResult) => { - // console.log(key,value); - // console.log(row,"qwertyuiop"); //here we can add multiple conditions //like if a cell is link then we return link