From 45cd04137ff56f39c677d4763dbf66839e9bc50e Mon Sep 17 00:00:00 2001
From: Erik Vroon <erik.vroon22@gmail.com>
Date: Tue, 21 Feb 2023 00:01:48 +0100
Subject: [PATCH] Fix round order (#119)

---
 backend/tests/integration_tests/api/shared.py |  2 +-
 frontend/src/components/brackets/brackets.tsx | 24 ++++++++++---------
 frontend/src/services/user.tsx                |  8 +++----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/backend/tests/integration_tests/api/shared.py b/backend/tests/integration_tests/api/shared.py
index f9b92fe7..986cd6fd 100644
--- a/backend/tests/integration_tests/api/shared.py
+++ b/backend/tests/integration_tests/api/shared.py
@@ -51,7 +51,7 @@ class UvicornTestServer(uvicorn.Server):
 
     async def startup(self, sockets: Optional[Sequence[socket.socket]] = None) -> None:
         sockets_list = list(sockets) if sockets is not None else sockets
-        await super().startup(sockets=sockets_list)
+        await super().startup(sockets=sockets_list)  # type: ignore[arg-type]
         self.config.setup_event_loop()
         self._startup_done.set()
 
diff --git a/frontend/src/components/brackets/brackets.tsx b/frontend/src/components/brackets/brackets.tsx
index da446fb2..c31fed04 100644
--- a/frontend/src/components/brackets/brackets.tsx
+++ b/frontend/src/components/brackets/brackets.tsx
@@ -32,17 +32,19 @@ export default function Brackets({
     );
   }
 
-  const rounds = swrRoundsResponse.data.data.map((round: RoundInterface) => (
-    <Grid.Col sm={6} lg={4} xl={3} key={round.id}>
-      <Round
-        tournamentData={tournamentData}
-        round={round}
-        swrRoundsResponse={swrRoundsResponse}
-        swrUpcomingMatchesResponse={swrUpcomingMatchesResponse}
-        readOnly={readOnly}
-      />
-    </Grid.Col>
-  ));
+  const rounds = swrRoundsResponse.data.data
+    .sort((r1: any, r2: any) => (r1.name > r2.name ? 1 : 0))
+    .map((round: RoundInterface) => (
+      <Grid.Col sm={6} lg={4} xl={3} key={round.id}>
+        <Round
+          tournamentData={tournamentData}
+          round={round}
+          swrRoundsResponse={swrRoundsResponse}
+          swrUpcomingMatchesResponse={swrUpcomingMatchesResponse}
+          readOnly={readOnly}
+        />
+      </Grid.Col>
+    ));
 
   return <Grid>{rounds}</Grid>;
 }
diff --git a/frontend/src/services/user.tsx b/frontend/src/services/user.tsx
index 10db271a..93bd49ec 100644
--- a/frontend/src/services/user.tsx
+++ b/frontend/src/services/user.tsx
@@ -6,17 +6,17 @@ export async function performLogin(username: string, password: string) {
   bodyFormData.append('username', username);
   bodyFormData.append('password', password);
 
-  const response = await createAxios()
+  const { data } = await createAxios()
     .post('token', bodyFormData)
     .catch((err_response: any) => handleRequestError(err_response));
 
-  if (response == null) {
+  if (data == null) {
     return false;
   }
 
-  localStorage.setItem('login', JSON.stringify(response.data));
+  localStorage.setItem('login', JSON.stringify(data));
 
-  handleRequestError(response);
+  handleRequestError(data);
 
   // Reload axios object.
   createAxios();