added fixes for sort, view summary issue, no results in dropdown

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/MultiSelectDropdown.js

@@ -822,8 +822,18 @@ const MultiSelectDropdown = ({
   const Menu = () => {
     const optionsToRender = variant === "nestedmultiselect" ? flattenedOptions : filteredOptions;
 
-    if (!optionsToRender) {
-      return null;
+    if (!optionsToRender || optionsToRender?.length === 0) {
+      return (
+        <div
+          className={`digit-multiselectdropodwn-menuitem ${
+            variant ? variant : ""
+          } unsuccessfulresults`}
+          key={"-1"}
+          onClick={() => {}}
+        >
+          {<span> {t("NO_RESULTS_FOUND")}</span>}
+        </div>
+      );
     }
 
     return (

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/PopInboxTable.js

@@ -68,7 +68,7 @@ const PopInboxTable = ({ ...props }) => {
           ) : (
             t("ES_COMMON_NA") 
           ),
-        sortable: true,
+        sortable: false,
         width: "180px",
       },
       ...(

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/VillageHierarchyTooltipWrapper.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Loader, TooltipWrapper } from "@egovernments/digit-ui-components";
 import { InfoBannerIcon } from "@egovernments/digit-ui-react-components";
-
+import { InfoOutline } from "@egovernments/digit-ui-svg-components";
 
 const VillageHierarchyTooltipWrapper = ({ boundaryCode,placement="right",wrapperClassName}) => {
     const { t } = useTranslation();
@@ -119,7 +119,7 @@ const VillageHierarchyTooltipWrapper = ({ boundaryCode,placement="right",wrapper
         description={tooltipContent}
         wrapperClassName={wrapperClassName || ""}
       >
-        <InfoBannerIcon fill={"#C84C0E"} />
+        <InfoOutline fill={"#C84C0E"} width={"20px"} height={"20px"} />
       </TooltipWrapper>
     );
 };

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/FacilityMappingConfig.js

@@ -37,7 +37,7 @@ const facilityMappingConfig = (projectType, disabledAction) => {
           },
           fields: [
             {
-              label: "MICROPLAN_FACILITY_NAME",
+              label: "MICROPLAN_FACILITY_NAME_LABEL",
               type: "text",
               isMandatory: false,
               disable: false,
@@ -54,7 +54,7 @@ const facilityMappingConfig = (projectType, disabledAction) => {
               },
             },
             {
-              label: "MICROPLAN_FACILITY_TYPE",
+              label: "MICROPLAN_FACILITY_TYPE_LABEL",
               type: "dropdown",
               isMandatory: false,
               disable: false,
@@ -68,7 +68,7 @@ const facilityMappingConfig = (projectType, disabledAction) => {
               },
             },
             {
-              label: "CORE_COMMON_STATUS",
+              label: "CORE_COMMON_STATUS_LABEL",
               type: "dropdown",
               isMandatory: false,
               disable: false,
@@ -82,7 +82,7 @@ const facilityMappingConfig = (projectType, disabledAction) => {
               },
             },
             {
-              label: "MICROPLAN_RESIDING_VILLAGE",
+              label: "MICROPLAN_RESIDING_VILLAGE_LABEL",
               type: "apidropdown",
               isMandatory: false,
               disable: false,

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js

@@ -507,7 +507,7 @@ const PlanInbox = () => {
       return {
         name: t(i?.question),
         cell: (row) => row?.[`securityDetail_${i?.question}`] || t("ES_COMMON_NA"),
-        sortable: true,
+        sortable: false,
         width: "180px",
       };
     });
@@ -530,6 +530,13 @@ const PlanInbox = () => {
       ),
       // cell: (row) => t(row?.village) || "NA",
       sortable: true,
+      sortFunction: (rowA, rowB) => {
+        const villageA = t(rowA?.village).toLowerCase();
+        const villageB = t(rowB?.village).toLowerCase();
+        if (villageA < villageB) return -1;
+        if (villageA > villageB) return 1;
+        return 0;
+      },
       width: "180px",
     },
     {
@@ -562,24 +569,45 @@ const PlanInbox = () => {
         ) : (
           t("ES_COMMON_NA")
         ),
-      sortable: true,
+      sortable: false,
       width: "180px",
     },
     {
       name: t(`HCM_MICROPLAN_SERVING_FACILITY`),
       cell: (row) => t(row?.servingFacility) || "NA",
+      sortFunction: (rowA, rowB) => {
+        const facilityA = t(rowA?.servingFacility).toLowerCase();
+        const facilityB = t(rowB?.servingFacility).toLowerCase();
+        if (facilityA < facilityB) return -1;
+        if (facilityA > facilityB) return 1;
+        return 0;
+      },
       sortable: true,
       width: "180px",
     },
     {
       name: t(`HCM_MICROPLAN_VILLAGE_ROAD_CONDITION_LABEL`),
       cell: (row) => t(row?.villageRoadCondition) || "NA",
+      sortFunction: (rowA, rowB) => {
+        const villageRoadConditionA = t(rowA?.villageRoadCondition).toLowerCase();
+        const villageRoadConditionB = t(rowB?.villageRoadCondition).toLowerCase();
+        if (villageRoadConditionA < villageRoadConditionB) return -1;
+        if (villageRoadConditionA > villageRoadConditionB) return 1;
+        return 0;
+      },
       sortable: true,
       width: "180px",
     },
     {
       name: t(`HCM_MICROPLAN_VILLAGE_TERRAIN_LABEL`),
       cell: (row) => t(row?.villageTerrain) || "NA",
+      sortFunction: (rowA, rowB) => {
+        const villageTerrainA = t(rowA?.villageTerrain).toLowerCase();
+        const villageTerrainB = t(rowB?.villageTerrain).toLowerCase();
+        if (villageTerrainA < villageTerrainB) return -1;
+        if (villageTerrainA > villageTerrainB) return 1;
+        return 0;
+      },
       sortable: true,
       width: "180px",
     },

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js

@@ -409,7 +409,13 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
         <ActionBar
           style={{ zIndex: "19" }}
           setactionFieldsToRight
-          actionFields={[<Button label={t("GO_BACK_TO_MY_MICROPLAN")} onClick={() => history.goBack()} />]}
+          actionFields={[
+            <Button
+              label={t("GO_BACK_TO_MY_MICROPLAN")}
+              // onClick={() => history.goBack()}
+              onClick={() => history.push(`/${window.contextPath}/employee/microplan/microplan-search`)}
+            />,
+          ]}
         />
       ) : null}
       {showToast && (