From 42c3b707f642c7309a81423195e4dc61b833ccf1 Mon Sep 17 00:00:00 2001
From: ashish-egov <ashish.tiwari@egovernments.org>
Date: Sun, 17 Nov 2024 17:23:17 +0530
Subject: [PATCH] Go Back button and microplan name quotes fix

---
 .../microplan/src/components/ActivityCard.js    |  2 +-
 .../pages/employee/FacilityCatchmentMapping.js  | 17 +++++++++++------
 .../microplan/src/pages/employee/PlanInbox.js   |  2 +-
 .../microplan/src/pages/employee/PopInbox.js    |  2 +-
 .../microplan/src/pages/employee/viewVillage.js |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js
index aa8b435fd07..d82dca100a9 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js
@@ -13,7 +13,7 @@ const ActivityHomeCard = ({onClickCard=()=>{},...props}) => {
   <div >
   <Header styles={{marginBottom:"1rem"}} className="pop-inbox-header">{t(props.title)}</Header>
                 <div className="summary-sub-heading" style={{marginBottom:"1.5rem"}}>
-                 {`"${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${props.microplanName || t("NO_NAME_AVAILABLE")}"`}
+                 {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${props.microplanName || t("NO_NAME_AVAILABLE")}`}
                 </div>
     <div className="activity-grid"
        >
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
index 3c63707bdbc..6a361769cdd 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
@@ -81,16 +81,12 @@ const FacilityCatchmentMapping = () => {
 
   const { isLoading, data, isFetching, refetch } = Digit.Hooks.useCustomAPIHook(reqCriteriaResource);
 
-
-  const { isLoading: isLoadingPlanObject, data: planObject, error: errorPlan, refetch: refetchPlan } = Digit.Hooks.microplanv1.useSearchPlanConfig(
+  const { isLoading: isLoadingPlanObject, data: planObject } = Digit.Hooks.microplanv1.useSearchPlanConfig(
     {
       PlanConfigurationSearchCriteria: {
         tenantId,
         id: url?.microplanId,
       },
-    },
-    {
-      enabled: isRootApprover && data?.TotalCount === 0,
     }
   );
 
@@ -160,7 +156,7 @@ const FacilityCatchmentMapping = () => {
     <div style={{ marginBottom: isRootApprover && data?.TotalCount === 0 && planObject?.status === "CENSUS_DATA_APPROVED" ?"2.5rem" :"0rem"}}>
       <Header styles={{ marginBottom: "1rem" }}>{t("MICROPLAN_ASSIGN_CATCHMENT_VILLAGES")}</Header>
       <div className="summary-sub-heading" style={{marginBottom:"1.5rem"}}>
-      {`"${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${planObject?.name || t("NO_NAME_AVAILABLE")}"`}
+      {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${planObject?.name || t("NO_NAME_AVAILABLE")}`}
     </div>
       <div className="inbox-search-wrapper">
         <InboxSearchComposer
@@ -185,6 +181,15 @@ const FacilityCatchmentMapping = () => {
           style={{}}
         />}
 
+      {!isRootApprover && data?.TotalCount === 0 && planObject?.status === "CENSUS_DATA_APPROVED" &&
+        <ActionBar
+          actionFields={[
+            <Button icon={"ArrowBack"} label={t(`GO_BACK_TO_HOME`)} onClick={() => history.push(`/${window.contextPath}/employee`)} type="button" variation="primary" />,
+          ]}
+          setactionFieldsToRight
+          sortActionFields
+        />}
+
       {showPopup && currentRow && (
         <FacilityPopUp
           details={currentRow}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
index cb0f320d414..f8532445c09 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
@@ -529,7 +529,7 @@ const PlanInbox = () => {
        <div>
       <Header styles={{marginBottom:"1rem"}} className="pop-inbox-header">{t(`HCM_MICROPLAN_VALIDATE_AND_APPROVE_MICROPLAN_ESTIMATIONS`)}</Header>
       <div className="summary-sub-heading">
-      {`"${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${campaignObject?.campaignName || t("NO_NAME_AVAILABLE")}"`}
+      {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${campaignObject?.campaignName || t("NO_NAME_AVAILABLE")}`}
     </div>
     </div>
       <SearchJurisdiction
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
index 9191aaa9e18..c9ea11d500e 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
@@ -510,7 +510,7 @@ const isStatusConditionMet = (statusCount) => {
       <div>
       <Header styles={{marginBottom:"1rem"}} className="pop-inbox-header">{t(`VALIDATE_APPROVE_POPULATIONDATA`)}</Header>
       <div className="summary-sub-heading">
-      {`"${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${planObject?.name || t("NO_NAME_AVAILABLE")}"`}
+      {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${planObject?.name || t("NO_NAME_AVAILABLE")}`}
     </div>
     </div>
       <SearchJurisdiction
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/viewVillage.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/viewVillage.js
index d77595aa2fb..e744ec8392b 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/viewVillage.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/viewVillage.js
@@ -221,7 +221,7 @@ const VillageView = () => {
             <div>
             <Header styles={{marginBottom:"1rem"}} className="pop-inbox-header">{t(boundaryCode)}</Header>
                 <div className="summary-sub-heading" style={{marginBottom:"1.5rem"}}>
-                 {`"${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${campaignObject?.campaignName || t("NO_NAME_AVAILABLE")}"`}
+                 {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${campaignObject?.campaignName || t("NO_NAME_AVAILABLE")}`}
                 </div>
                 <Card type="primary" className="middle-child">
                     {hierarchy.map((node, index) => (