From 2e58a6e7eee0af0a2e160beee25695aaa2fd46ad Mon Sep 17 00:00:00 2001
From: maruthi phanendra <phanendra.chaluvadi@beehyv.com>
Date: Mon, 10 Feb 2025 16:23:35 +0530
Subject: [PATCH 1/4] updated hrms for v2

---
 .../libraries/src/services/elements/MDMS.js   |   3 +-
 .../src/services/elements/User/index.js       |   1 +
 .../hrms/src/components/config/config.js      |  62 +--
 .../components/pageComponents/assignment.js   | 363 ++++++++++++++----
 .../hrms/src/pages/EditEmployee/EditForm.js   |   4 +-
 .../modules/hrms/src/pages/EmployeeDetails.js |   8 +-
 .../modules/hrms/src/pages/createEmployee.js  | 171 ++++++---
 micro-ui/web/package.json                     |   4 +-
 8 files changed, 446 insertions(+), 170 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js
index 23d4e2acb6d..0dbc3d19e8b 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js
@@ -50,7 +50,7 @@ const initRequestBody = (tenantId) => ({
     moduleDetails: [
       {
         moduleName: "common-masters",
-        masterDetails: [{ name: "CourtEstablishment" }, { name: "Court_Rooms" },{ name: "Designation" }, { name: "StateInfo" }, { name: "wfSlaConfig" }, { name: "uiHomePage" }],
+        masterDetails: [{ name: "CourtEstablishment" },{ name: "District" }, { name: "Court_Rooms" },{ name: "Designation" }, { name: "StateInfo" }, { name: "wfSlaConfig" }, { name: "uiHomePage" }],
       },
       {
         moduleName: "tenant",
@@ -727,6 +727,7 @@ const getHrmsEmployeeRolesandDesignations = () => ({
       moduleName: "common-masters",
       masterDetails: [
         { name: "CourtEstablishment", filter: "[?(@.active == true)]" },
+        { name: "District", filter: "[?(@.active == true)]" },
         { name: "Designation", filter: "[?(@.active == true)]" },
         { name: "Court_Rooms", filter: "[?(@.active == true)]" },
       ],
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
index 96438af62b6..53287a089ca 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
@@ -8,6 +8,7 @@ export const UserService = {
     Object.entries(details).forEach(([key, value]) => data.append(key, value));
     data.append("scope", "read");
     data.append("grant_type", "password");
+    console.log("detailss");
 
     let authResponse = await ServiceRequest({
       serviceName: "authenticate",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/config/config.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/config/config.js
index bb0b05778fc..2ee3e31a7b6 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/config/config.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/config/config.js
@@ -20,12 +20,12 @@ export const newConfig = [
       //   key: "SelectEmployeeGender",
       //   withoutLabel: true,
       // },
-      {
-        type: "component",
-        component: "SelectDateofBirthEmployment",
-        key: "SelectDateofBirthEmployment",
-        withoutLabel: true,
-      },
+      // {
+      //   type: "component",
+      //   component: "SelectDateofBirthEmployment",
+      //   key: "SelectDateofBirthEmployment",
+      //   withoutLabel: true,
+      // },
       {
         type: "component",
         component: "SelectEmployeeEmailId",
@@ -55,37 +55,37 @@ export const newConfig = [
       //   key: "SelectDateofEmployment",
       //   withoutLabel: true,
       // },
-      // {
-      //   type: "component",
-      //   component: "SelectEmployeeId",
-      //   key: "SelectEmployeeId",
-      //   withoutLabel: true,
-      // },
+      {
+        type: "component",
+        component: "SelectEmployeeId",
+        key: "SelectEmployeeId",
+        withoutLabel: true,
+      },
 
-      // {
-      //   type: "component",
-      //   component: "HRBanner",
-      //   key: "Banner1",
-      //   withoutLabel: true,
-      //   texts: {
-      //     headerCaption: "Info",
-      //     header: "HR_EMP_ID_MESSAGE",
-      //   },
-      // },
-    ],
-  },
-  {
-    head: "HR_JURISDICTION_DETAILS_HEADER",
-    body: [
       {
         type: "component",
-        isMandatory: true,
-        component: "Jurisdictions",
-        key: "Jurisdictions",
+        component: "HRBanner",
+        key: "Banner1",
         withoutLabel: true,
+        texts: {
+          headerCaption: "Info",
+          header: "HR_EMP_ID_MESSAGE",
+        },
       },
     ],
   },
+  // {
+  //   head: "HR_JURISDICTION_DETAILS_HEADER",
+  //   body: [
+  //     {
+  //       type: "component",
+  //       isMandatory: true,
+  //       component: "Jurisdictions",
+  //       key: "Jurisdictions",
+  //       withoutLabel: true,
+  //     },
+  //   ],
+  // },
 
   {
     head: "HR_ASSIGN_DET_HEADER",
@@ -96,7 +96,7 @@ export const newConfig = [
         key: "Banner2",
         withoutLabel: true,
         texts: {
-          nosideText:true,
+          nosideText: true,
           headerCaption: "Info",
           header: "HR_ASSIGN_DET_SUB_HEADER",
         },
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
index 237c03b1896..397bc9df059 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
@@ -1,18 +1,27 @@
-import { CardLabel, CheckBox, DatePicker, Dropdown, LabelFieldPair, Loader } from "@egovernments/digit-ui-react-components";
+import {
+  CardLabel,
+  CheckBox,
+  DatePicker,
+  Dropdown,
+  LabelFieldPair,
+  Loader,
+  MultiSelectDropdown,
+  RemoveableTag,
+} from "@egovernments/digit-ui-react-components";
 import React, { useEffect, useState } from "react";
 import cleanup from "../Utils/cleanup";
 import { convertEpochToDate } from "../Utils/index";
 
 const makeDefaultValues = (sessionFormData) => {
-  return sessionFormData?.Assignments?.map((ele,index)=>{
+  return sessionFormData?.Assignments?.map((ele, index) => {
     return {
       key: index,
-      fromDate: ele.fromDate ? convertEpochToDate(ele.fromDate): null,
-      toDate: ele.toDate ? convertEpochToDate(ele.toDate):null,
-      isCurrentAssignment: ele?.isCurrentAssignment,
+      fromDate: ele.fromDate ? convertEpochToDate(ele.fromDate) : null,
+      toDate: ele.toDate ? convertEpochToDate(ele.toDate) : null,
+      // isCurrentAssignment: ele?.isCurrentAssignment,
       designation: {
         code: ele?.designation,
-        i18key: ele.designation ? "COMMON_MASTERS_DESIGNATION_" + ele.designation:null,
+        i18key: ele.designation ? "COMMON_MASTERS_DESIGNATION_" + ele.designation : null,
       },
       courtEstablishment: {
         code: ele?.courtEstablishment,
@@ -20,20 +29,25 @@ const makeDefaultValues = (sessionFormData) => {
       },
       courtroom: {
         code: ele?.courtroom,
-        i18key: ele.courtEstablishment ? "COMMON_MASTERS_COURT_ROOM_" + ele.courtroom : null,
+        i18key: ele.courtroom ? "COMMON_MASTERS_COURT_ROOM_" + ele.courtroom : null,
       },
-    }
-  })
-}
+      district: {
+        code: ele?.district,
+        i18key: ele.district ? "COMMON_MASTERS_DISTRICT_" + ele.district : null,
+      },
+      roles: ele?.roles || [],
+    };
+  });
+};
 
 const Assignments = ({ t, config, onSelect, userType, formData }) => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const { data: data = {}, isLoading } = Digit.Hooks.hrms.useHrmsMDMS(tenantId, "egov-hrms", "HRMSRolesandDesignation") || {};
-  const [currentassignemtDate, setCurrentAssiginmentDate] = useState(null);
+  // const [currentassignemtDate, setCurrentAssiginmentDate] = useState(null);
 
   const employeeCreateSession = Digit.Hooks.useSessionStorage("NEW_EMPLOYEE_CREATE", {});
-  const [sessionFormData,setSessionFormData, clearSessionFormData] = employeeCreateSession;
-  const isEdit = window.location.href.includes("hrms/edit")
+  const [sessionFormData, setSessionFormData, clearSessionFormData] = employeeCreateSession;
+  const isEdit = window.location.href.includes("hrms/edit");
 
   const [assignments, setassignments] = useState(
     !isEdit && sessionFormData?.Assignments
@@ -43,13 +57,38 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
             key: 1,
             fromDate: undefined,
             toDate: undefined,
-            isCurrentAssignment: false,
+            // isCurrentAssignment: false,
             courtEstablishment: null,
             designation: null,
+            district: null,
             courtroom: null,
+            roles: [],
           },
         ]
   );
+
+  useEffect(() => {
+    console.log("checking");
+    
+    // setassignments(
+    //   makeDefaultValues(sessionFormData) ||
+    //     formData?.Assignments || [
+    //       {
+    //         key: 1,
+    //         fromDate: undefined,
+    //         toDate: undefined,
+    //         // isCurrentAssignment: false,
+    //         courtEstablishment: null,
+    //         designation: null,
+    //         district: null,
+    //         courtroom: null,
+    //         roles: [],
+    //       },
+    //     ]
+    // );
+  }, [sessionFormData]);
+
+  // console.log(assignments, sessionFormData, "assignments");
   const reviseIndexKeys = () => {
     setassignments((prev) => prev.map((unit, index) => ({ ...unit, key: index })));
   };
@@ -61,10 +100,12 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
         key: prev.length + 1,
         fromDate: undefined,
         toDate: undefined,
-        isCurrentAssignment: false,
+        // isCurrentAssignment: false,
         courtEstablishment: null,
+        district: null,
         designation: null,
         courtroom: null,
+        roles: [],
       },
     ]);
   };
@@ -79,7 +120,7 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
 
   useEffect(() => {
     var promises = assignments?.map((assignment) => {
-      return assignment
+      let res = assignment
         ? cleanup({
             id: assignment?.id,
             position: assignment?.position,
@@ -88,12 +129,20 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
             auditDetails: assignment?.auditDetails,
             fromDate: assignment?.fromDate ? new Date(assignment?.fromDate).getTime() : undefined,
             toDate: assignment?.toDate ? new Date(assignment?.toDate).getTime() : undefined,
-            isCurrentAssignment: assignment?.isCurrentAssignment,
+            // isCurrentAssignment: true,
             courtEstablishment: assignment?.courtEstablishment?.code,
+            district: assignment?.district?.code,
             designation: assignment?.designation?.code,
             courtroom: assignment?.courtroom?.code,
           })
         : [];
+      if (assignment?.roles) {
+        res["roles"] = assignment?.roles.map((ele) => {
+          delete ele.description;
+          return ele;
+        });
+      }
+      return res;
     });
 
     Promise.all(promises).then(function (results) {
@@ -103,16 +152,17 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
       );
     });
 
-    assignments.map((ele) => {
-      if (ele.isCurrentAssignment) {
-        setCurrentAssiginmentDate(ele.fromDate);
-      }
-    });
+    // assignments.map((ele) => {
+    //   if (ele.isCurrentAssignment) {
+    //     setCurrentAssiginmentDate(ele.fromDate);
+    //   }
+    // });
   }, [assignments]);
 
   let courtEstablishment = [];
   let designation = [];
   let courtroom = [];
+  let district = [];
   const [focusIndex, setFocusIndex] = useState(-1);
 
   function getCourtEstablishment() {
@@ -125,6 +175,16 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
       return keyA.localeCompare(keyB);
     });
   }
+  function getDistrict() {
+    return data?.MdmsRes?.["common-masters"]?.District?.map((ele) => {
+      ele["i18key"] = t("COMMON_MASTERS_DISTRICT_" + ele.code);
+      return ele;
+    }).sort((a, b) => {
+      const keyA = a?.i18key || "";
+      const keyB = b?.i18key || "";
+      return keyA.localeCompare(keyB);
+    });
+  }
 
   function getdesignationdata() {
     return data?.MdmsRes?.["common-masters"]?.Designation.map((ele) => {
@@ -146,6 +206,17 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
       return keyA.localeCompare(keyB);
     });
   }
+  function getroledata() {
+    return data?.MdmsRes?.["ACCESSCONTROL-ROLES"].roles
+      .map((role) => {
+        return { code: role.code, name: role?.name ? role?.name : " ", labelKey: "ACCESSCONTROL_ROLES_ROLES_" + role.code };
+      })
+      .sort((a, b) => {
+        const labelKeyA = t(a?.labelKey) || "";
+        const labelKeyB = t(b?.labelKey) || "";
+        return labelKeyA.localeCompare(labelKeyB);
+      });
+  }
   if (isLoading) {
     return <Loader />;
   }
@@ -154,7 +225,7 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
       {assignments?.map((assignment, index) => (
         <Assignment
           t={t}
-          key={index}
+          key={assignment.key}
           keys={index.key}
           formData={formData}
           assignment={assignment}
@@ -163,6 +234,7 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
           focusIndex={focusIndex}
           setFocusIndex={setFocusIndex}
           getCourtEstablishment={getCourtEstablishment}
+          getDistrict={getDistrict}
           courtEstablishment={courtEstablishment}
           designation={designation}
           courtroom={courtroom}
@@ -170,8 +242,9 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
           getcourtroomdata={getcourtroomdata}
           assignments={assignments}
           handleRemoveUnit={handleRemoveUnit}
-          setCurrentAssiginmentDate={setCurrentAssiginmentDate}
-          currentassignemtDate={currentassignemtDate}
+          // setCurrentAssiginmentDate={setCurrentAssiginmentDate}
+          // currentassignemtDate={currentassignemtDate}
+          getroledata={getroledata}
         />
       ))}
       <label onClick={handleAddUnit} className="link-label" style={{ width: "12rem" }}>
@@ -189,50 +262,173 @@ function Assignment({
   focusIndex,
   setFocusIndex,
   getCourtEstablishment,
+  getDistrict,
   courtEstablishment,
   formData,
   handleRemoveUnit,
   designation,
+  district,
   courtroom,
   getdesignationdata,
   getcourtroomdata,
-  setCurrentAssiginmentDate,
-  currentassignemtDate,
+  // setCurrentAssiginmentDate,
+  // currentassignemtDate,
+  getroledata,
+  roleoption,
 }) {
   const selectCourtEstablishment = (value) => {
-    setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, courtEstablishment: value } : item)));
+    if (!value) return;
+
+    // Find the corresponding district
+    const districtData = getDistrict();
+    const correspondingDistrict = districtData?.find((dist) => dist.code === value.district);
+
+    // Clear courtroom if it doesn't belong to the selected establishment
+    const currentCourtroom = assignment?.courtroom;
+    const newCourtroom = currentCourtroom?.establishment === value.code ? currentCourtroom : null;
+
+    setassignments((pre) =>
+      pre.map((item) =>
+        item.key === assignment.key
+          ? {
+              ...item,
+              courtEstablishment: value,
+              district: correspondingDistrict,
+              courtroom: newCourtroom,
+            }
+          : item
+      )
+    );
   };
+
   const selectDesignation = (value) => {
     setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, designation: value } : item)));
   };
   const selectCourtroom = (value) => {
-    setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, courtroom: value } : item)));
+    if (!value) return;
+
+    // Find the corresponding court establishment for the selected courtroom
+    const courtEstablishmentData = getCourtEstablishment();
+    console.log(courtEstablishmentData, "courtEstablishmentData");
+
+    const correspondingEstablishment = courtEstablishmentData?.find((est) => est.code === value.establishment);
+
+    if (!correspondingEstablishment) return;
+
+    // Find the district for the court establishment
+    const districtData = getDistrict();
+    const correspondingDistrict = districtData?.find((dist) => dist.code === correspondingEstablishment.district);
+
+    // Update all related fields
+    setassignments((pre) =>
+      pre.map((item) =>
+        item.key === assignment.key
+          ? {
+              ...item,
+              courtroom: value,
+              courtEstablishment: correspondingEstablishment,
+              district: correspondingDistrict,
+            }
+          : item
+      )
+    );
   };
 
-  const onAssignmentChange = (value) => {
+  const selectDistrict = (value) => {
+    if (!value) return;
+
+    // Clear court establishment and courtroom if they don't belong to the selected district
+    const currentEstablishment = assignment?.courtEstablishment;
+    const newEstablishment = currentEstablishment?.district === value.code ? currentEstablishment : null;
+
+    const currentCourtroom = assignment?.courtroom;
+    const newCourtroom = currentCourtroom && newEstablishment?.code === currentCourtroom.establishment ? currentCourtroom : null;
+
     setassignments((pre) =>
-      pre.map((item) => (item.key === assignment.key ? { ...item, isCurrentAssignment: value } : { ...item, isCurrentAssignment: false }))
+      pre.map((item) =>
+        item.key === assignment.key
+          ? {
+              ...item,
+              district: value,
+              courtEstablishment: newEstablishment,
+              courtroom: newCourtroom,
+            }
+          : item
+      )
     );
-    if (value) {
-      setassignments((pre) =>
-        pre.map((item) =>
-          item.key === assignment.key
-            ? {
-                ...item,
-                toDate: null,
-              }
-            : item
-        )
-      );
-      assignments.map((ele) => {
-        if (ele.key == assignment.key) {
-          setCurrentAssiginmentDate(ele.fromDate);
-        }
+  };
+
+  const selectrole = (e, data) => {
+    let res = [];
+    e &&
+      e?.map((ob) => {
+        res.push(ob?.[1]);
       });
-    } else {
-      setCurrentAssiginmentDate(null);
+
+    res?.forEach((resData) => {
+      resData.labelKey = "ACCESSCONTROL_ROLES_ROLES_" + resData.code;
+    });
+
+    setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, roles: res } : item)));
+  };
+  const onRemove = (index, key) => {
+    let afterRemove = assignment?.roles.filter((value, i) => {
+      return i !== index;
+    });
+    setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, roles: afterRemove } : item)));
+  };
+  const getFilteredCourtEstablishments = () => {
+    const selectedDistrict = assignment?.district;
+    const courtEstablishmentData = getCourtEstablishment();
+    console.log(selectedDistrict, courtEstablishmentData, "selectedDistrict, courtEstablishmentData");
+
+    if (!selectedDistrict) return courtEstablishmentData;
+    return courtEstablishmentData?.filter((ele) => ele.district === selectedDistrict.code);
+  };
+
+  const getFilteredCourtrooms = () => {
+    const selectedEstablishment = assignment?.courtEstablishment;
+    const selectedDistrict = assignment?.district;
+    const courtroomData = getcourtroomdata();
+
+    if (!courtroomData) return [];
+
+    if (selectedEstablishment) {
+      return courtroomData.filter((room) => room.establishment === selectedEstablishment.code);
+    }
+
+    if (selectedDistrict) {
+      const validEstablishments = getCourtEstablishment()?.filter((est) => est.district === selectedDistrict.code);
+      return courtroomData.filter((room) => validEstablishments.some((est) => est.code === room.establishment));
     }
+
+    return courtroomData;
   };
+
+  // const onAssignmentChange = (value) => {
+  //   setassignments((pre) =>
+  //     pre.map((item) => (item.key === assignment.key ? { ...item, isCurrentAssignment: value } : { ...item, isCurrentAssignment: false }))
+  //   );
+  //   if (value) {
+  //     setassignments((pre) =>
+  //       pre.map((item) =>
+  //         item.key === assignment.key
+  //           ? {
+  //               ...item,
+  //               toDate: null,
+  //             }
+  //           : item
+  //       )
+  //     );
+  //     assignments.map((ele) => {
+  //       if (ele.key == assignment.key) {
+  //         setCurrentAssiginmentDate(ele.fromDate);
+  //       }
+  //     });
+  //   } else {
+  //     setCurrentAssiginmentDate(null);
+  //   }
+  // };
   const onIsHODchange = (value) => {
     setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, isHOD: value } : item)));
   };
@@ -240,6 +436,9 @@ function Assignment({
   const ValidateDatePickers = (value) => {
     assignments;
   };
+  const currentDate = new Date();
+  const tommorowDate = new Date(currentDate.getTime() + 24 * 60 * 60 * 1000);
+
   return (
     <div key={index + 1} style={{ marginBottom: "16px" }}>
       <div style={{ border: "1px solid #E3E3E3", padding: "16px", marginTop: "8px" }}>
@@ -262,8 +461,8 @@ function Assignment({
             <DatePicker
               type="date"
               name="fromDate"
-              max={currentassignemtDate ? currentassignemtDate : convertEpochToDate(new Date())}
-              min={formData?.SelectDateofEmployment?.dateOfAppointment}
+              max={convertEpochToDate(new Date())}
+              // min={formData?.SelectDateofEmployment?.dateOfAppointment}
               disabled={assignment?.id ? true : false}
               onChange={(e) => {
                 setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, fromDate: e } : item)));
@@ -283,9 +482,7 @@ function Assignment({
             <DatePicker
               type="date"
               name="toDate"
-              min={assignment?.fromDate}
-              max={currentassignemtDate ? currentassignemtDate : convertEpochToDate(new Date())}
-              disabled={assignment?.isCurrentAssignment}
+              min={convertEpochToDate(tommorowDate)}
               onChange={(e) => {
                 setassignments((pre) => pre.map((item) => (item.key === assignment.key ? { ...item, toDate: e } : item)));
                 setFocusIndex(index);
@@ -296,7 +493,7 @@ function Assignment({
           </div>
         </LabelFieldPair>
 
-        <LabelFieldPair>
+        {/* <LabelFieldPair>
           <CardLabel className="card-label-smaller" style={{ color: "white" }}>
             .
           </CardLabel>
@@ -307,6 +504,19 @@ function Assignment({
               label={t("HR_CURRENTLY_ASSIGNED_HERE_SWITCH_LABEL")}
             />
           </div>
+        </LabelFieldPair> */}
+        <LabelFieldPair>
+          <CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}> {`${t("HR_DISTRICT")} * `}</CardLabel>
+          <Dropdown
+            className="form-field"
+            selected={assignment?.district}
+            disable={assignment?.id ? true : false}
+            optionKey={"i18key"}
+            option={getDistrict() || []}
+            select={selectDistrict}
+            optionCardStyles={{ maxHeight: "300px" }}
+            t={t}
+          />
         </LabelFieldPair>
         <LabelFieldPair>
           <CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}> {`${t("HR_COURT_ESTABLISHMENT")} * `}</CardLabel>
@@ -315,40 +525,61 @@ function Assignment({
             selected={assignment?.courtEstablishment}
             disable={assignment?.id ? true : false}
             optionKey={"i18key"}
-            option={getCourtEstablishment(courtEstablishment) || []}
+            option={getFilteredCourtEstablishments() || []}
             select={selectCourtEstablishment}
             optionCardStyles={{ maxHeight: "300px" }}
             t={t}
           />
         </LabelFieldPair>
-
         <LabelFieldPair>
-          <CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}>{`${t("HR_DESG_LABEL")} * `}</CardLabel>
+          <CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}>{`${t("HR_COURTRROOM_LABEL")} * `}</CardLabel>
           <Dropdown
             className="form-field"
-            selected={assignment?.designation}
+            selected={assignment?.courtroom}
             disable={assignment?.id ? true : false}
-            option={getdesignationdata(designation) || []}
-            select={selectDesignation}
-            optionCardStyles={{maxHeight:"250px"}}
+            option={getFilteredCourtrooms() || []}
+            select={selectCourtroom}
+            optionCardStyles={{ maxHeight: "250px" }}
             optionKey={"i18key"}
             t={t}
           />
         </LabelFieldPair>
 
         <LabelFieldPair>
-          <CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}>{`${t("HR_COURTRROOM_LABEL")} * `}</CardLabel>
+          <CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}>{`${t("HR_DESG_LABEL")} * `}</CardLabel>
           <Dropdown
             className="form-field"
-            selected={assignment?.courtroom}
+            selected={assignment?.designation}
             disable={assignment?.id ? true : false}
-            option={getcourtroomdata(courtroom) || []}
-            select={selectCourtroom}
-            optionCardStyles={{maxHeight:"250px"}}
+            option={getdesignationdata(designation) || []}
+            select={selectDesignation}
+            optionCardStyles={{ maxHeight: "250px" }}
             optionKey={"i18key"}
             t={t}
           />
         </LabelFieldPair>
+
+        <LabelFieldPair>
+          <CardLabel className="card-label-smaller">{t("HR_COMMON_TABLE_COL_ROLE")} *</CardLabel>
+          <div className="form-field">
+            <MultiSelectDropdown
+              className="form-field"
+              isMandatory={true}
+              defaultUnit="Selected"
+              selected={assignment?.roles || []}
+              options={getroledata()}
+              onSelect={selectrole}
+              optionsKey="labelKey"
+              t={t}
+            />
+            <div className="tag-container">
+              {assignment?.roles.length > 0 &&
+                assignment?.roles.map((value, index) => {
+                  return <RemoveableTag key={index} text={`${t(value["labelKey"]).slice(0, 22)} ...`} onClick={() => onRemove(index, value)} />;
+                })}
+            </div>
+          </div>
+        </LabelFieldPair>
       </div>
     </div>
   );
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
index 3c488eda13c..aa81d4c38e2 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
@@ -70,7 +70,7 @@ const EditForm = ({ tenantId, data }) => {
       },
     },
 
-    SelectDateofBirthEmployment: { dob: convertEpochToDate(data?.user?.dob) },
+    // SelectDateofBirthEmployment: { dob: convertEpochToDate(data?.user?.dob) },
     Jurisdictions: data?.jurisdictions.map((ele, index) => {
       return Object.assign({}, ele, {
         key: index,
@@ -196,7 +196,7 @@ const EditForm = ({ tenantId, data }) => {
     requestdata.jurisdictions = input?.Jurisdictions;
     requestdata.user.emailId = input?.SelectEmployeeEmailId?.emailId ? input?.SelectEmployeeEmailId?.emailId : undefined;
     requestdata.user.gender = input?.SelectEmployeeGender?.gender.code;
-    requestdata.user.dob = Date.parse(input?.SelectDateofBirthEmployment?.dob);
+    // requestdata.user.dob = Date.parse(input?.SelectDateofBirthEmployment?.dob);
     requestdata.user.mobileNumber = input?.SelectEmployeePhoneNumber?.mobileNumber;
     requestdata["user"]["name"] = input?.SelectEmployeeName?.employeeName;
     requestdata.user.correspondenceAddress = input?.SelectEmployeeCorrespondenceAddress?.correspondenceAddress;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js
index f2fe8ddf9d3..ff542473485 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js
@@ -158,10 +158,7 @@ const Details = () => {
                     <Row label={t("HR_HIERARCHY_LABEL")} text={t(element?.hierarchy ? `EGOV_LOCATION_TENANTBOUNDARY_${element?.hierarchy}` : "NA")} textStyle={{ whiteSpace: "pre" }} />
                     <Row label={t("HR_BOUNDARY_TYPE_LABEL")} text={t(Digit.Utils.locale.convertToLocale(element?.boundaryType, 'EGOV_LOCATION_BOUNDARYTYPE'))} textStyle={{ whiteSpace: "pre" }} />
                     <Row label={t("HR_BOUNDARY_LABEL")} text={t(element?.boundary)} />
-                    <Row
-                      label={t("HR_ROLE_LABEL")}
-                      text={data?.Employees?.[0]?.user.roles.filter((ele) => ele.tenantId == element?.boundary).map((ele) => t(`ACCESSCONTROL_ROLES_ROLES_` + ele?.code))}
-                    />
+                  
                   </StatusTable>
                 );
               })
@@ -190,8 +187,11 @@ const Details = () => {
                   text={element?.isCurrentAssignment ? "Currently Working Here" : convertEpochFormateToDate(element?.toDate)}
                   textStyle={{ whiteSpace: "pre" }}
                 />
+                <Row label={t("HR_DISTRICT_LABEL")} text={t("COMMON_MASTERS_DISTRICT_" + element?.district)} />
                 <Row label={t("HR_COURT_ESTABLISHMENT_LABEL")} text={t("COMMON_MASTERS_COURT_ESTABLISHMENT_" + element?.courtEstablishment)} />
+                <Row label={t("HR_COURTROOM_LABEL")} text={t("COMMON_MASTERS_COURT_ROOM_" + element?.courtroom)} />
                 <Row label={t("HR_DESG_LABEL")} text={t("COMMON_MASTERS_DESIGNATION_" + element?.designation)} />
+                <Row label={t("HR_ROLE_LABEL")} text={data?.Employees?.[0]?.user.roles.map((ele) => t(`ACCESSCONTROL_ROLES_ROLES_` + ele?.code))} />
               </StatusTable>
             ))}
           </Card>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
index 1cc23135ada..99e0928a834 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
@@ -1,4 +1,4 @@
-import { FormComposer, Toast ,Loader, Header} from "@egovernments/digit-ui-react-components";
+import { FormComposer, Toast, Loader, Header } from "@egovernments/digit-ui-react-components";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
@@ -11,20 +11,34 @@ const CreateEmployee = () => {
   const [mobileNumber, setMobileNumber] = useState(null);
   const [showToast, setShowToast] = useState(null);
   const [phonecheck, setPhonecheck] = useState(false);
-  const [checkfield, setcheck] = useState(false)
+  const [prevFormData , setPrevFormData] = useState(null);
+  // const [checkfield, setcheck] = useState(false);
   const { t } = useTranslation();
   const history = useHistory();
   const isMobile = window.Digit.Utils.browser.isMobile();
 
- const { data: mdmsData,isLoading } = Digit.Hooks.useCommonMDMS(Digit.ULBService.getStateId(), "egov-hrms", ["CommonFieldsConfig"], {
+  const { data: mdmsData, isLoading } = Digit.Hooks.useCommonMDMS(Digit.ULBService.getStateId(), "egov-hrms", ["CommonFieldsConfig"], {
     select: (data) => {
       return {
-        config: data?.MdmsRes?.['egov-hrms']?.CommonFieldsConfig
+        config: data?.MdmsRes?.["egov-hrms"]?.CommonFieldsConfig,
       };
     },
     retry: false,
     enable: false,
   });
+
+  const { data: employeeRoleMapping, isMappingLoading } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getStateId(),
+    "egov-hrms",
+    [{ name: "EmployeeRolesMapping" }],
+    {
+      retry: false,
+      enable: false,
+    }
+  );
+
+  
+  console.log("employeeRoleMapping", employeeRoleMapping);
   const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_HAPPENED", false);
   const [errorInfo, setErrorInfo, clearError] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_ERROR_DATA", false);
   const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_SUCCESS_DATA", false);
@@ -40,7 +54,7 @@ const CreateEmployee = () => {
     const name = formData?.SelectEmployeeName?.employeeName || "";
     // const address = formData?.SelectEmployeeCorrespondenceAddress?.correspondenceAddress || "";
     const validEmail = email.length == 0 ? true : email.match(Digit.Utils.getPattern("Email"));
-    return validEmail && name.match(Digit.Utils.getPattern("Name")) ; //&& address.match(Digit.Utils.getPattern("Address"));
+    return validEmail && name.match(Digit.Utils.getPattern("Name")); //&& address.match(Digit.Utils.getPattern("Address"));
   };
   useEffect(() => {
     if (mobileNumber && mobileNumber.length == 10 && mobileNumber.match(Digit.Utils.getPattern("MobileNo"))) {
@@ -58,28 +72,27 @@ const CreateEmployee = () => {
     }
   }, [mobileNumber]);
 
-  const defaultValues = {
-
-    Jurisdictions:
-      [{
-        id: undefined,
-        key: 1,
-        hierarchy: null,
-        boundaryType: null,
-        boundary: {
-          code: tenantId
-        },
-        roles: [],
-      }]
-  }
+  // const defaultValues = {
+  //   Jurisdictions: [
+  //     {
+  //       id: undefined,
+  //       key: 1,
+  //       hierarchy: null,
+  //       boundaryType: null,
+  //       boundary: {
+  //         code: tenantId,
+  //       },
+  //       roles: [],
+  //     },
+  //   ],
+  // };
 
   const employeeCreateSession = Digit.Hooks.useSessionStorage("NEW_EMPLOYEE_CREATE", {});
-  const [sessionFormData,setSessionFormData, clearSessionFormData] = employeeCreateSession;
+  const [sessionFormData, setSessionFormData, clearSessionFormData] = employeeCreateSession;
 
   const onFormValueChange = (setValue = true, formData) => {
-
     if (!_.isEqual(sessionFormData, formData)) {
-        setSessionFormData({...sessionFormData,...formData});
+      setSessionFormData({ ...sessionFormData, ...formData });
     }
 
     if (formData?.SelectEmployeePhoneNumber?.mobileNumber) {
@@ -87,18 +100,45 @@ const CreateEmployee = () => {
     } else {
       setMobileNumber(formData?.SelectEmployeePhoneNumber?.mobileNumber);
     }
-    for (let i = 0; i < formData?.Jurisdictions?.length; i++) {
-      let key = formData?.Jurisdictions[i];
-      if (!(key?.boundary && key?.boundaryType && key?.hierarchy && key?.tenantId && key?.roles?.length > 0)) {
-        setcheck(false);
-        break;
-      } else {
-        setcheck(true);
-      }
-    }
+    const selectedEmployeetype = formData?.SelectEmployeeType?.code;
+    const prevEmployeeType = prevFormData?.SelectEmployeeType?.code;
+
+    console.log(formData);
+    
+    // for (let i = 0; i < formData?.Jurisdictions?.length; i++) {
+    //   let key = formData?.Jurisdictions[i];
+    //   if (!(key?.boundary && key?.boundaryType && key?.hierarchy && key?.tenantId && key?.roles?.length > 0)) {
+    //     setcheck(false);
+    //     break;
+    //   } else {
+    //     setcheck(true);
+    //   }
+    // }
+    const roleMapping = employeeRoleMapping?.["egov-hrms"]?.EmployeeRolesMapping;
+
 
     let setassigncheck = false;
     for (let i = 0; i < formData?.Assignments?.length; i++) {
+      if(prevEmployeeType !== selectedEmployeetype){
+        console.log("fdfnfsfnn");
+        
+        console.log(roleMapping?.map((e) => e.code === selectedEmployeetype));
+        let updatedAssignedment = formData?.Assignments;
+        updatedAssignedment[i].roles = [
+          {
+              "code": "ADVOCATE_APPLICATION_VIEWER",
+              "name": "ADVOCATE_APPLICATION_VIEWER",
+              "labelKey": "ACCESSCONTROL_ROLES_ROLES_ADVOCATE_APPLICATION_VIEWER"
+          }
+          
+      ]//roleMapping?.map((e) => e.code === selectedEmployeetype);
+      ;
+          console.log(updatedAssignedment,"upp");
+        setValue("Assignments", updatedAssignedment);
+        setPrevFormData(formData);
+        formData.Assignments = updatedAssignedment;
+        setSessionFormData({ ...sessionFormData, ...formData });
+      }
       let key = formData?.Assignments[i];
       if (
         !(
@@ -138,9 +178,7 @@ const CreateEmployee = () => {
 
   const navigateToAcknowledgement = (Employees) => {
     history.replace(`/${window?.contextPath}/employee/hrms/response`, { Employees, key: "CREATE", action: "CREATE" });
-  }
-
-  
+  };
 
   const onSubmit = (data) => {
     // if (data.Jurisdictions.filter(juris => juris.tenantId == tenantId).length == 0) {
@@ -148,28 +186,29 @@ const CreateEmployee = () => {
     //   return;
     // }
 
-    if (!Object.values(data.Jurisdictions.reduce((acc, sum) => {
-          if (sum && sum?.tenantId) {
-            acc[sum.tenantId] = acc[sum.tenantId] ? acc[sum.tenantId] + 1 : 1;
-          }
-          return acc;
-    }, {})).every(s => s == 1)) {
-      setShowToast({ key: true, label: "ERR_INVALID_JURISDICTION" });
-      return;
-    }
-    data.Jurisdictions = data.Jurisdictions.map(juris => {
-      return {
-        ...juris,
-        hierarchy: "COURT_DISTRICT_HIERARCHY",
-        boundaryType: "state",
-        boundary: tenantId
-      };
-    });
-    let roles = data?.Jurisdictions?.map((ele) => {
-      return ele.roles?.map((item) => {
-        item["tenantId"] = ele.boundary;
-        return item;
-      });
+    // if (
+    //   !Object.values(
+    //     data.Jurisdictions.reduce((acc, sum) => {
+    //       if (sum && sum?.tenantId) {
+    //         acc[sum.tenantId] = acc[sum.tenantId] ? acc[sum.tenantId] + 1 : 1;
+    //       }
+    //       return acc;
+    //     }, {})
+    //   ).every((s) => s == 1)
+    // ) {
+    //   setShowToast({ key: true, label: "ERR_INVALID_JURISDICTION" });
+    //   return;
+    // }
+    // data.Jurisdictions = data.Jurisdictions.map((juris) => {
+    //   return {
+    //     ...juris,
+    //     hierarchy: "COURT_DISTRICT_HIERARCHY",
+    //     boundaryType: "state",
+    //     boundary: tenantId,
+    //   };
+    // });
+    let roles = data?.Assignments?.map((ele) => {
+      return ele.roles;
     });
 
     const mappedroles = [].concat.apply([], roles);
@@ -178,17 +217,17 @@ const CreateEmployee = () => {
         tenantId: tenantId,
         employeeStatus: "EMPLOYED",
         assignments: data?.Assignments,
-        // code: data?.SelectEmployeeId?.code ? data?.SelectEmployeeId?.code : undefined,
+        code: data?.SelectEmployeeId?.code ? data?.SelectEmployeeId?.code : undefined,
         // dateOfAppointment: new Date(data?.SelectDateofEmployment?.dateOfAppointment).getTime(),
         employeeType: data?.SelectEmployeeType?.code,
-        jurisdictions: data?.Jurisdictions,
+        jurisdictions: [{ hierarchy: "COURT_DISTRICT_HIERARCHY", boundaryType: "state", boundary: tenantId, tenantId: tenantId }], //data?.Jurisdictions,
         user: {
           mobileNumber: data?.SelectEmployeePhoneNumber?.mobileNumber,
           name: data?.SelectEmployeeName?.employeeName,
           // correspondenceAddress: data?.SelectEmployeeCorrespondenceAddress?.correspondenceAddress,
           emailId: data?.SelectEmployeeEmailId?.emailId ? data?.SelectEmployeeEmailId?.emailId : undefined,
           // gender: data?.SelectEmployeeGender?.gender.code,
-          dob: new Date(data?.SelectDateofBirthEmployment?.dob).getTime(),
+          // dob: new Date(data?.SelectDateofBirthEmployment?.dob).getTime(),
           roles: mappedroles,
           tenantId: tenantId,
         },
@@ -198,7 +237,7 @@ const CreateEmployee = () => {
       },
     ];
     /* use customiseCreateFormData hook to make some chnages to the Employee object */
-      Employees=Digit?.Customizations?.HRMS?.customiseCreateFormData?Digit.Customizations.HRMS.customiseCreateFormData(data,Employees):Employees;
+    Employees = Digit?.Customizations?.HRMS?.customiseCreateFormData ? Digit.Customizations.HRMS.customiseCreateFormData(data, Employees) : Employees;
 
     if (data?.SelectEmployeeId?.code && data?.SelectEmployeeId?.code?.trim().length > 0) {
       Digit.HRMSService.search(tenantId, null, { codes: data?.SelectEmployeeId?.code }).then((result, err) => {
@@ -216,15 +255,21 @@ const CreateEmployee = () => {
   if (isLoading) {
     return <Loader />;
   }
-  const config =mdmsData?.config?mdmsData.config: newConfig;
+  const config = mdmsData?.config ? mdmsData.config : newConfig;
   return (
     <div>
-      <div style={isMobile ? {marginLeft: "-12px", fontFamily: "calibri", color: "#FF0000"} :{ marginLeft: "15px", fontFamily: "calibri", color: "#FF0000" }}>
+      <div
+        style={
+          isMobile
+            ? { marginLeft: "-12px", fontFamily: "calibri", color: "#FF0000" }
+            : { marginLeft: "15px", fontFamily: "calibri", color: "#FF0000" }
+        }
+      >
         <Header>{t("HR_COMMON_CREATE_EMPLOYEE_HEADER")}</Header>
       </div>
       <FormComposer
         // defaultValues={defaultValues}
-        defaultValues = {sessionFormData}
+        defaultValues={sessionFormData}
         heading={t("")}
         config={config}
         onSubmit={onSubmit}
diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
index 27dd9542e4e..679fb0ed09b 100644
--- a/micro-ui/web/package.json
+++ b/micro-ui/web/package.json
@@ -65,9 +65,7 @@
     "clean": "rm -rf node_modules"
   },
   "eslintConfig": {
-    "extends": [
-      "react-app"
-    ]
+  
   },
   "browserslist": {
     "production": [

From 244c11bdd448cb89d194b5340fa43aa853e2df11 Mon Sep 17 00:00:00 2001
From: maruthi phanendra <phanendra.chaluvadi@beehyv.com>
Date: Wed, 12 Feb 2025 00:05:12 +0530
Subject: [PATCH 2/4] updated the hrms employee creation

---
 .../components/pageComponents/assignment.js   | 106 +++++++++++++-----
 .../hrms/src/pages/EditEmployee/EditForm.js   |   4 +
 .../modules/hrms/src/pages/createEmployee.js  |  52 ++++-----
 3 files changed, 100 insertions(+), 62 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
index 397bc9df059..61b34945c23 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
@@ -8,10 +8,41 @@ import {
   MultiSelectDropdown,
   RemoveableTag,
 } from "@egovernments/digit-ui-react-components";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import cleanup from "../Utils/cleanup";
 import { convertEpochToDate } from "../Utils/index";
 
+// Function to check if two objects are equal
+function deepEqual(obj1, obj2) {
+  if (obj1 === obj2) return true; // Handle identical references and primitive values
+
+  if (typeof obj1 !== "object" || typeof obj2 !== "object" || obj1 === null || obj2 === null) {
+    return false; // Handle non-objects and null values
+  }
+
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+
+  if (keys1.length !== keys2.length) return false; // Different number of keys
+
+  for (const key of keys1) {
+    if (!keys2.includes(key)) return false; // Key mismatch
+    if (!deepEqual(obj1[key], obj2[key])) return false; // Recursive comparison
+  }
+
+  return true;
+}
+
+function compareArrays(arr1, arr2) {
+  if (arr1.length !== arr2.length) return false;
+
+  for (let i = 0; i < arr1.length; i++) {
+    if (!deepEqual(arr1[i], arr2[i])) return false;
+  }
+
+  return true;
+}
+
 const makeDefaultValues = (sessionFormData) => {
   return sessionFormData?.Assignments?.map((ele, index) => {
     return {
@@ -45,6 +76,7 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
   const { data: data = {}, isLoading } = Digit.Hooks.hrms.useHrmsMDMS(tenantId, "egov-hrms", "HRMSRolesandDesignation") || {};
   // const [currentassignemtDate, setCurrentAssiginmentDate] = useState(null);
 
+  const ref = useRef(null);
   const employeeCreateSession = Digit.Hooks.useSessionStorage("NEW_EMPLOYEE_CREATE", {});
   const [sessionFormData, setSessionFormData, clearSessionFormData] = employeeCreateSession;
   const isEdit = window.location.href.includes("hrms/edit");
@@ -68,27 +100,30 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
   );
 
   useEffect(() => {
-    console.log("checking");
-    
-    // setassignments(
-    //   makeDefaultValues(sessionFormData) ||
-    //     formData?.Assignments || [
-    //       {
-    //         key: 1,
-    //         fromDate: undefined,
-    //         toDate: undefined,
-    //         // isCurrentAssignment: false,
-    //         courtEstablishment: null,
-    //         designation: null,
-    //         district: null,
-    //         courtroom: null,
-    //         roles: [],
-    //       },
-    //     ]
-    // );
-  }, [sessionFormData]);
-
-  // console.log(assignments, sessionFormData, "assignments");
+    ref.current = setTimeout(() => {
+      const newAssignments = [];
+      let shouldUpdate = false;
+      for (let i = 0; i < (formData?.Assignments || []).length; i++) {
+        let curr = formData?.Assignments[i];
+        let currAssn = assignments[i];
+        let newAssignment = { ...curr, ...currAssn, roles: curr.roles || currAssn.roles || [] };
+        if (!compareArrays(curr.roles || [], assignments[i].roles || [])) {
+          shouldUpdate = true;
+          newAssignment = { ...newAssignment, roles: curr.roles || [] };
+        }
+        newAssignments.push(newAssignment);
+      }
+
+      if (shouldUpdate) {
+        setassignments(newAssignments);
+      }
+
+      return () => {
+        clearTimeout(ref.current);
+      };
+    }, 0);
+  }, [formData?.SelectEmployeeType?.code, formData?.Assignments]);
+
   const reviseIndexKeys = () => {
     setassignments((prev) => prev.map((unit, index) => ({ ...unit, key: index })));
   };
@@ -207,9 +242,9 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
     });
   }
   function getroledata() {
-    return data?.MdmsRes?.["ACCESSCONTROL-ROLES"].roles
+    return data?.MdmsRes?.["ACCESSCONTROL-ROLES"]?.roles
       .map((role) => {
-        return { code: role.code, name: role?.name ? role?.name : " ", labelKey: "ACCESSCONTROL_ROLES_ROLES_" + role.code };
+        return role?.code ? { code: role?.code, name: role?.name ? role?.name : " ", labelKey: "ACCESSCONTROL_ROLES_ROLES_" + role?.code } : null;
       })
       .sort((a, b) => {
         const labelKeyA = t(a?.labelKey) || "";
@@ -309,7 +344,6 @@ function Assignment({
 
     // Find the corresponding court establishment for the selected courtroom
     const courtEstablishmentData = getCourtEstablishment();
-    console.log(courtEstablishmentData, "courtEstablishmentData");
 
     const correspondingEstablishment = courtEstablishmentData?.find((est) => est.code === value.establishment);
 
@@ -380,8 +414,6 @@ function Assignment({
   const getFilteredCourtEstablishments = () => {
     const selectedDistrict = assignment?.district;
     const courtEstablishmentData = getCourtEstablishment();
-    console.log(selectedDistrict, courtEstablishmentData, "selectedDistrict, courtEstablishmentData");
-
     if (!selectedDistrict) return courtEstablishmentData;
     return courtEstablishmentData?.filter((ele) => ele.district === selectedDistrict.code);
   };
@@ -492,6 +524,22 @@ function Assignment({
             />
           </div>
         </LabelFieldPair>
+        <LabelFieldPair>
+          <CardLabel></CardLabel>
+          <div className="field">
+            <span
+              style={{
+                color: "gray",
+                width: "100%",
+                border: "none",
+                background: "none",
+                justifyContent: "start",
+              }}
+            >
+              {t("HRMS_EMP_ID_DISCRIPTION")}
+            </span>
+          </div>
+        </LabelFieldPair>
 
         {/* <LabelFieldPair>
           <CardLabel className="card-label-smaller" style={{ color: "white" }}>
@@ -573,8 +621,8 @@ function Assignment({
               t={t}
             />
             <div className="tag-container">
-              {assignment?.roles.length > 0 &&
-                assignment?.roles.map((value, index) => {
+              {assignment?.roles?.length > 0 &&
+                assignment?.roles?.map((value, index) => {
                   return <RemoveableTag key={index} text={`${t(value["labelKey"]).slice(0, 22)} ...`} onClick={() => onRemove(index, value)} />;
                 })}
             </div>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
index aa81d4c38e2..18e86e29616 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
@@ -100,7 +100,11 @@ const EditForm = ({ tenantId, data }) => {
         courtroom: {
           code: ele.courtroom,
           i18key: "COMMON_MASTERS_COURT_ROOM_" + ele.courtroom,
+        }, district: {
+          code: ele?.district,
+          i18key: ele.district ? "COMMON_MASTERS_DISTRICT_" + ele.district : null,
         },
+        roles: ele?.roles || [],
       });
     }),
   };
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
index 99e0928a834..5ab353b8a55 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
@@ -11,7 +11,7 @@ const CreateEmployee = () => {
   const [mobileNumber, setMobileNumber] = useState(null);
   const [showToast, setShowToast] = useState(null);
   const [phonecheck, setPhonecheck] = useState(false);
-  const [prevFormData , setPrevFormData] = useState(null);
+  const [prevFormData, setPrevFormData] = useState(null);
   // const [checkfield, setcheck] = useState(false);
   const { t } = useTranslation();
   const history = useHistory();
@@ -37,8 +37,6 @@ const CreateEmployee = () => {
     }
   );
 
-  
-  console.log("employeeRoleMapping", employeeRoleMapping);
   const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_HAPPENED", false);
   const [errorInfo, setErrorInfo, clearError] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_ERROR_DATA", false);
   const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_SUCCESS_DATA", false);
@@ -102,38 +100,27 @@ const CreateEmployee = () => {
     }
     const selectedEmployeetype = formData?.SelectEmployeeType?.code;
     const prevEmployeeType = prevFormData?.SelectEmployeeType?.code;
-
-    console.log(formData);
-    
-    // for (let i = 0; i < formData?.Jurisdictions?.length; i++) {
-    //   let key = formData?.Jurisdictions[i];
-    //   if (!(key?.boundary && key?.boundaryType && key?.hierarchy && key?.tenantId && key?.roles?.length > 0)) {
-    //     setcheck(false);
-    //     break;
-    //   } else {
-    //     setcheck(true);
-    //   }
-    // }
     const roleMapping = employeeRoleMapping?.["egov-hrms"]?.EmployeeRolesMapping;
-
-
     let setassigncheck = false;
     for (let i = 0; i < formData?.Assignments?.length; i++) {
-      if(prevEmployeeType !== selectedEmployeetype){
-        console.log("fdfnfsfnn");
-        
-        console.log(roleMapping?.map((e) => e.code === selectedEmployeetype));
+      if (prevEmployeeType !== selectedEmployeetype) {
+        const filteredRoleMapping = roleMapping.filter((role) => role.employeeCode === selectedEmployeetype);
+        const mappedRoles = filteredRoleMapping.flatMap(
+          (role) =>
+            role.roleCodes
+              .map((roleItem) => {
+                return roleItem
+                  ? {
+                      code: roleItem,
+                      name: roleItem || " ",
+                      labelKey: "ACCESSCONTROL_ROLES_ROLES_" + roleItem,
+                    }
+                  : null;
+              })
+              .filter((item) => item !== null) 
+        );
         let updatedAssignedment = formData?.Assignments;
-        updatedAssignedment[i].roles = [
-          {
-              "code": "ADVOCATE_APPLICATION_VIEWER",
-              "name": "ADVOCATE_APPLICATION_VIEWER",
-              "labelKey": "ACCESSCONTROL_ROLES_ROLES_ADVOCATE_APPLICATION_VIEWER"
-          }
-          
-      ]//roleMapping?.map((e) => e.code === selectedEmployeetype);
-      ;
-          console.log(updatedAssignedment,"upp");
+        updatedAssignedment[i].roles =mappedRoles;
         setValue("Assignments", updatedAssignedment);
         setPrevFormData(formData);
         formData.Assignments = updatedAssignedment;
@@ -145,8 +132,7 @@ const CreateEmployee = () => {
           key.courtEstablishment &&
           key.designation &&
           key.courtroom &&
-          key.fromDate &&
-          (formData?.Assignments[i].toDate || formData?.Assignments[i]?.isCurrentAssignment)
+          key.fromDate
         )
       ) {
         setassigncheck = false;

From e8cab32358f0ef999b6a444e7aced14c0e491539 Mon Sep 17 00:00:00 2001
From: maruthi phanendra <phanendra.chaluvadi@beehyv.com>
Date: Wed, 12 Feb 2025 10:49:04 +0530
Subject: [PATCH 3/4] updated edit employee form for hrms v2

---
 .../hrms/src/pages/EditEmployee/EditForm.js   | 72 +++++++++----------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
index 18e86e29616..c05da5b559d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
@@ -13,6 +13,7 @@ const EditForm = ({ tenantId, data }) => {
   const [mobileNumber, setMobileNumber] = useState(null);
   const [phonecheck, setPhonecheck] = useState(false);
   const [checkfield, setcheck] = useState(false);
+  const [jurisdictions, setJurisdictions] = useState(null);
   const { data: mdmsData, isLoading } = Digit.Hooks.useCommonMDMS(Digit.ULBService.getStateId(), "egov-hrms", ["CommonFieldsConfig"], {
     select: (data) => {
       return {
@@ -50,6 +51,7 @@ const EditForm = ({ tenantId, data }) => {
     } else {
       setPhonecheck(false);
     }
+    setJurisdictions(data?.jurisdictions);
   }, [mobileNumber]);
 
   const defaultValues = {
@@ -69,7 +71,6 @@ const EditForm = ({ tenantId, data }) => {
         name: `COMMON_GENDER_${data?.user?.gender}`,
       },
     },
-
     // SelectDateofBirthEmployment: { dob: convertEpochToDate(data?.user?.dob) },
     Jurisdictions: data?.jurisdictions.map((ele, index) => {
       return Object.assign({}, ele, {
@@ -80,7 +81,6 @@ const EditForm = ({ tenantId, data }) => {
         },
         boundaryType: { label: ele.boundaryType, i18text: `EGOV_LOCATION_BOUNDARYTYPE_${ele.boundaryType.toUpperCase()}` },
         boundary: { code: ele.boundary },
-        roles: data?.user?.roles.filter((item) => item.tenantId == ele.boundary),
       });
     }),
     Assignments: data?.assignments.map((ele, index) => {
@@ -100,7 +100,8 @@ const EditForm = ({ tenantId, data }) => {
         courtroom: {
           code: ele.courtroom,
           i18key: "COMMON_MASTERS_COURT_ROOM_" + ele.courtroom,
-        }, district: {
+        },
+        district: {
           code: ele?.district,
           i18key: ele.district ? "COMMON_MASTERS_DISTRICT_" + ele.district : null,
         },
@@ -124,15 +125,15 @@ const EditForm = ({ tenantId, data }) => {
       setMobileNumber(formData?.SelectEmployeePhoneNumber?.mobileNumber);
     }
 
-    for (let i = 0; i < formData?.Jurisdictions?.length; i++) {
-      let key = formData?.Jurisdictions[i];
-      if (!(key?.boundary && key?.boundaryType && key?.hierarchy && key?.tenantId && key?.roles?.length > 0)) {
-        setcheck(false);
-        break;
-      } else {
-        setcheck(true);
-      }
-    }
+    // for (let i = 0; i < formData?.Jurisdictions?.length; i++) {
+    //   let key = formData?.Jurisdictions[i];
+    //   if (!(key?.boundary && key?.boundaryType && key?.hierarchy && key?.tenantId && key?.roles?.length > 0)) {
+    //     setcheck(false);
+    //     break;
+    //   } else {
+    //     setcheck(true);
+    //   }
+    // }
 
     let setassigncheck = false;
     for (let i = 0; i < formData?.Assignments?.length; i++) {
@@ -157,7 +158,6 @@ const EditForm = ({ tenantId, data }) => {
     if (
       formData?.SelectEmployeeName?.employeeName &&
       formData?.SelectEmployeePhoneNumber?.mobileNumber &&
-      checkfield &&
       setassigncheck &&
       phonecheck &&
       checkMailNameNum(formData)
@@ -169,36 +169,34 @@ const EditForm = ({ tenantId, data }) => {
   };
 
   const onSubmit = (input) => {
-    if (input.Jurisdictions.filter((juris) => juris.tenantId == tenantId && juris.isActive !== false).length == 0) {
-      setShowToast({ key: true, label: "ERR_BASE_TENANT_MANDATORY" });
-      return;
-    }
-    if (
-      !Object.values(
-        input.Jurisdictions.reduce((acc, sum) => {
-          if (sum && sum?.tenantId) {
-            acc[sum.tenantId] = acc[sum.tenantId] ? acc[sum.tenantId] + 1 : 1;
-          }
-          return acc;
-        }, {})
-      ).every((s) => s == 1)
-    ) {
-      setShowToast({ key: true, label: "ERR_INVALID_JURISDICTION" });
-      return;
-    }
-    let roles = input?.Jurisdictions?.map((ele) => {
-      return ele.roles?.map((item) => {
-        item["tenantId"] = ele.boundary;
-        return item;
-      });
+    // if (input.Jurisdictions.filter((juris) => juris.tenantId == tenantId && juris.isActive !== false).length == 0) {
+    //   setShowToast({ key: true, label: "ERR_BASE_TENANT_MANDATORY" });
+    //   return;
+    // }
+    // if (
+    //   !Object.values(
+    //     input.Jurisdictions.reduce((acc, sum) => {
+    //       if (sum && sum?.tenantId) {
+    //         acc[sum.tenantId] = acc[sum.tenantId] ? acc[sum.tenantId] + 1 : 1;
+    //       }
+    //       return acc;
+    //     }, {})
+    //   ).every((s) => s == 1)
+    // ) {
+    //   setShowToast({ key: true, label: "ERR_INVALID_JURISDICTION" });
+    //   return;
+    // }
+    let roles = input?.Assignments?.map((ele) => {
+      return ele.roles;
     });
     let requestdata = Object.assign({}, data);
     roles = [].concat.apply([], roles);
     requestdata.assignments = input?.Assignments;
     requestdata.dateOfAppointment = Date.parse(input?.SelectDateofEmployment?.dateOfAppointment);
     requestdata.code = input?.SelectEmployeeId?.code ? input?.SelectEmployeeId?.code : requestdata?.user?.userName;
-    requestdata.jurisdictions = input?.Jurisdictions;
-    requestdata.user.emailId = input?.SelectEmployeeEmailId?.emailId ? input?.SelectEmployeeEmailId?.emailId : undefined;
+    requestdata.jurisdictions = jurisdictions;
+    // (requestdata.jurisdictions = [{ hierarchy: "COURT_DISTRICT_HIERARCHY", boundaryType: "state", boundary: tenantId, tenantId: tenantId }]), //data?.Jurisdictions,
+      (requestdata.user.emailId = input?.SelectEmployeeEmailId?.emailId ? input?.SelectEmployeeEmailId?.emailId : undefined);
     requestdata.user.gender = input?.SelectEmployeeGender?.gender.code;
     // requestdata.user.dob = Date.parse(input?.SelectDateofBirthEmployment?.dob);
     requestdata.user.mobileNumber = input?.SelectEmployeePhoneNumber?.mobileNumber;

From 20b8f79fefa7942f4c082b5babe11e5753a02ad3 Mon Sep 17 00:00:00 2001
From: maruthiPhanendra <phanendra.chaluvadi@beehyv.com>
Date: Wed, 12 Feb 2025 10:51:32 +0530
Subject: [PATCH 4/4] Update index.js

---
 .../packages/libraries/src/services/elements/User/index.js       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
index 53287a089ca..96438af62b6 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
@@ -8,7 +8,6 @@ export const UserService = {
     Object.entries(details).forEach(([key, value]) => data.append(key, value));
     data.append("scope", "read");
     data.append("grant_type", "password");
-    console.log("detailss");
 
     let authResponse = await ServiceRequest({
       serviceName: "authenticate",