Merge branch 'console' into FEATURE/HCMPRE-1713

egovernments · Jan 8, 2025 · 20d8039 · 20d8039
2 parents c48d451 + 1eea6a1
commit 20d8039
Show file tree

Hide file tree

Showing 41 changed files with 1,719 additions and 141 deletions.
diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -12,7 +12,7 @@
   <title>DIGIT</title>
   <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].34/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].36/dist/index.css" />
 
 
   <!-- added below css for hcm-workbench module inclusion-->

diff --git a/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js
@@ -1300,6 +1300,11 @@ export const UICustomizations = {
       const VillageHierarchyTooltipWrapper = Digit.ComponentRegistryService.getComponent("VillageHierarchyTooltipWrapper");
 
       switch (key) {
+        case `MICROPLAN_FACILITY_${column?.projectType}_CAPACITY`:
+          if (row?.additionalDetails?.capacity || row?.additionalDetails?.capacity === 0) {
+            return row?.additionalDetails?.capacity;
+          }
+          return t("NA");
         case "MICROPLAN_FACILITY_SERVINGPOPULATION":
           return row?.additionalDetails?.servingPopulation;
         case "MICROPLAN_FACILITY_RESIDINGVILLAGE":

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

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
@@ -67,9 +67,9 @@
   border-width: 0rem 1.5rem;
   tbody {
     tr:hover {
-      td{
+      td {
         background: rgba(#f47738, 0.12);
-          cursor: pointer;
+        cursor: pointer;
       }
     }
   }
@@ -111,45 +111,46 @@
   justify-content: space-between;
   align-items: center;
 }
-.setup-campaign{
-  .digit-success{
-  z-index: 1000;
+.setup-campaign {
+  .digit-success {
+    z-index: 1000;
   }
 }
-.digit-error{
+.digit-error {
   z-index: 900;
 }
-.timeline-user{
+.timeline-user {
   display: flex;
   justify-content: space-between;
 }
-.upcoming-timeline{
-  .timeline-label{
+.upcoming-timeline {
+  .timeline-label {
     color: #b1b4b6;
   }
 }
-.container{
+.container {
   display: flex;
   flex-direction: row;
   gap: 1.5rem;
   align-items: stretch;
 }
-.stepper-card{
+.stepper-card {
   height: 39rem;
   margin-bottom: 1.5rem !important;
+  padding-top: 0rem;
 }
-.stepper-subheader{
+.stepper-subheader {
   color: theme(digitv2.lightTheme.header-sidenav);
 }
-.container-full{
+.container-full {
   display: flex;
   flex-direction: row;
   gap: 1.5rem;
   align-items: stretch;
   height: 100%;
 }
-.name-container-label{
-  .label-field-wrapper{
+.name-container-label {
+  .label-field-wrapper {
     width: -webkit-fill-available;
   }
 }
@@ -185,36 +186,36 @@
 .hierarchy-boundary-heading {
   font-size: 2.5rem;
   font-weight: 700;
-  font-family: 'Roboto Condensed', sans-serif;
+  font-family: "Roboto Condensed", sans-serif;
 }
 
 .hierarchy-boundary-sub-heading {
   width: 20rem;
   margin-top: 0.6rem;
   font-weight: 600;
-  font-family: 'Roboto', sans-serif;
+  font-family: "Roboto", sans-serif;
 }
 
 .hierarchy-boundary-sub-heading2 {
-  font-size: 1.2rem; 
+  font-size: 1.2rem;
   font-weight: 600;
-  font-family: 'Roboto', sans-serif;
+  font-family: "Roboto", sans-serif;
 }
-.campaign-preview{
+.campaign-preview {
   display: flex;
   align-items: center;
   gap: 0.5rem;
 }
-.card-container1{
+.card-container1 {
   width: 100%;
 }
-.campaign-tag{
-  border: 0.5px solid #0B4B66;
+.campaign-tag {
+  border: 0.5px solid #0b4b66;
   margin-bottom: 1rem;
   height: 3.3rem;
- .digit-tag-text{
-  font-size: 1.5rem;
-  font-weight: 700;
+  .digit-tag-text {
+    font-size: 1.5rem;
+    font-weight: 700;
   }
 }
 .digit-popup-wrapper.dataMapping {
@@ -236,4 +237,32 @@
   > div:nth-of-type(1) {
     width: 69%;
   }
-}
+}
+
+.appConfiglabelField {
+  padding: 3rem 1rem;
+  background-color: #eee;
+  border: 1px solid #d6d5d4;
+  border-radius: 0.5rem;
+}
+.appConfiglabelField.selected {
+  background-color: #f477381a;
+  border: 1px solid #c84c0e;
+}
+.appConfig-flow-stepper {
+  margin-top: 2rem;
+}
+.app-config-add-section {
+  margin-inline: auto;
+  margin-top: 2rem;
+  margin-bottom: 5rem;
+}
+.appConfigScreenCard {
+  margin-bottom: 2rem;
+}
+.appConfiglabelField-label {
+  width: 25rem;
+}
+.app-config-actionBar {
+  z-index: 9999;
+}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -792,6 +792,18 @@ tbody {
   border-color: #D4D5D6;
   border-radius: 0.25rem;
   padding: 1rem;
+  padding-bottom: 0rem; 
+}
+
+.summary-parent-group {
+  border-width: 0.063rem;
+  background: theme(digitv2.lightTheme.paper-secondary);
+  border-color: #D4D5D6;
+  border-radius: 0.25rem;
+  padding: 1rem;
+}
+.summary-parent-group:not(:last-child) {
+  margin-bottom: 1.5rem;
 }
 
 .card-container {

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js
@@ -57,6 +57,7 @@ import MapView from "./components/MapView";
 import NoResultsFound from "./components/NoResultsFound";
 import UploadDataMappingWrapper from "./components/UploadDataMappingWrapper";
 import DataUploadWrapper from "./components/DataUploadWrapper";
+import AppConfigurationWrapper from "./pages/employee/AppConfigurationWrapper";
 
 /**
  * MDMS Module name
@@ -91,7 +92,7 @@ const CampaignModule = ({ stateCode, userType, tenants }) => {
   const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({ BOUNDARY_HIERARCHY_TYPE, tenantId });
   const modulePrefix = "hcm";
 
-  const moduleCode = BOUNDARY_HIERARCHY_TYPE ? [`boundary-${BOUNDARY_HIERARCHY_TYPE}`] : ["campaignmanager", "schema", "admin-schemas", "checklist"];
+  const moduleCode = BOUNDARY_HIERARCHY_TYPE ? [`boundary-${BOUNDARY_HIERARCHY_TYPE}`] : ["campaignmanager", "schema", "admin-schemas", "checklist", "appconfiguration"];
 
   const { path, url } = useRouteMatch();
   const language = Digit.StoreData.getCurrentLanguage();
@@ -175,6 +176,7 @@ const componentsToRegister = {
   NoResultsFound,
   UploadDataMappingWrapper,
   DataUploadWrapper,
+  AppConfigurationWrapper,
 };
 
 const overrideHooks = () => {

diff --git a/...o-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js b/...o-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js
@@ -47,7 +47,7 @@ const BoundaryDetailsSummary = (props) => {
       {Object.keys(groupedByParent)
         .slice(0, 2)
         .map((parentKey, index) => (
-          <div className="parent-group" key={index}>
+          <div className="summary-parent-group" key={index}>
             {parentKey && parentKey !== "undefined" && parentKey.trim() !== "" && <div className="boundary-header">{t(parentKey)}</div>}
             <div>
               <div className="digit-tag-container" style={{ display: "flex", maxWidth: "100%" , margin: "0rem" }}>
@@ -100,7 +100,7 @@ const BoundaryDetailsSummary = (props) => {
         >
           {Object.keys(groupedByParent)
             .map((parentKey, index) => (
-              <div className="parent-group" key={index} style={{ marginBottom: "20px" }}>
+              <div className="parent-group" key={index}>
                 {parentKey && parentKey !== "undefined" && parentKey.trim() !== "" && <div className="boundary-header">{t(parentKey)}</div>}
                 <div>
                   <div className="digit-tag-container" style={{ display: "flex", maxWidth: "100%" }}>

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundarySummary.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundarySummary.js
@@ -2,8 +2,7 @@ import React, { useEffect, useState,Fragment } from "react";
 import { useTranslation } from "react-i18next";
 import { Header, Loader, LoaderWithGap, ViewComposer } from "@egovernments/digit-ui-react-components";
 import { Toast, Stepper, TextBlock, Card ,Tag } from "@egovernments/digit-ui-components";
-
-
+import TagComponent from "./TagComponent";
 
 
 function boundaryDataGrp(boundaryData) {
@@ -152,7 +151,7 @@ const BoundarySummary = (props) => {
         </div>
 
         <div className="card-container-delivery">
-        <Tag icon="" label={campaignName} labelStyle={{}} showIcon={false} className={"campaign-tag"} />
+        <TagComponent campaignName={campaignName} />
       <div style={{ display: "flex", justifyContent: "space-between" }}>
         <Header className="summary-header">{t("ES_BOUNDARY_SUMMARY_HEADING")}</Header>
       </div>

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
@@ -63,7 +63,13 @@ const CampaignCard = () => {
       link: `/${window?.contextPath}/employee/campaign/boundary/home`,
       roles: ROLES.BOUNDARY_MANAGER,
       // count: isLoading?"-":data
-    }
+    },
+    {
+      label: t("ACTION_TEST_APP_CONFIGURATION"),
+      link: `/workbench-ui/employee/campaign/app-configuration`,
+      roles: ROLES.CAMPAIGN_MANAGER,
+      // count: isLoading?"-":data
+    },  
   ];
 
   links = links.filter((link) => (link?.roles && link?.roles?.length > 0 ? Digit.Utils.didEmployeeHasAtleastOneRole(link?.roles) : true));

diff --git a/.../web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignDates.js b/.../web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignDates.js
@@ -2,6 +2,7 @@ import React, { useState, useEffect , Fragment } from "react";
 import { DatePicker, LabelFieldPair, Header } from "@egovernments/digit-ui-react-components";
 import { useTranslation } from "react-i18next";
 import { ErrorMessage, FieldV1, TextInput ,Stepper , TextBlock , Card , InfoCard ,Tag  } from "@egovernments/digit-ui-components";
+import TagComponent from "./TagComponent";
 
 const CampaignDates = ({ onSelect, formData, ...props }) => {
   const { t } = useTranslation();
@@ -131,7 +132,7 @@ const CampaignDates = ({ onSelect, formData, ...props }) => {
         </div>
 
         <div className="card-container2">
-        <Tag icon="" label={campaignName} labelStyle={{}} showIcon={false} className={"campaign-tag"} />
+        <TagComponent campaignName={campaignName} />  
           <Card className="setup-campaign-card">
             <Header>{t(`HCM_CAMPAIGN_DATES_HEADER`)}</Header>
             <p className="dates-description">{t(`HCM_CAMPAIGN_DATES_DESCRIPTION`)}</p>

diff --git a/...o-ui-internals/packages/modules/campaign-manager/src/components/CampaignDetailsSummary.js b/...o-ui-internals/packages/modules/campaign-manager/src/components/CampaignDetailsSummary.js
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import {  EditIcon, Header, Loader, LoaderWithGap, ViewComposer } from "@egovernments/digit-ui-react-components";
 import { Toast , Stepper , TextBlock ,Card ,Tag } from "@egovernments/digit-ui-components";
+import TagComponent from "./TagComponent";
 
 const CampaignDetailsSummary = (props) => {
   const { t } = useTranslation();
@@ -158,8 +159,8 @@ const CampaignDetailsSummary = (props) => {
         </div>
 
         <div className="card-container-delivery">
-        <Tag icon="" label={campaignName} labelStyle={{}} showIcon={false} className={"campaign-tag"} />
-      <div style={{ display: "flex", justifyContent: "space-between" }}>
+        <TagComponent campaignName={campaignName} />        
+        <div style={{ display: "flex", justifyContent: "space-between" }}>
         <Header className="summary-header">{t("HCM_CAMPAIGN_DETAILS_SUMMARY")}</Header>
       </div>
       <div className="campaign-summary-container">

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
@@ -373,7 +373,22 @@ const CampaignSummary = (props) => {
                 {
                   type: "DATA",
                   cardHeader: { value: t("CAMPAIGN_DETAILS"), inlineStyles: { marginTop: 0, fontSize: "1.5rem" } },
-                  cardSecondaryAction: isPreview === "true" && (
+                  // cardSecondaryAction: isPreview === "true" && (
+                  //   <Button
+                  //     className={"campaign-type-alert-button"}
+                  //     type={"button"}
+                  //     size={"large"}
+                  //     variation={"primary"}
+                  //     label={t("ES_CAMPAIGN_DOWNLOAD_USER_DETAILS")}
+                  //     onClick={() => {
+                  //       setTimeline(true);
+                  //       setResource(resourceIdArr);
+                  //       setCampaignId(data?.[0]?.id);
+
+                  //     }}
+                  //   />
+                  // ),
+                  cardSecondaryAction: isPreview === "true" ? (
                     <Button
                       className={"campaign-type-alert-button"}
                       type={"button"}
@@ -387,6 +402,14 @@ const CampaignSummary = (props) => {
 
                       }}
                     />
+                  ) : (
+                    <div
+                      className="campaign-preview-edit-container"
+                      onClick={() => handleRedirect(4)}
+                    >
+                      <span>{t("CAMPAIGN_EDIT")}</span>
+                      <EditIcon />
+                    </div>
                   ),
                   values: [
                     {

diff --git a/...ro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js b/...ro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js
@@ -6,6 +6,7 @@ import { Toast , Tag } from "@egovernments/digit-ui-components";
 import { PRIMARY_COLOR, downloadExcelWithCustomName } from "../utils";
 import getProjectServiceUrl from "../utils/getProjectServiceUrl";
 import NoResultsFound from "./NoResultsFound";
+import TagComponent from "./TagComponent";
 
 // function boundaryDataGrp(boundaryData) {
 //   // Create an empty object to hold grouped data by type
@@ -444,7 +445,7 @@ const CampaignUpdateSummary = (props) => {
 
   return (
     <>
-          <Tag icon="" label={campaignName} labelStyle={{}} showIcon={false} className={"campaign-tag"} />
+      <TagComponent campaignName={campaignName} />        
       <div style={{ display: "flex", justifyContent: "space-between" , marginBottom:"-1.5rem" }}>
         <Header className="summary-header">{t("ES_TQM_SUMMARY_HEADING")}</Header>
       </div>

diff --git a/.../micro-ui-internals/packages/modules/campaign-manager/src/components/DataUploadSummary.js b/.../micro-ui-internals/packages/modules/campaign-manager/src/components/DataUploadSummary.js
@@ -5,6 +5,7 @@ import {  EditIcon, Header, Loader, LoaderWithGap, ViewComposer } from "@egovern
 import { Toast, Stepper, TextBlock, Card , Tag} from "@egovernments/digit-ui-components";
 import {  downloadExcelWithCustomName } from "../utils";
 import getProjectServiceUrl from "../utils/getProjectServiceUrl";
+import TagComponent from "./TagComponent";
 
 function mergeObjects(item) {
   const arr = item;
@@ -304,7 +305,7 @@ const DataUploadSummary = (props) => {
         </div>
 
         <div className="card-container-delivery">
-        <Tag icon="" label={campaignName} labelStyle={{}} showIcon={false} className={"campaign-tag"} />
+        <TagComponent campaignName={campaignName} />  
           <div style={{ display: "flex", justifyContent: "space-between" }}>
             <Header className="summary-header">{t("HCM_DATA_UPLOAD_SUMMARY")}</Header>
             {/* {userCredential && (