Sort robots by status and name

equinor · Jan 8, 2024 · 92ed6f8 · 92ed6f8
1 parent c56e503
commit 92ed6f8
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusSection.tsx b/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusSection.tsx
@@ -20,6 +20,7 @@ const RobotView = styled.div`
     grid-column: 1/ -1;
     gap: 1rem;
 `
+
 const isRobotBlocked = (robot: Robot): boolean => {
     return robot.status === 'Blocked'
 }
@@ -35,7 +36,15 @@ export const RobotStatusSection = () => {
             (robot) =>
                 robot.currentInstallation.installationCode.toLocaleLowerCase() === installationCode.toLocaleLowerCase()
         )
-        .sort((robot, robotToCompareWith) => (robot.status! > robotToCompareWith.status! ? 1 : -1))
+        .sort((robot, robotToCompareWith) =>
+            robot.status! !== robotToCompareWith.status!
+                ? robot.status! > robotToCompareWith.status!
+                    ? 1
+                    : -1
+                : robot.name! > robotToCompareWith.name!
+                  ? 1
+                  : -1
+        )
 
     useEffect(() => {
         const missionQueueFozenStatus = relevantRobots.some((robot: Robot) => robot.missionQueueFrozen)