Merge branch 'master' into ib/misc

ibodrov · web-flow · commit d8794cc04456 · 2023-11-02T13:42:11.000-04:00
diff --git a/console2/src/components/organisms/ProcessActivity/Toolbar.tsx b/console2/src/components/organisms/ProcessActivity/Toolbar.tsx
@@ -146,7 +146,7 @@ const renderProcessStatus = (process?: ProcessEntry) => {
 
     let duration;
     if (process.status === ProcessStatus.RUNNING) {
-        duration = formatDuration(new Date().getTime() - parseDate(process.createdAt).getTime());
+        duration = formatDuration(new Date().getTime() - parseDate(process.lastRunAt || process.createdAt).getTime());
     }
     return (
         <>

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ const renderProcessStatus = (process?: ProcessEntry) => {`
`146`	`146`
`147`	`147`	`let duration;`
`148`	`148`	`if (process.status === ProcessStatus.RUNNING) {`
`149`		`- duration = formatDuration(new Date().getTime() - parseDate(process.createdAt).getTime());`
	`149`	`+ duration = formatDuration(new Date().getTime() - parseDate(process.lastRunAt \|\| process.createdAt).getTime());`
`150`	`150`	`}`
`151`	`151`	`return (`
`152`	`152`	`<>`