[fix] Fixed identification of user and group chats.

homenoc · Jul 23, 2021 · 7d5f0fa · 7d5f0fa
1 parent bf10265
commit 7d5f0fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/components/Dashboard/Request/Request.tsx b/src/components/Dashboard/Request/Request.tsx
@@ -248,7 +248,7 @@ export function StatusTable(props: {
                                     </Button>
                                     &nbsp;
                                     {
-                                        row.group_id !== 0 &&
+                                        !(row.group_id === 0 || row.group_id == null) &&
                                         <Button
                                             size="small"
                                             variant="outlined"
@@ -257,7 +257,7 @@ export function StatusTable(props: {
                                         </Button>
                                     }
                                     {
-                                        row.group_id === 0 &&
+                                        (row.group_id === 0 || row.group_id == null) &&
                                         <Button
                                             size="small"
                                             variant="outlined"

diff --git a/src/components/Dashboard/Ticket/Ticket.tsx b/src/components/Dashboard/Ticket/Ticket.tsx
@@ -188,10 +188,12 @@ export function StatusTable(props: {
                             <TableRow key={"ticket_detail_" + index}>
                                 <TableCell component="th" scope="row">
                                     {
-                                        row.group_id === 0 && <Chip size="small" color="primary" label="U"/>
+                                        (row.group_id === 0 || row.group_id == null) &&
+                                        <Chip size="small" color="primary" label="U"/>
                                     }
                                     {
-                                        row.group_id !== 0 && <Chip size="small" color="primary" label="G"/>
+                                        !(row.group_id === 0 || row.group_id == null) &&
+                                        <Chip size="small" color="primary" label="G"/>
                                     }
                                     &nbsp;
                                     {row.ID}: {row.title}
@@ -227,7 +229,7 @@ export function StatusTable(props: {
                                     </Button>
                                     &nbsp;
                                     {
-                                        row.group_id !== 0 &&
+                                        !(row.group_id === 0 || row.group_id == null) &&
                                         <Button
                                             size="small"
                                             variant="outlined"
@@ -236,7 +238,7 @@ export function StatusTable(props: {
                                         </Button>
                                     }
                                     {
-                                        row.group_id === 0 &&
+                                        (row.group_id === 0 || row.group_id == null) &&
                                         <Button
                                             size="small"
                                             variant="outlined"

diff --git a/src/pages/Support/Support.tsx b/src/pages/Support/Support.tsx
@@ -104,15 +104,15 @@ export default function Support() {
                             </Typography>
                             <br/>
                             {
-                                ticket.group_id === 0 &&
+                                (ticket.group_id === 0 || ticket.group_id == null) &&
                                 <Chip
                                     size="small"
                                     color="primary"
                                     label="個人チャット"
                                 />
                             }
                             {
-                                ticket.group_id !== 0 &&
+                                !(ticket.group_id === 0 || ticket.group_id == null) &&
                                 <Chip
                                     size="small"
                                     color="primary"