diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx index 246ddac1..05a8b50a 100644 --- a/src/components/Employee/ManageEmployee.jsx +++ b/src/components/Employee/ManageEmployee.jsx @@ -10,7 +10,11 @@ import { changeMaster } from "../../slices/localVariablesSlice"; import { Link, useNavigate, useParams } from "react-router-dom"; import { formatDate } from "../../utils/dateUtils"; import { useEmployeeProfile } from "../../hooks/useEmployees"; -import { cacheData, clearCacheKey, getCachedData } from "../../slices/apiDataManager"; +import { + cacheData, + clearCacheKey, + getCachedData, +} from "../../slices/apiDataManager"; import { clearApiCacheKey } from "../../slices/apiCacheSlice"; const mobileNumberRegex = /^[0-9]\d{9}$/; @@ -177,7 +181,6 @@ const ManageEmployee = ({ employeeId, onClosed }) => { clearCacheKey("allEmployeeList"); clearCacheKey("allInactiveEmployeeList"); clearCacheKey("employeeProfile"); - setLoading(false); reset(); @@ -238,10 +241,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => { {employee ? "Update Employee" : "Create Employee"} - onClosed()} - > + onClosed()}> @@ -509,11 +509,13 @@ const ManageEmployee = ({ employeeId, onClosed }) => { - {job_role?.map((item) => ( - - ))} + {[...job_role] + .sort((a, b) => a.name.localeCompare(b.name)) + .map((item) => ( + + ))} {errors.jobRoleId && ( diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index 7703989a..acbcac19 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -145,7 +145,15 @@ const Header = () => { dispatch(setProjectId(project?.id)) } > - {project?.name} + {project?.name}{" "} + {project?.shortName ? ( + + {" "} + ({project?.shortName}) + + ) : ( + "" + )} ))}