updated hrnms

frontend/micro-ui/web/micro-ui-internals/example/package.json

@@ -12,7 +12,7 @@
     "@egovernments/digit-ui-react-components": "1.5.12",
     "@egovernments/digit-ui-components": "0.0.2-beta.47",
     "@egovernments/digit-ui-libraries": "1.5.0",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.22",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
     "@egovernments/digit-ui-module-attendencemgmt": "0.4.12",
@@ -22,8 +22,8 @@
     "@egovernments/digit-ui-module-masters": "0.4.17",
     "@egovernments/digit-ui-module-project": "0.4.13",
     "@egovernments/digit-ui-module-expenditure": "0.4.14",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.9",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.11",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.10",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.12",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-customisation-mukta",
-    "version": "0.2.9",
+    "version": "0.2.10",
     "description": "MUKTA Customisation of Works UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/Module.js

@@ -8,6 +8,7 @@ import { UICustomizations } from "./configs/UICustomizations";
 import HRMSCard from "./components/HRMSCard";
 import Captcha from "./components/Captcha";
 import DSSCard from "./components/DSSCard";
+import Jurisdictions from "./components/jurisdiction";
 
 const MuktaModule = ({ stateCode, userType, tenants }) => {
   const moduleCode = ["Mukta"];
@@ -34,6 +35,7 @@ const componentsToRegister = {
   AttendenceMgmtCard:null , // TO HIDE THE Attendance Mgmt CARD IN HOME SCREEN as per MUKTA
   HRMSCard, // Overridden the HRMS card as per MUKTA
   MeasurementCard:null,
+  Jurisdictions,
   DSSCard
 };
 

frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/components/jurisdiction.js

@@ -0,0 +1,338 @@
+import { CardLabel, Dropdown, LabelFieldPair, Loader, RemoveableTag ,MultiSelectDropdown} from "@egovernments/digit-ui-react-components";
+import React, { useEffect, useState } from "react";
+// import MultiSelectDropdown from "./Multiselect";
+
+
+const cleanup = (payload) => {
+    if (payload) {
+      return Object.keys(payload).reduce((acc, key) => {
+        if (payload[key] === undefined) {
+          return acc;
+        }
+
+        // todo: find a better way to check object
+        acc[key] = typeof payload[key] === "object" ? cleanup(payload[key]) : payload[key];
+        return acc;
+      }, {});
+    }
+  };
+
+const makeDefaultValues = (sessionFormData) => {
+  return sessionFormData?.Jurisdictions?.map((ele,index)=>{
+    return {
+      key: index,
+      hierarchy: {
+        code: ele?.hierarchy,
+        name: ele?.hierarchy,
+      },
+      boundaryType: { label: ele?.boundaryType, i18text:ele.boundaryType ?`EGOV_LOCATION_BOUNDARYTYPE_${ele.boundaryType?.toUpperCase()}`:null },
+      boundary: { code: ele?.boundary },
+      roles: ele?.roles,
+    }
+  })
+}
+
+const Jurisdictions = ({ t, config, onSelect, userType, formData }) => {
+    console.log("Jurisdictions")
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [inactiveJurisdictions, setInactiveJurisdictions] = useState([]);
+  const { data: data = {}, isLoading } = Digit.Hooks.hrms.useHrmsMDMS(tenantId, "egov-hrms", "HRMSRolesandDesignation") || {};
+
+  const employeeCreateSession = Digit.Hooks.useSessionStorage("NEW_EMPLOYEE_CREATE", {});
+  const [sessionFormData,setSessionFormData, clearSessionFormData] = employeeCreateSession;
+  const isEdit = window.location.href.includes("hrms/edit")
+  const [jurisdictions, setjurisdictions] = useState(
+    !isEdit && sessionFormData?.Jurisdictions?.length>0 ? makeDefaultValues(sessionFormData) : ( formData?.Jurisdictions ||  [
+      {
+        id: undefined,
+        key: 1,
+        hierarchy: null,
+        boundaryType: null,
+        boundary: null,
+        roles: [],
+      },
+    ])
+  );
+
+  useEffect(() => {
+    const jurisdictionsData = jurisdictions?.map((jurisdiction) => {
+      let res = {
+        id: jurisdiction?.id,
+        hierarchy: jurisdiction?.hierarchy?.code,
+        boundaryType: jurisdiction?.boundaryType?.label,
+        boundary: jurisdiction?.boundary?.code,
+        tenantId: jurisdiction?.boundary?.code,
+        auditDetails: jurisdiction?.auditDetails,
+      };
+      res = cleanup(res);
+      if (jurisdiction?.roles) {
+        res["roles"] = jurisdiction?.roles.map((ele) => {
+          delete ele.description;
+          return ele;
+        });
+      }
+      return res;
+    });
+
+    onSelect(
+      config.key,
+      [...jurisdictionsData, ...inactiveJurisdictions].filter((value) => Object.keys(value).length !== 0)
+    );
+  }, [jurisdictions]);
+
+  const reviseIndexKeys = () => {
+    setjurisdictions((prev) => prev.map((unit, index) => ({ ...unit, key: index })));
+  };
+
+  const handleAddUnit = () => {
+    setjurisdictions((prev) => [
+      ...prev,
+      {
+        key: prev.length + 1,
+        hierarchy: null,
+        boundaryType: null,
+        boundary: null,
+        roles: [],
+      },
+    ]);
+  };
+  const handleRemoveUnit = (unit) => {
+    if (unit.id) {
+      let res = {
+        id: unit?.id,
+        hierarchy: unit?.hierarchy?.code,
+        boundaryType: unit?.boundaryType?.label,
+        boundary: unit?.boundary?.code,
+        tenantId: unit?.boundary?.code,
+        auditDetails: unit?.auditDetails,
+        isdeleted: true,
+        isActive: false,
+      };
+      res = cleanup(res);
+      if (unit?.roles) {
+        res["roles"] = unit?.roles.map((ele) => {
+          delete ele.description;
+          return ele;
+        });
+      }
+      setInactiveJurisdictions([...inactiveJurisdictions, res]);
+    }
+    setjurisdictions((prev) => prev.filter((el) => el.key !== unit.key));
+    if (FormData.errors?.Jurisdictions?.type == unit.key) {
+      clearErrors("Jurisdictions");
+    }
+    reviseIndexKeys();
+  };
+  let hierarchylist = [];
+  let boundaryTypeoption = [];
+  const [focusIndex, setFocusIndex] = useState(-1);
+
+  function gethierarchylistdata() {
+    return data?.MdmsRes?.["common-masters"]["hierarchyType"];
+  }
+
+  function getboundarydata() {
+    return [];
+  }
+
+  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 } });
+  }
+
+  if (isLoading) {
+    return <Loader />;
+  }
+  return (
+    <div>
+      {jurisdictions?.map((jurisdiction, index) => (
+        <Jurisdiction
+          t={t}
+          formData={formData}
+          jurisdictions={jurisdictions}
+          key={index}
+          keys={jurisdiction.key}
+          data={data}
+          jurisdiction={jurisdiction}
+          setjurisdictions={setjurisdictions}
+          index={index}
+          focusIndex={focusIndex}
+          setFocusIndex={setFocusIndex}
+          gethierarchylistdata={gethierarchylistdata}
+          hierarchylist={hierarchylist}
+          boundaryTypeoption={boundaryTypeoption}
+          getboundarydata={getboundarydata}
+          getroledata={getroledata}
+          handleRemoveUnit={handleRemoveUnit}
+        />
+      ))}
+      <label onClick={handleAddUnit} className="link-label" style={{ width: "12rem" }}>
+        {t("HR_ADD_JURISDICTION")}
+      </label>
+    </div>
+  );
+};
+function Jurisdiction({
+  t,
+  data,
+  jurisdiction,
+  jurisdictions,
+  setjurisdictions,
+  gethierarchylistdata,
+  handleRemoveUnit,
+  hierarchylist,
+  getroledata,
+  roleoption,
+  index,
+}) {
+  const [BoundaryType, selectBoundaryType] = useState([]);
+  const [Boundary, selectboundary] = useState([]);
+  useEffect(() => {
+    selectBoundaryType(
+      data?.MdmsRes?.["common-masters"]["hierarchyType"]
+        .filter((ele) => {
+          return ele?.code === jurisdiction?.hierarchy?.code;
+        })
+        ?.map((item) => {
+          const boundaryType = item.boundaryType;
+          return {
+            label: boundaryType, 
+            i18text: Digit.Utils.locale.convertToLocale(boundaryType, 'EGOV_LOCATION_BOUNDARYTYPE') 
+          };
+        })
+    );
+  }, [jurisdiction?.hierarchy, data?.MdmsRes]);
+  const tenant = Digit.ULBService.getCurrentTenantId();
+  useEffect(() => {
+    selectboundary(data?.MdmsRes?.tenant?.tenants.filter(city => city.code != Digit.ULBService.getStateId()).map(city => { return { ...city, i18text: Digit.Utils.locale.getCityLocale(city.code) } }));
+  }, [jurisdiction?.boundaryType, data?.MdmsRes]);
+
+  useEffect(() => {
+    if (Boundary?.length > 0) {
+      selectedboundary(Boundary?.filter((ele) => ele.code == jurisdiction?.boundary?.code)[0]);
+    }
+  }, [Boundary]);
+
+  const selectHierarchy = (value) => {
+    setjurisdictions((pre) => pre.map((item) => (item.key === jurisdiction.key ? { ...item, hierarchy: value } : item)));
+  };
+
+  const selectboundaryType = (value) => {
+    setjurisdictions((pre) => pre.map((item) => (item.key === jurisdiction.key ? { ...item, boundaryType: value } : item)));
+  };
+
+  const selectedboundary = (value) => {
+    setjurisdictions((pre) => pre.map((item) => (item.key === jurisdiction.key ? { ...item, boundary: value } : item)));
+  };
+
+  const selectrole = (e, data) => {
+    // const index = jurisdiction?.roles.filter((ele) => ele.code == data.code);
+    // let res = null;
+    // if (index.length) {
+    //   jurisdiction?.roles.splice(jurisdiction?.roles.indexOf(index[0]), 1);
+    //   res = jurisdiction.roles;
+    // } else {
+    //   res = [{ ...data }, ...jurisdiction?.roles];
+    // }
+    let res = [];
+    e && e?.map((ob) => {
+      res.push(ob?.[1]);
+    });
+
+    res?.forEach(resData => {resData.labelKey = 'ACCESSCONTROL_ROLES_ROLES_' + resData.code})
+
+    setjurisdictions((pre) => pre.map((item) => (item.key === jurisdiction.key ? { ...item, roles: res } : item)));
+  };
+
+
+  const onRemove = (index, key) => {
+    let afterRemove = jurisdiction?.roles.filter((value, i) => {
+      return i !== index;
+    });
+    setjurisdictions((pre) => pre.map((item) => (item.key === jurisdiction.key ? { ...item, roles: afterRemove } : item)));
+
+  };
+  return (
+    <div key={jurisdiction?.keys} style={{ marginBottom: "16px" }}>
+      <div style={{ border: "1px solid #E3E3E3", padding: "16px", marginTop: "8px" }}>
+        <LabelFieldPair>
+          <div className="label-field-pair" style={{ width: "100%" }}>
+            <h2 className="card-label card-label-smaller" style={{ color: "#505A5F" }}>
+              {t("HR_JURISDICTION")} {index + 1}
+            </h2>
+          </div>
+          {jurisdictions.length > 1 ? (
+            <div
+              onClick={() => handleRemoveUnit(jurisdiction)}
+              style={{ marginBottom: "16px", padding: "5px", cursor: "pointer", textAlign: "right" }}
+            >
+              X
+            </div>
+          ) : null}
+        </LabelFieldPair>
+        <LabelFieldPair>
+          <CardLabel isMandatory={true} className="card-label-smaller">{`${t("HR_HIERARCHY_LABEL")} * `}</CardLabel>
+          <Dropdown
+            className="form-field"
+            selected={jurisdiction?.hierarchy}
+            disable={false}
+            isMandatory={true}
+            option={gethierarchylistdata(hierarchylist) || []}
+            select={selectHierarchy}
+            optionKey="code"
+            t={t}
+          />
+        </LabelFieldPair>
+        <LabelFieldPair>
+          <CardLabel className="card-label-smaller">{`${t("HR_BOUNDARY_TYPE_LABEL")} * `}</CardLabel>
+          <Dropdown
+            className="form-field"
+            isMandatory={true}
+            selected={jurisdiction?.boundaryType}
+            disable={BoundaryType?.length === 0}
+            option={BoundaryType}
+            select={selectboundaryType}
+            optionKey="i18text"
+            t={t}
+          />
+        </LabelFieldPair>
+        <LabelFieldPair>
+          <CardLabel className="card-label-smaller">{`${t("HR_BOUNDARY_LABEL")} * `}</CardLabel>
+          <Dropdown
+            className="form-field"
+            isMandatory={true}
+            selected={jurisdiction?.boundary}
+            disable={Boundary?.length === 0}
+            option={Boundary}
+            select={selectedboundary}
+            optionKey="i18text"
+            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={jurisdiction?.roles}
+              options={getroledata(roleoption)}
+              onSelect={selectrole}
+              optionsKey="labelKey"
+              t={t}
+            />
+            <div className="tag-container">
+              {jurisdiction?.roles.length > 0 &&
+                jurisdiction?.roles.map((value, index) => {
+                  return <RemoveableTag key={index} text={`${t(value["labelKey"]).slice(0, 22)} ...`} onClick={() => onRemove(index, value)} />;
+                })}
+            </div>
+          </div>
+        </LabelFieldPair>
+      </div>
+    </div>
+  );
+}
+
+export default Jurisdictions;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js

@@ -728,6 +728,7 @@ const getHrmsEmployeeRolesandDesignations = () => ({
       masterDetails: [
         { name: "Department", filter: "[?(@.active == true)]" },
         { name: "Designation", filter: "[?(@.active == true)]" },
+        { name : "hierarchyType"}
       ],
     },
     {
@@ -738,7 +739,7 @@ const getHrmsEmployeeRolesandDesignations = () => ({
       moduleName: "ACCESSCONTROL-ROLES",
       masterDetails: [{ name: "roles", filter: "$.[?(@.code!='CITIZEN')]" }],
     },
-    { moduleName: "egov-location", masterDetails: [{ name: "TenantBoundary" }] },
+    // { moduleName: "egov-location", masterDetails: [{ name: "TenantBoundary" }] },
   ],
 });
 const getFSTPPlantCriteria = (tenantId, moduleCode, type) => ({