jusrhee пре 2 година
родитељ
комит
9807d6c434

+ 7 - 6
dashboard/src/main/home/app-dashboard/expanded-app/activity-feed/events/PreDeployEventCard.tsx

@@ -60,12 +60,13 @@ const PreDeployEventCard: React.FC<Props> = ({ event, appData }) => {
           cluster_id: appData.app.cluster_id,
         }
       )
-      const updatedLogs = logResp.data.logs.map((l: { line: string; timestamp: string; }, index: number) =>
-      ({
-        line: Anser.ansiToJson(l.line),
-        lineNumber: index + 1,
-        timestamp: l.timestamp,
-      }));
+      const updatedLogs = logResp.data.logs.map((l: { line: string; timestamp: string; }, index: number) => {
+        return {
+          line: JSON.parse(l.line)?.log ?? Anser.ansiToJson(l.line),
+          lineNumber: index + 1,
+          timestamp: l.timestamp,
+        }
+      });
 
       setLogs(updatedLogs);
     } catch (error) {

+ 4 - 2
dashboard/src/main/home/app-dashboard/expanded-app/status/ExpandedIncidentLogs.tsx

@@ -33,7 +33,7 @@ const ExpandedIncidentLogs: React.FC<ExpandedIncidentLogsProps> = ({ logs }: Exp
                                 {dayjs(log.timestamp).format("MMM D, YYYY HH:mm:ss")}
                             </span>}
                             <LogOuter key={[log.lineNumber, i].join(".")}>
-                                {log.line?.map((ansi, j) => {
+                                {Array.isArray(log.line) ? log.line?.map((ansi, j) => {
                                     if (ansi.clearLine) {
                                         return null;
                                     }
@@ -46,7 +46,9 @@ const ExpandedIncidentLogs: React.FC<ExpandedIncidentLogsProps> = ({ logs }: Exp
                                             {ansi.content.replace(/ /g, "\u00a0")}
                                         </LogInnerSpan>
                                     );
-                                })}
+                                }) : (
+                                    log.line
+                                )}
                             </LogOuter>
                         </LogSpan>
                     );