trim ansi codes from log, optimize historical log queries

equinor · Mar 12, 2024 · de35d6d · de35d6d
1 parent 533c637
commit de35d6d
Show file tree

Hide file tree

Showing 6 changed files with 128 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "react-select": "^5.8.0",
     "react-toastify": "^9.1.3",
     "sanitize.css": "^13.0.0",
+    "strip-ansi": "^7.1.0",
     "styled-components": "^6.1.8",
     "vite": "^5.0.12"
   },

diff --git a/src/components/code/index.tsx b/src/components/code/index.tsx
@@ -4,6 +4,7 @@ import { clsx } from 'clsx';
 import { FunctionComponent, UIEvent, useEffect, useRef, useState } from 'react';
 
 import { copyToClipboard, copyToTextFile } from '../../utils/string';
+import stripAnsi from 'strip-ansi';
 
 import './style.css';
 
@@ -74,7 +75,7 @@ export const Code: FunctionComponent<CodeProps & { children?: string }> = ({
         ref={containerRef}
         onScroll={handleScroll}
       >
-        {children}
+        {stripAnsi(children)}
       </Card>
     </div>
   );

diff --git a/src/components/page-active-component/component-replica-log-accordion.tsx b/src/components/page-active-component/component-replica-log-accordion.tsx
@@ -29,6 +29,7 @@ import {
 } from '../../utils/sort-utils';
 import { smallGithubCommitHash, smallReplicaName } from '../../utils/string';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
+import { addMinutes } from 'date-fns';
 
 interface ComponentNameProps {
   appName: string;
@@ -207,7 +208,14 @@ function ReplicaLogTableRow({
           onClick={downloadLazyLogCb(
             `${appName}_${envName}_${componentName}_${name}.txt`,
             getLog as LazyQueryTriggerPlain<Parameters<typeof getLog>[0]>,
-            { appName, envName, componentName, replicaName: name }
+            {
+              appName,
+              envName,
+              componentName,
+              replicaName: name,
+              start: created.toISOString(),
+              end: addMinutes(ended, 10).toISOString(),
+            }
           )}
           disabled={isFetching}
         />
@@ -262,7 +270,15 @@ function ReplicaContainerTableRow({
           onClick={downloadLazyLogCb(
             `${appName}_${envName}_${componentName}_${replicaName}_${id}.txt`,
             getLog as LazyQueryTriggerPlain<Parameters<typeof getLog>[0]>,
-            { appName, envName, componentName, replicaName, containerId: id }
+            {
+              appName,
+              envName,
+              componentName,
+              replicaName,
+              containerId: id,
+              start: created.toISOString(),
+              end: addMinutes(ended, 10).toISOString(),
+            }
           )}
           disabled={isFetching}
         />

diff --git a/src/components/page-scheduled-job/replica-log-accordion.tsx b/src/components/page-scheduled-job/replica-log-accordion.tsx
@@ -230,7 +230,15 @@ const ReplicaLogTableRow: FunctionComponent<
               name
             )}.txt`,
             getLog as LazyQueryTriggerPlain<Parameters<typeof getLog>[0]>,
-            { appName, envName, jobComponentName, jobName, replicaName: name }
+            {
+              appName,
+              envName,
+              jobComponentName,
+              jobName,
+              replicaName: name,
+              start: created.toISOString(),
+              end: addMinutes(ended, 10).toISOString(),
+            }
           )}
           disabled={isFetching}
         />
@@ -296,6 +304,8 @@ function ReplicaContainerTableRow({
               jobName,
               replicaName,
               containerId: id,
+              start: created.toISOString(),
+              end: addMinutes(ended, 10).toISOString(),
             }
           )}
           disabled={isFetching}

diff --git a/src/store/utils/index.ts b/src/store/utils/index.ts
@@ -22,7 +22,10 @@ export function getFetchErrorData(error: FetchQueryError): {
     const err = error as FetchBaseQueryError;
     if (err.data?.['code'] || err.data?.['message'] || err.data?.['error']) {
       // data is an object containing status
-      errObj.code = err.data['code'];
+      errObj.code = err.status;
+      if (err.data['code']) {
+        errObj.code = err.data['code'];
+      }
       if (typeof err.data['message'] === 'string') {
         errObj.message = err.data['message'];
       }