Fix admin table sorting

jsx/src/components/ServerDashboard/ServerDashboard.jsx

@@ -153,10 +153,9 @@ const ServerDashboard = (props) => {
     );
   };
 
-  const EditUserCell = ({ user, numServers, serverName }) => {
+  const EditUserCell = ({ user }) => {
-    if (serverName) return null;
     return (
-      <td rowspan={numServers}>
+      <td>
         <button
           className="btn btn-primary btn-xs"
           style={{ marginRight: 20 }}
@@ -176,6 +175,14 @@ const ServerDashboard = (props) => {
     );
   };
 
+  let servers = user_data.flatMap((user) => {
+    let userServers = Object.values({
+      "": user.server,
+      ...(user.servers || {}),
+    });
+    return userServers.map((server) => [user, server]);
+  });
+
   return (
     <div className="container" data-testid="container">
       {errorAlert != null ? (
@@ -339,31 +346,14 @@ const ServerDashboard = (props) => {
                 </Button>
               </td>
             </tr>
-            {user_data.flatMap((e, i) => {
+            {servers.map(([user, server], i) => {
-              let userServers = Object.values({
+              server.name = server.name || ""
-                "": e.server,
-                ...(e.servers || {}),
-              });
-              return userServers.map((server) => {
-                server = { name: "", ...server };
               return (
                 <tr key={i + "row"} className="user-row">
-                    {!server.name && (
+                  <td data-testid="user-row-name">{user.name}</td>
-                      <td
+                  <td data-testid="user-row-admin">
-                        data-testid="user-row-name"
+                    {user.admin ? "admin" : ""}
-                        rowspan={userServers.length}
-                      >
-                        {e.name}
                   </td>
-                    )}
-                    {!server.name && (
-                      <td
-                        data-testid="user-row-admin"
-                        rowspan={userServers.length}
-                      >
-                        {e.admin ? "admin" : ""}
-                      </td>
-                    )}
 
                   <td data-testid="user-row-server">
                     {server.name ? (
@@ -383,11 +373,11 @@ const ServerDashboard = (props) => {
                       <>
                         <StopServerButton
                           serverName={server.name}
-                            userName={e.name}
+                          userName={user.name}
                         />
                         <AccessServerButton
                           serverName={server.name}
-                            userName={e.name}
+                          userName={user.name}
                         />
                       </>
                     ) : (
@@ -395,10 +385,10 @@ const ServerDashboard = (props) => {
                       <>
                         <StartServerButton
                           serverName={server.name}
-                            userName={e.name}
+                          userName={user.name}
                         />
                         <a
-                            href={`/spawn/${e.name}${
+                          href={`/spawn/${user.name}${
                             server.name && "/" + server.name
                           }`}
                         >
@@ -412,14 +402,9 @@ const ServerDashboard = (props) => {
                       </>
                     )}
                   </td>
-                    <EditUserCell
+                  <EditUserCell user={user} />
-                      user={e}
-                      numServers={userServers.length}
-                      serverName={server.name}
-                    />
                 </tr>
               );
-              });
             })}
           </tbody>
         </table>