Merge pull request #9521 from mook-as/ui/containers/uptime

UI: Containers: Fix uptime

Author: jandubois

pkg/rancher-desktop/pages/Containers.vue

@@ -134,6 +134,7 @@
 
 <script>
 import { BadgeState, Banner } from '@rancher/components';
+import dayjs from 'dayjs';
 import { shell } from 'electron';
 import merge from 'lodash/merge';
 import { defineComponent } from 'vue';
@@ -205,7 +206,7 @@ export default defineComponent({
           sort:  ['ports', 'containerName', 'imageName'],
         },
         {
-          name:  'started',
+          name:  'uptime',
           label: this.t('containers.manage.table.header.started'),
           sort:  ['si', 'containerName', 'imageName'],
           width: 120,
@@ -237,6 +238,7 @@ export default defineComponent({
           return a.state.localeCompare(b.state) || a.id.localeCompare(b.id);
         })
         .map(container => merge({}, container, {
+          uptime:           container.started && dayjs(container.started).toNow(true),
           availableActions: [
             {
               label:      'Info',

pkg/rancher-desktop/preload/extensions.ts

@@ -545,6 +545,7 @@ export class RDXClient implements v1.DockerDesktopClient {
           ...pick(details.State, ['Status', 'State'] as const),
           Names:      typeof c.Names === 'string' ? c.Names.split(/\s+/g) : Array.from(c.Names),
           Created:    Date.parse(c.CreatedAt).valueOf(),
+          Started:    Date.parse(details.State.StartedAt).valueOf(),
         };
       });
     },

pkg/rancher-desktop/store/container-engine.ts

@@ -17,6 +17,7 @@ interface ApiContainer {
   Id:      string;
   Command: string;
   Created: number;
+  Started: number;
   Image:   string;
   ImageID: string;
   Status:  string;
@@ -64,7 +65,7 @@ export interface Container {
   containerName: string;
   imageName:     string;
   state:         MobyContainer['State'] | NerdctlContainer['State'];
-  uptime:        string;
+  started:       Date | undefined;
   projectGroup:  string;
   labels:        Record<string, string>;
   ports:         Record<string, { HostIp: string, HostPort: string }[] | null>;
@@ -326,16 +327,14 @@ export const actions = {
           containerName: container.Names[0].replace(/_[a-z0-9-]{36}_[0-9]+/, ''),
           imageName:     container.Image,
           state,
-          uptime:        '',
+          started:       undefined,
           labels:        container.Labels ?? {},
           ports:         container.Ports,
           projectGroup,
         };
 
-        if (!isContainerd(container)) {
-          if (container.State === 'running') {
-            info.uptime = container.Status;
-          }
+        if (container.State === 'running' && container.Started) {
+          info.started = new Date(container.Started);
         }
         containers[container.Id] = merge(containers[container.Id] ?? {}, info);
         ids.add(container.Id);