From 516de92b9ab6efbeca0355533a3f708b1a4a428c Mon Sep 17 00:00:00 2001 From: Swathi-eGov Date: Mon, 7 Oct 2024 19:35:36 +0530 Subject: [PATCH 1/2] ui-ux fixes --- .../micro-ui-internals/example/package.json | 22 +-- .../example/public/index.html | 2 +- .../web/micro-ui-internals/package.json | 21 ++- .../packages/Mukta/package.json | 4 +- .../packages/css/package.json | 2 +- .../packages/css/src/components/estimate.scss | 28 +++- .../css/src/components/measurement.scss | 1 - .../css/src/components/searchSor.scss | 4 +- .../packages/libraries/package.json | 2 +- .../modules/AttendenceMgmt/package.json | 4 +- .../packages/modules/Contracts/package.json | 4 +- .../packages/modules/Estimate/package.json | 4 +- .../Estimate/src/pageComponents/SearchBar.js | 33 ++-- .../Estimate/src/pageComponents/searchSor.js | 1 + .../src/pageComponents/searchTemplate.js | 10 +- .../packages/modules/Expenditure/package.json | 4 +- .../packages/modules/Masters/package.json | 4 +- .../packages/modules/Measurement/package.json | 4 +- .../src/components/MeasureTable.js | 3 +- .../src/components/ViewOnlyCard.js | 2 +- .../src/configs/MeasurementCreateConfig.js | 1 + .../packages/modules/Project/package.json | 4 +- .../modules/RateAnalysis/package.json | 4 +- .../packages/modules/works/package.json | 4 +- .../packages/react-components/package.json | 2 +- .../src/atoms/WorkflowActions.js | 142 ++++++++++++------ .../react-components/src/hoc/FormComposer.js | 2 +- .../src/molecules/RenderFormFields.js | 2 +- frontend/micro-ui/web/package.json | 22 +-- frontend/micro-ui/web/public/index.html | 4 +- frontend/micro-ui/web/works/package.json | 2 +- 31 files changed, 211 insertions(+), 137 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 c713e3476b..798b2e27b2 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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "@egovernments/digit-ui-libraries": "1.5.0", - "@egovernments/digit-ui-module-core": "1.8.2-beta.19", + "@egovernments/digit-ui-module-core": "1.8.2-beta.20", "@egovernments/digit-ui-module-hrms": "1.5.26", "@egovernments/digit-ui-module-dss": "1.5.52", - "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", - "@egovernments/digit-ui-module-contracts": "0.4.8", - "@egovernments/digit-ui-module-measurement":"0.2.8", - "@egovernments/digit-ui-module-estimate": "0.4.14", - "@egovernments/digit-ui-module-masters": "0.4.13", - "@egovernments/digit-ui-module-project": "0.4.9", - "@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", + "@egovernments/digit-ui-module-attendencemgmt": "0.4.10", + "@egovernments/digit-ui-module-contracts": "0.4.9", + "@egovernments/digit-ui-module-measurement":"0.2.9", + "@egovernments/digit-ui-module-estimate": "0.4.15", + "@egovernments/digit-ui-module-masters": "0.4.14", + "@egovernments/digit-ui-module-project": "0.4.10", + "@egovernments/digit-ui-module-expenditure": "0.4.7", + "@egovernments/digit-ui-customisation-mukta": "0.2.7", + "@egovernments/digit-ui-module-rate-analysis": "0.4.7", "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 1fd5f9945c..434d7214e4 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/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index cdf78b5bc8..69af5af0de 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -4,10 +4,15 @@ "main": "index.js", "workspaces": [ "packages/libraries", + "example", + "packages/css", "packages/react-components", + "packages/modules/*", "packages/modules/Estimate", - "packages/modules/RateAnalysis", - "packages/Mukta" + "packages/modules/Project", + "packages/modules/Expenditure", + "packages/Mukta", + "packages/modules/RateAnalysis" ], "author": "JaganKumar ", "license": "MIT", @@ -39,15 +44,15 @@ "buildD": "run-p buildD:**", "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", - "buildD:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build", - "buildD:contracts": "cd packages/modules/Contracts && yarn build", - "buildD:masters": "cd packages/modules/Masters && yarn build", + "build:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build", + "build:contracts": "cd packages/modules/Contracts && yarn build", + "build:masters": "cd packages/modules/Masters && yarn build", "build:estimate": "cd packages/modules/Estimate && yarn build", - "buildD:measurement": "cd packages/modules/Measurement && yarn build", + "build:measurement": "cd packages/modules/Measurement && yarn build", "build:mukta": "cd packages/Mukta && yarn build", - "buildD:project": "cd packages/modules/Project && yarn build", + "build:project": "cd packages/modules/Project && yarn build", "buildD:works": "cd packages/modules/works && yarn build", - "buildD:expenditure": "cd packages/modules/Expenditure && yarn build", + "build:expenditure": "cd packages/modules/Expenditure && yarn build", "build:rateAnalysis":"cd packages/modules/RateAnalysis && yarn build", "deploy:jenkins": "./scripts/jenkins.sh", "clean": "rm -rf node_modules" 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 25976c5716..d6affe8145 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.6", + "version": "0.2.7", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json index 352469f210..7f8c7ddefb 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.50", + "version": "0.2.51", "license": "MIT", "author": "Jagankumar ", "main": "dist/index.css", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/estimate.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/estimate.scss index 6d88c765f3..9c011dc404 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/estimate.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/estimate.scss @@ -1,5 +1,5 @@ .sor-dropdowns { - margin-top: 10px; + margin-top: 24px; width: 70%; display: flex; justify-content: space-between; @@ -20,18 +20,39 @@ .search-sor-container { display: flex; - width: 69.25%; /* make it 69.25*/ + width: 70%; /* make it 69.25*/ justify-content: space-between; flex-wrap: wrap; } .search-sor-button { display: flex; + flex: 1; flex-direction: row; - justify-content: space-around; + justify-content: space-between; + gap: 24px; + flex-wrap: wrap; + + @media (min-aspect-ratio: 9/16) and (max-aspect-ratio: 3/4) { + /* Media query for tablets */ + max-width: 27.5rem; + } + + @media (max-aspect-ratio: 9/16) { + /* Media query for mobile */ + max-width: 100%; + width: 100%; + } + + @media (min-aspect-ratio: 3/4) { + /* Media query for desktop */ + max-width: 37.5rem; + } } .search-sor-label { margin-top: 26px; + max-width: 20%; + width: 20%; } .add-sor-button { @@ -39,7 +60,6 @@ margin-top: 20px; width: 8.625rem; /*width: 8.625rem;*/ height: 2.5rem; - margin-left : 158px /*158*/ } .search-sor-input { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/measurement.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/measurement.scss index 5c4b2b05af..e8dc756e57 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/measurement.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/measurement.scss @@ -57,7 +57,6 @@ margin: 10px; box-shadow: none; padding: 8px 35px 8px 35px; - border-radius: 8px; } .done-button, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/searchSor.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/searchSor.scss index 30116ae2ce..3322559df6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/searchSor.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/searchSor.scss @@ -2,10 +2,10 @@ .search-bar-sor { position: relative; - width: 300px; /* Set your desired width */ - margin: 20px; margin-bottom: 0px; + flex: 1; + flex-shrink: 0; } ul.suggestions-sor { 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 900ca5428a..c7217726cb 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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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 f0c47cf996..0ef5b5c328 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.9", + "version": "0.4.10", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/Contracts/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json index be530dd4dc..5d6726f58d 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.8", + "version": "0.4.9", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/Estimate/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json index 1d3bac94b1..11c9e6f4dc 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.14", + "version": "0.4.15", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/pageComponents/SearchBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js index e5ff11a0db..9a36fc3e77 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js @@ -1,6 +1,7 @@ -import { TextInput } from "@egovernments/digit-ui-react-components"; +// import { TextInput } from "@egovernments/digit-ui-react-components"; import React, { useState, useEffect, useRef } from "react"; import { useTranslation } from "react-i18next"; +import {TextInput } from "@egovernments/digit-ui-components"; const SearchBar = (props) => { const { t } = useTranslation(); @@ -82,21 +83,23 @@ const SearchBar = (props) => { }; return ( -
- +
+ {suggestions?.length > 0 && ( -
    - {suggestions.map((option) => ( -
  • handleSelectOption(option)} - > - {option.description} -
    • - ))} -
+
    + {suggestions.map((option) => ( +
  • handleSelectOption(option)}> + {option.description} +
    • + ))} +
)}
); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js index aa8956b451..86fbd9e975 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js @@ -183,6 +183,7 @@ const searchSor = (props) => { label={t("ESTIMATE_ADD_LABEL")} onClick={buttonClick} className={"add-sor-button"} + style={{marginTop:"24px"}} />
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchTemplate.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchTemplate.js index 0c308dbf46..dc3dee34c7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchTemplate.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchTemplate.js @@ -1,7 +1,7 @@ -import { TextInput } from "@egovernments/digit-ui-react-components"; +// import { TextInput } from "@egovernments/digit-ui-react-components"; import React, { useEffect, useState, useCallback, useRef } from "react"; import { useTranslation } from "react-i18next"; -import {Toast,Button } from "@egovernments/digit-ui-components"; +import {Toast,Button,TextInput } from "@egovernments/digit-ui-components"; const fetchSorDetails = async (inputDATA) => { //method to fetch the data for estimate template @@ -363,14 +363,14 @@ const searchTemplate = (props) => {
{t("ESTIMATE_SEARCH_TEMPLATE_LABEL")}
-
+
{suggestions?.length > 0 && (
    @@ -382,7 +382,7 @@ const searchTemplate = (props) => {
)}
-
{showToast?.show && ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json index 9ec929a503..b609ee8202 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-expenditure", - "version": "0.4.6", + "version": "0.4.7", "description": "Expenditure 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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json index e5635e4bc6..c211aa94b3 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.13", + "version": "0.4.14", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/Measurement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json index bcf9688de0..0642ab6413 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.8", + "version": "0.2.9", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/components/MeasureTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureTable.js index ad541a02cf..07132f378c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureTable.js @@ -336,7 +336,8 @@ const MeasureTable = (props) => { fontSize: "medium", bottom : "100%", overflow : "auto", - + left:"100%", + marginLeft:"0px" }}> {row.description} } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/ViewOnlyCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/ViewOnlyCard.js index 3d36ae81bc..1788ed8fac 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/ViewOnlyCard.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/ViewOnlyCard.js @@ -16,7 +16,7 @@ const ViewOnlyCard = (props) => { SOR?.reduce((acc, item) => acc + parseFloat(item?.amount), 0) + NONSOR?.reduce((acc, item) => acc + parseFloat(item?.amount), 0) || 0; return ( -
+
{/* {t("MB_AMOUNT_TOTAL")} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/MeasurementCreateConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/MeasurementCreateConfig.js index 750a224112..e558b04e22 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/MeasurementCreateConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/MeasurementCreateConfig.js @@ -197,6 +197,7 @@ export const CreateConfig = ({ defaultValue, measurement, mbnumber }) => { { head: "", subHead: "", + sectionClassName:"viewstatement-viewamount-wrapper-create", body: [ { type: "component", 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 744f56105e..0a16680bb3 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.9", + "version": "0.4.10", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/RateAnalysis/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json index ea2cf0d036..3940ba468b 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.6", + "version": "0.4.7", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/works/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/works/package.json index 5069dc3952..463e16d169 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/works/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/works/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-works", - "version": "0.0.19", + "version": "0.0.20", "description": "Works", "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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/react-components/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json index 1068eb6743..cf0705fcbd 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.43", + "@egovernments/digit-ui-components": "0.0.2-beta.44", "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/WorkflowActions.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowActions.js index b99c99bd27..b9e9eb8bcd 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowActions.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WorkflowActions.js @@ -1,12 +1,13 @@ import React, { useEffect, useRef,useState } from "react"; import { useTranslation } from "react-i18next"; import SubmitBar from "./SubmitBar"; -import ActionBar from "./ActionBar"; +// import ActionBar from "./ActionBar"; import Menu from "./Menu"; import ActionModal from "./Modals"; import { Loader } from "./Loader"; -import Toast from "./Toast"; +// import Toast from "./Toast"; import { useHistory } from "react-router-dom"; +import { Toast, ActionBar,Button } from "@egovernments/digit-ui-components"; const WorkflowActions = ({ businessService, tenantId, applicationNo, forcedActionPrefix, ActionBarStyle = {}, MenuStyle = {}, applicationDetails, url, setStateChanged, moduleCode,editApplicationNumber,editCallback ,callback, WorflowValidation, fullData}) => { const history = useHistory() @@ -77,7 +78,7 @@ const WorkflowActions = ({ businessService, tenantId, applicationNo, forcedActio const closeModal = () => { setSelectedAction(null); setShowModal(false); - setShowToast({ warning:true,label:`WF_ACTION_CANCELLED`}) + setShowToast({ type:"warning",label:`WF_ACTION_CANCELLED`}) closeToast() }; @@ -144,7 +145,7 @@ const WorkflowActions = ({ businessService, tenantId, applicationNo, forcedActio onError:(error,variables)=>{ setIsEnableLoader(false) //show error toast acc to selectAction - setShowToast({ error: true, label: Digit.Utils.locale.getTransformedLocale(`WF_UPDATE_ERROR_${businessService}_${selectAction.action}`), isDleteBtn:true }) + setShowToast({ type:"error", label: Digit.Utils.locale.getTransformedLocale(`WF_UPDATE_ERROR_${businessService}_${selectAction.action}`), isDleteBtn:true }) callback?.onError?.(); @@ -174,54 +175,97 @@ const WorkflowActions = ({ businessService, tenantId, applicationNo, forcedActio return ( {!workflowDetails?.isLoading && isMenuBotton && !isSingleButton && ( - - {displayMenu && (workflowDetails?.data?.actionState?.nextActions || workflowDetails?.data?.nextActions) ? ( - + // {displayMenu && (workflowDetails?.data?.actionState?.nextActions || workflowDetails?.data?.nextActions) ? ( + // + // ) : null} + // setDisplayMenu(!displayMenu)} /> + // + - ) : null} - setDisplayMenu(!displayMenu)} /> - + type={workflowDetails?.data?.actionState?.nextActions || workflowDetails?.data?.nextActions ? "actionButton" : "submit"} + options={actions} + label={t("WORKS_ACTIONS")} + variation={"primary"} + optionsKey={"action"} + isSearchable={false} + onOptionSelect={(option) => { + onActionSelect(option); + }} + menuStyles={MenuStyle} + >, + ]} + setactionFieldsToRight={true} + className={"new-actionbar"} + /> )} - {!workflowDetails?.isLoading && !isMenuBotton && isSingleButton && ( - - - + { !workflowDetails?.isLoading && !isMenuBotton && isSingleButton && ( + // + // + // + { + onActionSelect(actions?.[0] || {}); + }} + >, + ]} + setactionFieldsToRight={true} + className={"new-actionbar"} + /> + )} + {showModal && ( + + )} + {showToast && ( + { + setShowToast(null); + }} + isDleteBtn={showToast?.isDleteBtn} + /> )} - - {showModal && } - {showToast && { - setShowToast(null); - }} - isDleteBtn={showToast?.isDleteBtn} - />} ); } 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 2e964263bf..b759e49394 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 @@ -895,7 +895,7 @@ export const FormComposer = (props) => { props?.config?.map((section, index, array) => { return ( !section.navLink && ( - + {renderFormFields(props, section, index, array)} ) 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 8973b347b7..6cbd58cb72 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 @@ -279,7 +279,7 @@ const RenderFormFields = ({data,...props}) => { rules={{ required: populators?.isMandatory }} render={(props) => { return ( -
+
); diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 3e41553adb..256f5e870f 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.43", - "@egovernments/digit-ui-module-core": "1.8.2-beta.19", + "@egovernments/digit-ui-components": "0.0.2-beta.44", + "@egovernments/digit-ui-module-core": "1.8.2-beta.20", "@egovernments/digit-ui-module-hrms": "1.5.26", "@egovernments/digit-ui-module-dss": "1.5.52", - "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", - "@egovernments/digit-ui-module-contracts": "0.4.8", - "@egovernments/digit-ui-module-measurement":"0.2.8", - "@egovernments/digit-ui-module-estimate": "0.4.14", - "@egovernments/digit-ui-module-masters": "0.4.13", - "@egovernments/digit-ui-module-project": "0.4.9", - "@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", + "@egovernments/digit-ui-module-attendencemgmt": "0.4.10", + "@egovernments/digit-ui-module-contracts": "0.4.9", + "@egovernments/digit-ui-module-measurement":"0.2.9", + "@egovernments/digit-ui-module-estimate": "0.4.15", + "@egovernments/digit-ui-module-masters": "0.4.14", + "@egovernments/digit-ui-module-project": "0.4.10", + "@egovernments/digit-ui-module-expenditure": "0.4.7", + "@egovernments/digit-ui-customisation-mukta": "0.2.7", + "@egovernments/digit-ui-module-rate-analysis": "0.4.7", "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 6d95a1baf5..19696d4aba 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/works/package.json b/frontend/micro-ui/web/works/package.json index ec6b5bd069..998980f1b0 100644 --- a/frontend/micro-ui/web/works/package.json +++ b/frontend/micro-ui/web/works/package.json @@ -16,7 +16,7 @@ "homepage": "/core-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.5.0", - "@egovernments/digit-ui-module-core": "1.8.2-beta.19", + "@egovernments/digit-ui-module-core": "1.8.2-beta.20", "@egovernments/digit-ui-react-components": "1.5.12", "@egovernments/digit-ui-module-hrms": "1.5.5-alpha.4", "@egovernments/digit-ui-module-works": "^0.0.9", From 49bd7ca3207255d7d3b43afeaae42b08c68d7e25 Mon Sep 17 00:00:00 2001 From: Swathi-eGov Date: Tue, 8 Oct 2024 10:26:06 +0530 Subject: [PATCH 2/2] reverted package change --- .../web/micro-ui-internals/package.json | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 69af5af0de..cdf78b5bc8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -4,15 +4,10 @@ "main": "index.js", "workspaces": [ "packages/libraries", - "example", - "packages/css", "packages/react-components", - "packages/modules/*", "packages/modules/Estimate", - "packages/modules/Project", - "packages/modules/Expenditure", - "packages/Mukta", - "packages/modules/RateAnalysis" + "packages/modules/RateAnalysis", + "packages/Mukta" ], "author": "JaganKumar ", "license": "MIT", @@ -44,15 +39,15 @@ "buildD": "run-p buildD:**", "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", - "build:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build", - "build:contracts": "cd packages/modules/Contracts && yarn build", - "build:masters": "cd packages/modules/Masters && yarn build", + "buildD:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build", + "buildD:contracts": "cd packages/modules/Contracts && yarn build", + "buildD:masters": "cd packages/modules/Masters && yarn build", "build:estimate": "cd packages/modules/Estimate && yarn build", - "build:measurement": "cd packages/modules/Measurement && yarn build", + "buildD:measurement": "cd packages/modules/Measurement && yarn build", "build:mukta": "cd packages/Mukta && yarn build", - "build:project": "cd packages/modules/Project && yarn build", + "buildD:project": "cd packages/modules/Project && yarn build", "buildD:works": "cd packages/modules/works && yarn build", - "build:expenditure": "cd packages/modules/Expenditure && yarn build", + "buildD:expenditure": "cd packages/modules/Expenditure && yarn build", "build:rateAnalysis":"cd packages/modules/RateAnalysis && yarn build", "deploy:jenkins": "./scripts/jenkins.sh", "clean": "rm -rf node_modules"