Merge remote-tracking branch 'origin/campaign' into facilityChanges

egovernments · Jun 7, 2024 · 8f499be · 8f499be
2 parents 4a79e5e + 1fbff63
commit 8f499be
Show file tree

Hide file tree

Showing 20 changed files with 418 additions and 145 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
@@ -16,7 +16,7 @@
   /> -->
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].51-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].53-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->
 

diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
@@ -45,7 +45,7 @@
     "ajv": "8.12.0",
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.1",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.2",
     "@egovernments/digit-ui-components": "0.0.2-beta.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",

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.0.51-campaign",
+  "version": "1.0.53-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
@@ -89,4 +89,21 @@
 .whoLogo{
   margin-top: -1rem;
   margin-bottom: -1rem;
-}
+}
+
+.digit-popup-wrapper{
+  &.popUpClass{
+    width:45rem;
+
+    .popUpFooter{
+      .digit-popup-footer-buttons{
+        margin-left: 0px;
+        width: 100%;
+
+        button{
+          flex:1;
+        }
+      }
+    }
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/coreOverride.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/coreOverride.scss
@@ -160,4 +160,12 @@ header {
 
 .digit-popup-close-icon {
   @apply flex justify-end;
-}*/
+}*/
+
+.employee{
+  .digit-employeeSidebar{
+    .sidebar{
+      z-index:999
+    }
+  }
+}
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
@@ -282,7 +282,7 @@ tbody {
     min-width: 100%;
     .digit-button-primary {
       height: 1.5rem;
-      background-color: #d4351c;
+      background-color: #d4351c !important;
       .icon-label-container.primary.large {
         font-size: 14px;
         .digit-button-label {
@@ -298,6 +298,12 @@ tbody {
     @extend .typography.text-heading-m;
     margin-bottom: 1.5rem;
   }
+  .employee-card-sub-header.error {
+    color: #d4351c;
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+  }
 }
 .add-new-product-container {
   border: 1px solid #d6d5d4;
@@ -355,6 +361,22 @@ tbody {
     min-width: fit-content;
   }
 }
+.digit-popup-wrapper.boundaries-pop-module.default {
+  width: 36rem;
+  .digit-popup-footer {
+    .digit-popup-footer-buttons {
+      width: 100% !important;
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      .digit-button-secondary {
+        width: 100%;
+      }
+      .digit-button-primary {
+        width: 100%;
+      }
+    }
+  }
+}
 .campaign-pop-module {
   padding: 1.5rem;
   border-radius: 4px;
@@ -413,7 +435,7 @@ tbody {
 .link {
   color: #c84c0e !important;
 }
-.employeeCard.employeeCard-override.error {
+.employeeCard.employeeCard-override.card-error {
   border: 1px solid #d4351c;
 }
 .label-field-pair.delivery-type-radio {
@@ -427,6 +449,16 @@ tbody {
     }
   }
 }
-.bold{
+.bold {
   font-weight: 700;
-}
+}
+.summary-doc-error {
+  p {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  .digit-infobanner-wrap.error {
+    margin-bottom: 0.5rem;
+    margin-top: 1.5rem;
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/css/tailwind.config.js b/micro-ui/web/micro-ui-internals/packages/css/tailwind.config.js
@@ -115,6 +115,7 @@ module.exports = {
         "input-border": "#505A5F",
         "primary-bg": "#FEEFE7",
         "text-primary": "#363636",
+        "error-v2": "#D4351C",
       },
       alert: {
         error: "#b91900",

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.1",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.2",
     "@egovernments/digit-ui-components": "0.0.2-beta.1",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",

diff --git a/...ui-internals/packages/modules/campaign-manager/src/components/CampaignDocumentsPreview.js b/...ui-internals/packages/modules/campaign-manager/src/components/CampaignDocumentsPreview.js
@@ -4,8 +4,9 @@ import { DocumentIcon } from "./DocumentIcon";
 import XlsPreview from "./XlsPreview";
 import { XlsxFile } from "./icons/XlsxFile";
 import { downloadExcelWithCustomName } from "../utils";
+import { InfoCard } from "@egovernments/digit-ui-components";
 
-function CampaignDocumentsPreview({ documents = [], svgStyles = {}, isUserGenerate = false }) {
+function CampaignDocumentsPreview({ documents = [], svgStyles = {}, isUserGenerate = false, cardErrors }) {
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const [filesArray, setFilesArray] = useState(null);
@@ -68,8 +69,19 @@ function CampaignDocumentsPreview({ documents = [], svgStyles = {}, isUserGenera
               )
           )
         ) : (
-          <div>
+          <div className="summary-doc-error" style={{ width: "100%" }}>
             <p>{t("ES_CAMPAIGN_NO_DOCUMENTS_AVAILABLE")}</p>
+            {cardErrors?.map((i) => (
+              <InfoCard
+                populators={{
+                  name: "infocard",
+                }}
+                variant="error"
+                text={t(i?.error ? i?.error : i?.message)}
+                hasAdditionalElements={true}
+                // additionalElements={[<Button label={i?.button} onClick={i.onClick} />]}
+              />
+            ))}
           </div>
         )}
       </div>