From 8809fec6e0edd385003b13b3cbcf8529625bfc31 Mon Sep 17 00:00:00 2001
From: calli <calli-eve@proton.me>
Date: Tue, 22 Apr 2025 12:08:10 +0300
Subject: [PATCH] Improve characters handling and add a collapse to account
 cards for easier sorting

---
 src/app/components/Account/AccountCard.tsx    | 24 +++++++++---
 .../components/Characters/CharacterDialog.tsx | 38 +++++++++++++------
 src/app/components/MainGrid.tsx               |  4 +-
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/app/components/Account/AccountCard.tsx b/src/app/components/Account/AccountCard.tsx
index c614457..e8308de 100644
--- a/src/app/components/Account/AccountCard.tsx
+++ b/src/app/components/Account/AccountCard.tsx
@@ -1,15 +1,18 @@
 import { AccessToken } from "@/types";
-import { Box, Stack, Typography, useTheme, Paper } from "@mui/material";
+import { Box, Stack, Typography, useTheme, Paper, IconButton } from "@mui/material";
 import { CharacterRow } from "../Characters/CharacterRow";
 import { PlanetaryInteractionRow } from "../PlanetaryInteraction/PlanetaryInteractionRow";
 import { SessionContext } from "@/app/context/Context";
-import { useContext } from "react";
+import { useContext, useState } from "react";
 import { PlanRow } from "./PlanRow";
+import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
+import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
 
 export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
   const theme = useTheme();
-
+  const [isCollapsed, setIsCollapsed] = useState(false);
   const { planMode } = useContext(SessionContext);
+
   return (
     <Paper
       elevation={2}
@@ -40,6 +43,7 @@ export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
             marginBottom: theme.spacing(2),
             display: 'flex',
             alignItems: 'center',
+            justifyContent: 'space-between',
           }}
         >
           <Typography 
@@ -49,12 +53,22 @@ export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
               color: theme.palette.text.primary,
             }}
           >
-            {characters[0].account !== "-"
+            {characters.length > 0 && characters[0].account !== "-"
               ? `Account: ${characters[0].account}`
               : "No account name"}
           </Typography>
+          <IconButton 
+            size="small" 
+            onClick={() => setIsCollapsed(!isCollapsed)}
+            sx={{ 
+              transform: isCollapsed ? 'rotate(-90deg)' : 'rotate(0deg)',
+              transition: 'transform 0.2s ease-in-out'
+            }}
+          >
+            {isCollapsed ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
+          </IconButton>
         </Box>
-        {characters.map((c) => (
+        {!isCollapsed && characters.map((c) => (
           <Stack
             key={c.character.characterId}
             direction="row"
diff --git a/src/app/components/Characters/CharacterDialog.tsx b/src/app/components/Characters/CharacterDialog.tsx
index 71ef7ee..54b6666 100644
--- a/src/app/components/Characters/CharacterDialog.tsx
+++ b/src/app/components/Characters/CharacterDialog.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, DialogActions, DialogTitle } from "@mui/material";
+import { Button, Dialog, DialogActions, DialogTitle, Box } from "@mui/material";
 import { AccessToken, CharacterUpdate } from "../../../types";
 import { useEffect, useState, KeyboardEvent } from "react";
 import TextField from "@mui/material/TextField";
@@ -34,7 +34,9 @@ export const CharacterDialog = ({
   const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
     if (event.key === "Enter") {
       closeDialog();
-      character && updateCharacter(character, { account, comment });
+      if (character) {
+        updateCharacter(character, { account, comment });
+      }
     }
   };
 
@@ -44,16 +46,27 @@ export const CharacterDialog = ({
       onClose={closeDialog}
       fullWidth={true}
     >
-      <DialogTitle>{character && character.character.name}</DialogTitle>
-      <TextField
-        id="outlined-basic"
-        label="Account name"
-        variant="outlined"
-        value={account ?? ""}
-        sx={{ margin: 1 }}
-        onChange={(event) => setAccount(event.target.value)}
-        onKeyDown={handleKeyDown}
-      />
+      <DialogTitle>{character?.character?.name}</DialogTitle>
+      <Box sx={{ display: 'flex', alignItems: 'center', margin: 1 }}>
+        <TextField
+          id="outlined-basic"
+          label="Account name"
+          variant="outlined"
+          value={account ?? ""}
+          sx={{ flex: 1 }}
+          onChange={(event) => setAccount(event.target.value)}
+          onKeyDown={handleKeyDown}
+        />
+        <Button
+          onClick={() => {
+            setAccount("-");
+          }}
+          variant="outlined"
+          sx={{ ml: 1 }}
+        >
+          Clear account
+        </Button>
+      </Box>
       <TextField
         id="outlined-basic"
         label="System"
@@ -77,6 +90,7 @@ export const CharacterDialog = ({
       <DialogActions>
         <Button
           onClick={() => {
+            console.log("Saving character", character, { account, comment, system });
             character &&
               updateCharacter(character, { account, comment, system });
             closeDialog();
diff --git a/src/app/components/MainGrid.tsx b/src/app/components/MainGrid.tsx
index c961d3e..19bac54 100644
--- a/src/app/components/MainGrid.tsx
+++ b/src/app/components/MainGrid.tsx
@@ -164,7 +164,9 @@ export const MainGrid = () => {
                           },
                         }}
                       >
-                        <AccountCard characters={groupByAccount[account]} />
+                        {groupByAccount[account] && groupByAccount[account].length > 0 && (
+                          <AccountCard characters={groupByAccount[account]} />
+                        )}
                       </Grid>
                     )}
                   </DraggableComponent>