bug fixes for sandbox

egovernments · Sep 27, 2024 · 4f65659 · 4f65659
1 parent 6a343dc
commit 4f65659
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 21 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -14,7 +14,7 @@
 
   <!-- <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/globalConfigs.js"></script> -->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].33/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].36/dist/index.css" />
   <script src="%REACT_APP_GLOBAL%"></script>
 
 </head>

diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.8.2-beta.29",
+  "version": "1.8.2-beta.30",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/components/checkpoint.scss b/micro-ui/web/micro-ui-internals/packages/css/src/components/checkpoint.scss
@@ -6,6 +6,7 @@
   @apply flex;
 
   h2 {
+    z-index: 10;
     width: 24px;
     height: 24px;
     border-radius: 50%;

diff --git a/...o-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/searchComponentTable.scss b/...o-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/searchComponentTable.scss
@@ -5,6 +5,7 @@
   overflow-y:hidden;
   table {
     th {
+      background-color: #FFFFFF;
       .tooltip {
         min-width: 80px;
       }

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/components/uploadcomponents.scss b/micro-ui/web/micro-ui-internals/packages/css/src/components/uploadcomponents.scss
@@ -46,6 +46,7 @@
   .upload-img-container {
     border: 1px dashed theme(colors.border);
     margin: 0 !important;
+    display: flex !important;
 
     img {
       margin-left: auto;
@@ -55,7 +56,8 @@
 
     svg {
       @apply flex;
-      margin: auto;
+      justify-content: center;
+      align-items: center;
     }
 
     svg {

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -494,6 +494,10 @@
   }
   .hambuger-back-wrapper {
     display: flex;
+    h3{
+      margin-top: 0;
+      margin-bottom: 0;
+    }
     @media (min-width: 780px) {
       .hamburger-span {
         display: none;

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
@@ -34,6 +34,13 @@
   border-color: transparent;
   border-width: 0 1.5rem;
 
+  thead {
+    tr {
+      th {
+        background-color: #ffffff;
+      }
+    }
+  }
   tbody {
     tr:hover {
       background: rgba(#f47738, 0.12);
@@ -100,17 +107,23 @@
 .sandbox-onboarding-wrapper {
   height: 500px !important;
   width: 408px !important;
-
+  display: flex;
+  justify-content: space-between;
+  .employee-card-sub-header {
+    font-size: 1.5rem;
+  }
   .employeeCard {
     height: 500px !important;
     width: 408px !important;
 
     .submit-bar-disabled {
+      align-self: flex-end;
       margin-top: 3rem;
       width: 100%;
     }
 
     .submit-bar {
+      align-self: flex-end;
       margin-top: 3rem;
       width: 100%;
     }
@@ -123,6 +136,9 @@
       }
     }
   }
+  .digit-description {
+    margin-bottom: -1rem;
+  }
 }
 
 .card-sandbox {
@@ -233,6 +249,9 @@
       height: 2rem;
     }
   }
+  .digit-button-primary {
+    width: 100%;
+  }
 }
 
 .digit-employee-card.card-sandbox {
@@ -274,7 +293,8 @@
   display: flex;
   width: 100%;
 
-  .digit-text-input-field.urlInputText {}
+  .digit-text-input-field.urlInputText {
+  }
 
   .digit-button-secondary.large.copyButton {
     width: 30%;
@@ -534,16 +554,25 @@ digit-card-text.center {
     gap: 1.5rem;
   }
 }
+
+.digit-home-moduleCardWrapper {
+  display: flex;
+
+  .digit-landing-page-card {
+    flex: 1;
+    min-width: 20rem;
+    max-width: fit-content;
+  }
+}
 .employee-app-wrapper.sandbox-landing-wrapper {
-  margin: 2rem;
-  margin-top: 6rem;
+  margin: 6rem 2rem 2rem 5rem;
 }
-.digit-uploader-content{
-  .digit-button-secondary.large{
-    .icon-label-container.secondary.large{
-      .digit-button-label{
+.digit-uploader-content {
+  .digit-button-secondary.large {
+    .icon-label-container.secondary.large {
+      .digit-button-label {
         width: fit-content !important;
       }
     }
-  }  
-}
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js
@@ -8,7 +8,7 @@ const SideBarMenu = (t, closeSidebar, redirectToLoginPage, isEmployee) => [
     element: "HOME",
     text: t("COMMON_BOTTOM_NAVIGATION_HOME"),
     link: isEmployee ? `/${window?.contextPath}/employee` : `/${window?.contextPath}/citizen`,
-    icon: "Home",
+    icon: "HomeIcon",
     populators: {
       onClick: closeSidebar,
     },

diff --git a/...b/micro-ui-internals/packages/modules/core/src/pages/employee/Landing/LandingComponent.js b/...b/micro-ui-internals/packages/modules/core/src/pages/employee/Landing/LandingComponent.js
@@ -54,7 +54,7 @@ const LandingComponent = ({ config }) => {
         <Button
           className="actionButton"
           label={t("CONTINUE_LANDING")}
-          variation={"secondary"}
+          variation={"primary"}
           icon="ArrowForward"
           isSuffix={true}
           onClick={(e) => {

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js
@@ -155,6 +155,8 @@ const Details = () => {
                       inset: "0px",
                       width: "auto",
                       padding: ".2rem",
+                      paddingTop: "1rem",
+                      paddingLeft: "1rem",
                       marginBottom: "2rem",
                     }}
                   >
@@ -185,6 +187,8 @@ const Details = () => {
                   inset: "0px",
                   width: "auto",
                   padding: ".2rem",
+                  paddingLeft: "1rem",
+                  paddingTop: "1rem",
                   marginBottom: "2rem",
                 }}
               >

diff --git a/.../web/micro-ui-internals/packages/modules/pgr/src/components/timelineInstances/rejected.js b/.../web/micro-ui-internals/packages/modules/pgr/src/components/timelineInstances/rejected.js
@@ -15,7 +15,7 @@ const Rejected = ({ action, nextActions, complaintDetails, ComplainMaxIdleTime=3
       nextActions.map((action, index) => {
         if (action && action !== "COMMENT") {
           return (
-            <Link key={index} to={`/digit-ui/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
+            <Link key={index} to={`/${window?.contextPath}/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
               <ActionLinks>{t(`CS_COMMON_${action}`)}</ActionLinks>
             </Link>
           );
@@ -42,7 +42,7 @@ const Rejected = ({ action, nextActions, complaintDetails, ComplainMaxIdleTime=3
         if (action && (action !== "COMMENT") ) {
           if((action!== "REOPEN" || (action === "REOPEN" && (Date?.now() - complaintDetails?.service?.auditDetails?.lastModifiedTime) < ComplainMaxIdleTime)))
           return (
-            <Link key={index} to={`/digit-ui/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
+            <Link key={index} to={`/${window?.contextPath}/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
               <ActionLinks>{t(`CS_COMMON_${action}`)}</ActionLinks>
             </Link>
           );

diff --git a/.../web/micro-ui-internals/packages/modules/pgr/src/components/timelineInstances/resolved.js b/.../web/micro-ui-internals/packages/modules/pgr/src/components/timelineInstances/resolved.js
@@ -15,7 +15,7 @@ const Resolved = ({ action, nextActions,complaintDetails, ComplainMaxIdleTime=36
       nextActions.map((action, index) => {
         if (action && action !== "COMMENT") {
           return (
-            <Link key={index} to={`/digit-ui/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
+            <Link key={index} to={`/${window?.contextPath}/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
               <ActionLinks>{t(`CS_COMMON_${action}`)}</ActionLinks>
             </Link>
           );
@@ -42,7 +42,7 @@ const Resolved = ({ action, nextActions,complaintDetails, ComplainMaxIdleTime=36
         if (action && action !== "COMMENT") {
           if((action!== "REOPEN" || (action === "REOPEN" && (Date?.now() - complaintDetails?.service?.auditDetails?.lastModifiedTime) < ComplainMaxIdleTime)))
           return (
-            <Link key={index} to={`/digit-ui/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
+            <Link key={index} to={`/${window?.contextPath}/citizen/pgr/${action.toLowerCase()}/${serviceRequestId}`}>
               <ActionLinks>{t(`CS_COMMON_${action}`)}</ActionLinks>
             </Link>
           );

diff --git a/...ui/web/micro-ui-internals/packages/react-components/src/molecules/SearchOnRadioButtons.js b/...ui/web/micro-ui-internals/packages/react-components/src/molecules/SearchOnRadioButtons.js
@@ -28,7 +28,7 @@ const SearchOnRadioButtons = ({options,optionsKey,additionalWrapperClass,onSelec
     }
 
     return <div className="SearchOnRadioButton">
-        <TextInput textInputStyle={{maxWidth:"100%"}} signature={true} signatureImg={<SignatureImage />} onChange={onSearchQueryChange || defaultSearchQueryChange} value={SearchQueryValue} placeholder={placeholder} />
+        <TextInput signature={true} signatureImg={<SignatureImage />} onChange={onSearchQueryChange || defaultSearchQueryChange} value={SearchQueryValue} placeholder={placeholder} />
         <RadioButtons {...{options: filteredOptions,optionsKey,additionalWrapperClass,onSelect,selectedOption}} />
     </div>
 }

diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
@@ -7,7 +7,7 @@
   <link
     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" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].29/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].30/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css"/>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />