Refactor to include AbortError

src/components/common/Loki/LokiPanel.js

@@ -13,6 +13,7 @@ import {
   formatDateAndTime
 } from "@ess-ics/ce-ui-common";
 import Convert from "ansi-to-html";
+import { getErrorMessage } from "../Helper";
 
 const TIME_RANGE_VALUES = [
   {
@@ -237,19 +238,20 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
     return sysLogData || procServLog;
   };
 
-  const hasLogError = sysLogError?.error || procServLogError?.error;
+  const isAbortError =
+    (sysLogError && sysLogError?.name === "AbortError") ||
+    (procServLogError && procServLogError?.name === "AbortError");
   const logError = sysLogError || procServLogError;
-  const logDataReceived = sysLogData || procServLog || !isDeployed;
+  const hasLogData = !!sysLogData || !!procServLog || !isDeployed;
+  const hasLogError = !isAbortError && !!logError;
 
   if (hasLogError) {
-    return (
-      <Alert severity="error">
-        {logError?.error}: {logError?.description}
-      </Alert>
-    );
+    getProcServLogAbort();
+    getSysLogDataAbort();
+    return <Alert severity="error">{getErrorMessage(logError)}</Alert>;
   }
 
-  if (!logDataReceived) {
+  if (!hasLogData && !hasLogError) {
     return (
       <div style={{ width: "100%" }}>
         <LinearProgress color="primary" />