Role access table

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

@@ -1,60 +1,55 @@
-import React from 'react'
+import React from 'react';
 import { Card } from '@egovernments/digit-ui-components';
 import HeaderComp from './HeaderComp';
 import { useTranslation } from 'react-i18next';
 
 const AssumptionsList = ({ customProps }) => {
-    const {t}=useTranslation();
-    const assumptionValues= customProps?.sessionData?.HYPOTHESIS.Assumptions?.assumptionValues
+    const { t } = useTranslation();
+
+    // Safely access assumptionValues using optional chaining
+    const assumptionValues = customProps?.sessionData?.HYPOTHESIS?.Assumptions?.assumptionValues || [];
 
     let dic = {};
+
+    // Iterate through assumptionValues and build the dictionary
     for (const ob of assumptionValues) {
-        if (!(ob?.category in dic)) {
-            dic[ob.category] = [{ [ob?.key]: ob.value }]
-        }else{
-            dic[ob.category].push({ [ob?.key]: ob.value })
+        const category = ob?.category || 'NA'; 
+        const key = ob?.key || 'NA';
+        const value = ob?.value || 'NA'; 
+
+        if (!(category in dic)) {
+            dic[category] = [{ [key]: value }];
+        } else {
+            dic[category].push({ [key]: value });
         }
     }
 
-
-
-
-
-
-
-
     return (
         <div>
-            {
-                Object.keys(dic).map((item, ind) => {
-
-                    return (
-                        < Card key={`card_${ind}`} style={{ padding: '20px', marginBottom: '15px' }}>
-                            <HeaderComp title={String(item)}/>
-                            <div className="as-table-like">
-                                {dic[item].map((item1, index) => {
-                                    // Since each item1 is an object with a single key-value pair
-                                    const [key, value] = Object.entries(item1)[0]; // Destructure the first and only key-value pair
-                                    return (
-                                        <div key={`pair_${index}`} className="as-table-row">
-                                            <span className="as-table-cell as-key-cell">
-                                                <strong>{t(key)}</strong> {/* Display key as label */}
-                                            </span>
-                                            <span className="as-table-cell as-value-cell">
-                                                {t(value)} {/* Display value */}
-                                            </span>
-                                        </div>
-                                    );
-                                })}
-                            </div>
-                        </Card>
-                    );
-                })
-            }
-
-
-        </div >
-    )
-}
-
-export default AssumptionsList
+            {Object.keys(dic).map((item, ind) => (
+                <Card key={`card_${ind}`} style={{ padding: '20px', marginBottom: '15px' }}>
+                    <HeaderComp title={String(item)} />
+                    <div className="as-table-like">
+                        {dic[item].map((item1, index) => {
+                            // Safely destructure the key-value pair, with fallbacks for missing data
+                            const [key, value] = Object.entries(item1)[0] || ['NA', 'NA'];
+
+                            return (
+                                <div key={`pair_${index}`} className="as-table-row">
+                                    <span className="as-table-cell as-key-cell">
+                                        <strong>{t(key)}</strong> {/* Display key as label */}
+                                    </span>
+                                    <span className="as-table-cell as-value-cell">
+                                        {t(value)} {/* Display value */}
+                                    </span>
+                                </div>
+                            );
+                        })}
+                    </div>
+                </Card>
+            ))}
+        </div>
+    );
+};
+
+export default AssumptionsList;

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

@@ -2,10 +2,10 @@ import React, { useState, Fragment } from "react";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { ActionBar, SubmitBar, ArrowLeft, ArrowForward } from "@egovernments/digit-ui-react-components";
+import { Button } from "@egovernments/digit-ui-components";
 import { PanelCard } from "@egovernments/digit-ui-components";
 import { Button } from "@egovernments/digit-ui-react-components";
 const Response = () => {
-
     const { t } = useTranslation();
     const history = useHistory();
     const queryStrings = Digit.Hooks.useQueryParams();
@@ -14,6 +14,8 @@ const Response = () => {
         queryStrings?.isSuccess === "true" ? true : queryStrings?.isSuccess === "false" ? false : true
     );
     const { state } = useLocation();
+    const back=(state?.back)?state?.back:"BACK";
+    const backlink=(state?.backlink)?(state.back):"employee";
     return (
         <>
             <PanelCard
@@ -25,7 +27,7 @@ const Response = () => {
                 cardStyles={{}}
                 className=""
                 customIcon=""
-                description="The user data uploaded will be available in your microplan user assignment section"
+                description={state.description}
                 // footerChildren={[
                 //     <Button label="OK" onClick={function noRefCheck() { }} type="button" />
                 // ]}
@@ -44,13 +46,13 @@ const Response = () => {
 
             </PanelCard>
             <ActionBar className="mc_back">
-                <Link to={`/${window.contextPath}/employee/microplan/user-management`}>
+                <Link to={`/${window.contextPath}${backlink}`}>
                     <Button
-                        style={{ margin: "0.5rem", minWidth: "12rem", marginLeft: "6rem" }}
+                        style={{ margin: "0.5rem", minWidth: "10rem", marginLeft: "6rem" }}
                         className="previous-button"
                         variation="secondary"
-                        label={t("BACK")}
-                        icon="ArrowBack"
+                        label={t(back)}
+                        icon={"ArrowBack"}
                     />
                 </Link>
             </ActionBar>

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

@@ -7,7 +7,7 @@ import { useUserAccessContext } from "./UserAccessWrapper";
 import { useMyContext } from "../utils/context";
 import { useQueryClient } from "react-query";
 
-function RoleTableComposer() {
+function RoleTableComposer({nationalRoles}) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -27,6 +27,8 @@ function RoleTableComposer() {
   const { mutate: planEmployeeCreate } = Digit.Hooks.microplanv1.usePlanEmployeeCreate();
   const { mutate: planEmployeeUpdate } = Digit.Hooks.microplanv1.usePlanEmployeeUpdate();
 
+
+  const topBoundary = state?.boundaryHierarchy.find(boundary => boundary.parentBoundaryType === null);
   const { isLoading: isHrmsLoading, data: HrmsData, error: hrmsError, refetch: refetchHrms } = Digit.Hooks.microplanv1.useSearchHRMSEmployee({
     tenantId: tenantId,
     microplanId: microplanId,
@@ -39,16 +41,23 @@ function RoleTableComposer() {
       enabled: false,
       select: (data) => {
         const resp = data?.Employees?.map((item, index) => {
+          let selectedHierarchy = state?.boundaryHierarchy?.find(
+            (j) => j.boundaryType === data?.planData?.find((i) => i.employeeId === item?.user?.userServiceUuid)?.hierarchyLevel
+          )
+          // if(category.startswith("ROOT")){
+          // 
+          // }
           return {
             rowIndex: index + 1,
             name: item?.user?.name,
             email: item?.user?.emailId,
             number: item?.user?.mobileNumber,
             employeeId: item?.user?.userServiceUuid,
             user: item?.user,
-            selectedHierarchy: state?.boundaryHierarchy?.find(
-              (j) => j.boundaryType === data?.planData?.find((i) => i.employeeId === item?.user?.userServiceUuid)?.hierarchyLevel
-            ),
+            selectedHierarchy:
+              state?.boundaryHierarchy?.find(
+                (j) => j.boundaryType === data?.planData?.find((i) => i.employeeId === item?.user?.userServiceUuid)?.hierarchyLevel
+              ),
             selectedBoundaries: data?.planData?.find((i) => i.employeeId === item?.user?.userServiceUuid)?.jurisdiction,
             userServiceUuid: item?.user?.userServiceUuid,
             planData: data?.planData?.find((i) => i.employeeId === item?.user?.userServiceUuid),
@@ -119,11 +128,11 @@ function RoleTableComposer() {
         return prev.map((i) =>
           i.rowIndex === row.rowIndex
             ? {
-                ...i,
-                selectedHierarchy: value,
-                boundaryOptions,
-                selectedBoundaries: i.selectedBoundaries || [], // Keep existing selected boundaries
-              }
+              ...i,
+              selectedHierarchy: value,
+              boundaryOptions,
+              selectedBoundaries: i.selectedBoundaries || [], // Keep existing selected boundaries
+            }
             : i
         );
       } else {
@@ -177,9 +186,9 @@ function RoleTableComposer() {
           return prev.map((i) =>
             i.rowIndex === row.rowIndex
               ? {
-                  ...i,
-                  selectedBoundaries: [], // Clear selected boundaries
-                }
+                ...i,
+                selectedBoundaries: [], // Clear selected boundaries
+              }
               : i
           );
         } else {
@@ -208,9 +217,9 @@ function RoleTableComposer() {
         return prev.map((i) =>
           i.rowIndex === row.rowIndex
             ? {
-                ...i,
-                selectedBoundaries: boundariesInEvent, // Update boundaries
-              }
+              ...i,
+              selectedBoundaries: boundariesInEvent, // Update boundaries
+            }
             : i
         );
       } else {
@@ -292,7 +301,18 @@ function RoleTableComposer() {
     {
       name: "Hierarchy",
       cell: (row) => {
-        return (
+        return (category in nationalRoles) ? (
+          <Dropdown
+            className="form-field"
+            selected={{ code: topBoundary?.boundaryType }}
+            disable={true}
+            isMandatory={true}
+            option={[{ key: 1, code: topBoundary?.boundaryType }]}
+            select={{ code:topBoundary?.boundaryType  }}
+            optionKey="code"
+            t={t}
+          />
+        ) : (
           <Dropdown
             className="roleTableCell"
             selected={rowData?.find((item) => item?.rowIndex === row?.rowIndex)?.selectedHierarchy || null}
@@ -307,8 +327,9 @@ function RoleTableComposer() {
             t={t}
           />
         );
-      },
+      }
     },
+
     {
       name: "Selected Boundary",
       cell: (row) => (
@@ -331,7 +352,7 @@ function RoleTableComposer() {
         const isUserAlreadyAssigned = HrmsData?.planSearchData?.filter((i) => i.employeeId === row.employeeId)?.length > 0 ? true : false;
         const isUserAlreadyAssignedActive =
           HrmsData?.planSearchData?.filter((i) => i.employeeId === row.employeeId)?.length > 0 &&
-          HrmsData?.planSearchData?.filter((i) => i.employeeId === row.employeeId)?.[0]?.active
+            HrmsData?.planSearchData?.filter((i) => i.employeeId === row.employeeId)?.[0]?.active
             ? true
             : false;
         return (
@@ -371,7 +392,9 @@ function RoleTableComposer() {
   const closeToast = () => {
     setShowToast(null);
   };
-  if (isHrmsLoading) return <Loader />;
+  if (isHrmsLoading) {
+    return <Loader />
+  };
   return (
     <>
       <Card>

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

@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import RoleTableComposer from "./RoleTableComposer";
 import DataTable from "react-data-table-component";
 
-function UserAccess({ category }) {
+function UserAccess({ category,setData,nationalRoles }) {
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const { campaignId, microplanId, key, ...queryParams } = Digit.Hooks.useQueryParams();
@@ -33,6 +33,7 @@ function UserAccess({ category }) {
     config: {
       enabled: true,
       select: (data) => {
+        setData(data);
         const rowData = data?.data?.map((item, index) => {
           return {
             id: index + 1,
@@ -84,7 +85,12 @@ function UserAccess({ category }) {
     {
       name: "Adminitrative Heirarchy",
       selector: (row) => {
-        return row?.hierarchyLevel;
+        // if (category?.startsWith("ROOT")) {
+        //   return "COUNTRY"; // Set to "Country" if true
+        // } else {
+        //   return row?.hierarchyLevel; // Otherwise, return the existing hierarchy level
+        // }
+        return  row?.hierarchyLevel;
       },
       sortable: true,
     },
@@ -95,6 +101,7 @@ function UserAccess({ category }) {
           <>
             {row?.jurisdiction?.map((item) => (
               <div className="digit-tag-container userAccessCell">
+
                 <Chip
                   className=""
                   error=""
@@ -127,7 +134,7 @@ function UserAccess({ category }) {
             <Button variation="secondary" label={t(`ASSIGN`)} icon={"AddIcon"} onClick={() => setShowPopUp(true)} />
           </div>
           <DataTable
-            columns={columns}
+            category={category}
             data={planEmployee?.data}
             pagination
             paginationServer
@@ -149,7 +156,7 @@ function UserAccess({ category }) {
           className={"roleComposer"}
           type={"default"}
           heading={t(`${category}`)}
-          children={[<RoleTableComposer />]}
+          children={[<RoleTableComposer category={category} nationalRoles={nationalRoles} />]}
           onOverlayClick={() => {}}
           footerChildren={[<Button type={"button"} size={"large"} variation={"secondary"} label={t("CLOSE")} onClick={() => setShowPopUp(false)} />]}
           sortFooterChildren={true}
@@ -172,4 +179,4 @@ function UserAccess({ category }) {
   );
 }
 
-export default UserAccess;
+export default UserAccess;