Merge pull request #681 from odisha-muktasoft/redirection-fixes

redirection issue fix, breadcrumb update
odisha-muktasoft · Oct 1, 2024 · d987d2a · d987d2a
2 parents 0fcc9e4 + 385f65e
commit d987d2a
Show file tree

Hide file tree

Showing 44 changed files with 124 additions and 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
@@ -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
@@ -11,7 +11,7 @@
   <meta name="theme-color" content="#00bcd1" />
   <title>MUKTASoft</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].34/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].36/dist/index.css" />
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
   <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigsWorks.js"></script> -->

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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-works-css",
-  "version": "0.2.47",
+  "version": "0.2.48",
   "license": "MIT",
   "author": "Jagankumar <[email protected]>",
   "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
@@ -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
@@ -149,4 +149,10 @@
     }
   }
 
-
+  .digit-sidebar{
+    top:4.5rem;
+  }
+
+  .digit-bread-crumb{
+    margin-bottom: 1.5rem;
+  }
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
@@ -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
@@ -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
@@ -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/...cro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/index.js b/...cro-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 <BreadCrumb crumbs={crumbs} spanStyle={{ maxWidth: "min-content" }} />;
+  return <BreadCrumb crumbs={crumbs} />;
 };
 
 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
@@ -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/...ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/CreateContract.js b/...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/...b/micro-ui-internals/packages/modules/Contracts/src/pages/employee/ViewContractDetails.js b/...b/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/...nd/micro-ui/web/micro-ui-internals/packages/modules/Contracts/src/pages/employee/index.js b/...nd/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 <BreadCrumb crumbs={crumbs} spanStyle={{ maxWidth: "min-content" }} />;
+  return <BreadCrumb crumbs={crumbs} />;
 };
 
 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
@@ -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/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js b/...-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 (
     <div

diff --git a/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js b/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js
@@ -32,7 +32,6 @@ const SearchBar = (props) => {
       },
     };
     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/...es/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js b/...es/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 <Loader />;
   }
-  if ((isEdit || isCreateRevisionEstimate || isEditRevisionEstimate) && Object.keys(sessionFormData).length === 0) return <Loader />;
+  if ((isEdit || isCreateRevisionEstimate || isEditRevisionEstimate) && Object.keys(sessionFormData).length === 0) {
+    return <Loader />;
+  }
   return (
     <Fragment>
       {showModal && <WorkflowModal closeModal={() => setShowModal(false)} onSubmit={onModalSubmit} config={config} isDisabled={isButtonDisabled} />}