[Fix #478] Make sure last editor column shows creator username if edi…

…tor is not present.
kbss-cvut · Aug 9, 2024 · a9ba4fc · a9ba4fc
1 parent 6dd6cd9
commit a9ba4fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/components/table/FaultTreeTableBody.tsx b/src/components/table/FaultTreeTableBody.tsx
@@ -34,7 +34,7 @@ const FaultTreeTableBody: FC<FaultTreeTableBodyProps> = ({ faultTrees, handleFau
       {faultTrees.map((faultTree, rowIndex) => {
         const routePath = ROUTES.FTA + `/${extractFragment(faultTree.iri)}`;
         const statusColor = faultTree?.status !== Status.OK ? "red" : "white";
-
+        const editor = faultTree?.editor || faultTree?.creator;
         return (
           <TableRow key={rowIndex} className={classes.noBorder}>
             <TableCell className={classes.firstColumn}>{faultTree.name}</TableCell>
@@ -47,7 +47,7 @@ const FaultTreeTableBody: FC<FaultTreeTableBodyProps> = ({ faultTrees, handleFau
             <TableCell className={classes.tableCell}>{failureRate(faultTree?.requiredFailureRate)}</TableCell>
             <TableCell className={classes.tableCell}>{formatDate(faultTree?.modified)}</TableCell>
             <TableCell className={classes.tableCell}>{formatDate(faultTree?.created)}</TableCell>
-            <TableCell className={classes.tableCell}>{faultTree?.editor?.username}</TableCell>
+            <TableCell className={classes.tableCell}>{editor?.username}</TableCell>
             <TableCell className={classes.tableCell}>
               <Box className={classes.rowOptionsContainer}>
                 <Button

diff --git a/src/models/faultTreeModel.tsx b/src/models/faultTreeModel.tsx
@@ -23,6 +23,9 @@ export interface FaultTree extends AbstractModel {
   system?: System;
   calculatedFailureRate?: number;
   fhaBasedFailureRate?: number;
+  creator?: {
+    username?: string;
+  };
   editor?: {
     username?: string;
   };