From b2d345b92832783762fd368d8f3e3ab2de55b89e Mon Sep 17 00:00:00 2001
From: abishekTa-egov <abishek.t@egovernments.org>
Date: Mon, 6 Jan 2025 15:04:44 +0530
Subject: [PATCH] BUGFIX/HCMPRE-1810: Fix issue for next page in user tagging
 (#2104)

* for clickng on save and next

* remove console
---
 .../modules/microplan/src/components/RoleTableComposer.js     | 4 +++-
 .../modules/microplan/src/components/UserAccessWrapper.js     | 1 +
 .../microplan/src/hooks/services/createUpdatePlanProject.js   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js
index b44f3bf455..bbc28edeef 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js
@@ -78,7 +78,9 @@ function RoleTableComposer({ nationalRoles }) {
     config: {
       enabled: true,
       select: (data) => {
-        const resp = data?.Employees?.map((item, index) => {
+        const resp = data?.Employees
+        ?.filter((emp)=> emp?.user?.userServiceUuid!== null)
+        ?.map((item, index) => {
           return {
             rowIndex: index + 1,
             name: item?.user?.name,
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js
index ce3863d2c2..c708c0e62f 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js
@@ -142,6 +142,7 @@ const UserAccessWrapper = ({ onSelect, props: customProps, setupCompleted }) =>
     updateUrlParams({ internalKey });
   }, [internalKey]);
 
+
   return (
     <Fragment>
       <UserAccessContext.Provider value={{ hierarchyData, category: rolesArray?.[internalKey - 1] }}>
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/createUpdatePlanProject.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/createUpdatePlanProject.js
index 22ba78ea3e..fb7d9fe5d2 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/createUpdatePlanProject.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/createUpdatePlanProject.js
@@ -892,7 +892,7 @@ const createUpdatePlanProject = async (req) => {
           });
           const updatedPlanObject = {
             ...fetchedPlan,
-            additionalDetails:{...fetchedPlanForBoundary.additionalDetails,key:key}
+            additionalDetails:{...fetchedPlan.additionalDetails,key:key}
           };
           const response= await updatePlan(updatedPlanObject);
           // Return as expected