Merge branch 'campaign' into campaign-panelcard-integration

egovernments · May 29, 2024 · d47af7b · d47af7b
2 parents 77b4d98 + 6fc6f73
commit d47af7b
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 34 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@egovernments/digit-ui-libraries": "1.8.1-beta.4",
-    "@egovernments/digit-ui-module-core": "1.8.1-beta.17",
+    "@egovernments/digit-ui-module-core": "1.8.1-beta.23",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.2",
     "@egovernments/digit-ui-components": "0.0.1-beta.28",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.23",

diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -15,7 +15,6 @@
     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]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->

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
@@ -1,10 +1,14 @@
 @import url("../../index.scss");
 @import "../../typography.scss";
 
+.summary-header{
+  @extend .typography.text-heading-l;
+  font-size: 2.25rem;
+}
 .date-field-container {
   display: grid;
   grid-template-columns: 20rem 20rem;
-  grid-gap: 2rem;
+  grid-gap: 1.5rem;
   width: 70%;
   padding-top: 0.3rem;
   margin-top: 0rem;

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss
@@ -158,7 +158,7 @@
   .date-field-container {
     display: grid;
     grid-template-columns: 18.75rem 18.75rem;
-    grid-gap: 2rem;
+    grid-gap: 1.5rem;
     width: 100%;
   }
   .PlusMinus {

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
@@ -2,6 +2,28 @@
 @import "./coreOverride.scss";
 @import "../../typography.scss";
 
+.wbh-header-container {
+  margin-top: 1.5rem;
+}
+.main.digit-home-main {
+  margin-left: 92px;
+  .employee-app-wrapper.digit-home-app-wrapper {
+    margin-left: 0;
+    .ground-container.digit-home-ground {
+      padding: 0;
+      .employee-app-container.digit-home-employee-app {
+        .ground-container.moduleCardWrapper.gridModuleWrapper.digit-home-moduleCardWrapper {
+          gap: 2.5rem;
+          margin-top: 2rem;
+          padding: 0;
+          .employeeCard.customEmployeeCard.card-home.home-action-cards {
+            margin: 0 !important;
+          }
+        }
+      }
+    }
+  }
+}
 .campaign-cycle-container {
   .popup-header-fix {
     margin-top: 1.5rem !important;
@@ -124,7 +146,6 @@
   font-size: 24px;
   color: #505a5f;
   margin-top: 0.5rem;
-  font-style: italic;
 }
 .header-end {
   margin-right: 1rem;
@@ -193,11 +214,21 @@ input[type="date"]::-webkit-calendar-picker-indicator {
   }
 }
 .campaign-summary-container {
+  .setup-campaign-card {
+    .employeeCard.employeeCard-override {
+      padding: 1.5rem;
+      margin-bottom: 1.5rem !important;
+    }
+  }
   .row {
+    justify-content: flex-start;
+    gap: 5rem;
     h2 {
       margin: 0;
+      width: 272px;
     }
     .value {
+      width: unset;
       p {
         margin: 0;
       }
@@ -206,6 +237,7 @@ input[type="date"]::-webkit-calendar-picker-indicator {
 }
 .view-composer-header-section {
   .employee-card-sub-header {
+    @extend .typography.text-heading-m;
     margin-bottom: 1.5rem;
   }
 }

diff --git a/...i/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js b/...i/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js
@@ -20,28 +20,28 @@ const CampaignCard = () => {
 
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const reqCriteria = {
-    url: "/project-factory/v1/project-type/search",
-    params: {},
-    body: { CampaignDetails:{
-      tenantId,
-      createdBy: Digit.UserService.getUser().info.uuid,
-      pagination: {
-        "sortBy": "createdTime",
-        "sortOrder": "desc",
-        "limit": 1,
-        "offset": 0
-      }
-    } },
-    config: {
-      select: (data) => {
-        return data?.totalCount;
-      },
-    },
-  };
-  const { isLoading, data } = Digit.Hooks.useCustomAPIHook(
-    reqCriteria
-  );
+  // const reqCriteria = {
+  //   url: "/project-factory/v1/project-type/search",
+  //   params: {},
+  //   body: { CampaignDetails:{
+  //     tenantId,
+  //     createdBy: Digit.UserService.getUser().info.uuid,
+  //     pagination: {
+  //       "sortBy": "createdTime",
+  //       "sortOrder": "desc",
+  //       "limit": 1,
+  //       "offset": 0
+  //     }
+  //   } },
+  //   config: {
+  //     select: (data) => {
+  //       return data?.totalCount;
+  //     },
+  //   },
+  // };
+  // const { isLoading, data } = Digit.Hooks.useCustomAPIHook(
+  //   reqCriteria
+  // );
   let links = [
 
     {
@@ -53,7 +53,7 @@ const CampaignCard = () => {
       label: t("ACTION_TEST_MY_CAMPAIGN"),
       link: `/${window?.contextPath}/employee/campaign/my-campaign`,
       roles: ROLES.CAMPAIGN_MANAGER,
-      count: isLoading?"-":data
+      // count: isLoading?"-":data
     },
   ];
 

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js
@@ -408,7 +408,7 @@ const CampaignSummary = () => {
   return (
     <>
       <div style={{ display: "flex", justifyContent: "space-between" }}>
-        <Header>{t("ES_TQM_SUMMARY_HEADING")}</Header>
+        <Header className="summary-header">{t("ES_TQM_SUMMARY_HEADING")}</Header>
         {userCredential && (
           <Button
             label={t("CAMPAIGN_DOWNLOAD_USER_CRED")}

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
@@ -1,4 +1,4 @@
-import { Button, Header } from "@egovernments/digit-ui-react-components";
+import { Button, Header, LoaderWithGap } from "@egovernments/digit-ui-react-components";
 import React, { useRef, useState, useEffect, Fragment } from "react";
 import { useTranslation } from "react-i18next";
 import { DownloadIcon, Card } from "@egovernments/digit-ui-react-components";
@@ -10,6 +10,7 @@ import { schemaConfig } from "../configs/schemaConfig";
 import { headerConfig } from "../configs/headerConfig";
 import { PRIMARY_COLOR } from "../utils";
 import { downloadExcelWithCustomName } from "../utils";
+
 /**
  * The `UploadData` function in JavaScript handles the uploading, validation, and management of files
  * for different types of data in a web application.
@@ -740,7 +741,6 @@ const UploadData = ({ formData, onSelect, ...props }) => {
     );
   };
 
-
   // useEffect(() => {
   //   if (showToast) {
   //     setTimeout(closeToast, 5000);
@@ -752,12 +752,13 @@ const UploadData = ({ formData, onSelect, ...props }) => {
   useEffect(() => {
     if (showToast) {
       const t = setTimeout(closeToast, 5000);
-      return () => clearTimeout(t); 
+      return () => clearTimeout(t);
     }
   }, [showToast]);
 
   return (
     <>
+      {isValidation && <LoaderWithGap text={"CAMPAIGN_VALIDATION_INPROGRESS"} />}
       <Card>
         <div className="campaign-bulk-upload">
           <Header className="digit-form-composer-sub-header">

diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.1-beta.4",
     "@egovernments/digit-ui-module-workbench": "1.0.1-beta.16",
-    "@egovernments/digit-ui-module-core": "1.8.1-beta.17",
+    "@egovernments/digit-ui-module-core": "1.8.1-beta.23",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.23",
     "@egovernments/digit-ui-components": "0.0.1-beta.25",

diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
@@ -13,7 +13,7 @@
   "homepage": "/workbench-ui",
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.1-beta.4",
-    "@egovernments/digit-ui-module-core": "1.8.1-beta.17",
+    "@egovernments/digit-ui-module-core": "1.8.1-beta.23",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.5",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.23",
     "@egovernments/digit-ui-components": "0.0.1-beta.25",