src/pages/employee/EmployeeList.jsx

@@ -53,15 +53,8 @@ const EmployeeList = () =>
     setCurrentPage(1);
 
     if (!loading && Array.isArray(employees)) {
-      // Sort by full name (firstName + lastName)
+      setEmployeeList(employees);
-      const sorted = [...employees].sort((a, b) => {
+      setFilteredData(employees);
-        const nameA = `${a.firstName || ""}${a.lastName || ""}`.toLowerCase();
-        const nameB = `${b.firstName || ""}${b.lastName || ""}`.toLowerCase();
-        return nameA.localeCompare(nameB);
-      });
-  
-      setEmployeeList(sorted);
-      setFilteredData(sorted);
     }
   }, [loading, employees, selectedProject]);
 
@@ -350,6 +343,7 @@ const EmployeeList = () =>
                     {currentItems &&
                       !loading &&
                       currentItems
+                        .sort((a, b) => b.id - a.id)
                         .map((item) => (
                           <tr className="odd" key={item.id}>
                             <td className="sorting_1" colSpan={2}>

src/pages/project/ProjectList.jsx

@@ -33,29 +33,7 @@ const ProjectList = () =>
 
 
   useEffect(() => {
-    if (!loading && Array.isArray(projects)) {
+    setProjectList( projects )
-      // Step 1: Group projects by statusId
-      const grouped = {};
-  
-      projects.forEach((project) => {
-        const statusId = project.projectStatusId;
-        if (!grouped[statusId]) {
-          grouped[statusId] = [];
-        }
-        grouped[statusId].push(project);
-      });
-  
-      // Step 2: Sort each group by name
-      const sortedGrouped = Object.keys(grouped)
-        .sort() // sort group keys (status IDs)
-        .flatMap((statusId) =>
-          grouped[statusId].sort((a, b) =>
-            a.name.toLowerCase().localeCompare(b.name.toLowerCase())
-          )
-        );
-  
-      setProjectList(sortedGrouped); // final sorted flat list
-    }
     
   }, [ projects, loginUser?.projects, loading ] );
 
@@ -107,8 +85,20 @@ const ProjectList = () =>
     ? Math.ceil(projectList.length / itemsPerPage)
     : 0;
 
+  const statusMap = {
+    1: { label: 'active', priority: 1 },
+    2: { label: 'hold', priority: 2 },
+    3: { label: 'inactive', priority: 3 },
+    4: { label: 'complete', priority: 4 }
+  };
   
 
+  const sortedProjects = [...currentItems].sort((a, b) => {
+    const aPriority = statusMap[+a.projectStatusId]?.priority ?? 99;
+    const bPriority = statusMap[+b.projectStatusId]?.priority ?? 99;
+    return aPriority - bPriority;
+  });
+  
   return (
     <>
       <div
@@ -177,7 +167,7 @@ const ProjectList = () =>
 
           
           {currentItems &&
-            currentItems.map((item) => (
+            sortedProjects.map((item) => (
               <ProjectCard projectData={item} key={item.id}></ProjectCard>
             ))}
         </div>