add test, remove modified column from sled instances

oxidecomputer · Aug 20, 2024 · cb91b6b · cb91b6b
1 parent b450a05
commit cb91b6b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/app/pages/project/instances/InstancesPage.tsx b/app/pages/project/instances/InstancesPage.tsx
@@ -108,7 +108,7 @@ export function InstancesPage() {
         ),
       }),
       colHelper.accessor('memory', {
-        header: 'RAM',
+        header: 'Memory',
         cell: (info) => {
           const memory = filesize(info.getValue(), { output: 'object', base: 2 })
           return (
@@ -119,10 +119,7 @@ export function InstancesPage() {
         },
       }),
       colHelper.accessor(
-        (i) => ({
-          runState: i.runState,
-          timeRunStateUpdated: i.timeRunStateUpdated,
-        }),
+        (i) => ({ runState: i.runState, timeRunStateUpdated: i.timeRunStateUpdated }),
         {
           header: 'status',
           cell: (info) => <InstanceStatusCell value={info.getValue()} />,

diff --git a/app/pages/system/inventory/sled/SledInstancesTab.tsx b/app/pages/system/inventory/sled/SledInstancesTab.tsx
@@ -56,16 +56,17 @@ const staticCols = [
       )
     },
   }),
+  // we don't show run state last update time like on project instances because
+  // it's not in this response
   colHelper.accessor('state', {
     header: 'status',
-    cell: (info) => <InstanceStatusBadge key="run-state" status={info.getValue()} />,
+    cell: (info) => <InstanceStatusBadge status={info.getValue()} />,
   }),
   colHelper.accessor((i) => R.pick(i, ['memory', 'ncpus']), {
     header: 'specs',
     cell: (info) => <InstanceResourceCell value={info.getValue()} />,
   }),
   colHelper.accessor('timeCreated', Columns.timeCreated),
-  colHelper.accessor('timeModified', Columns.timeModified),
 ]
 
 export function SledInstancesTab() {

diff --git a/test/e2e/instance.e2e.ts b/test/e2e/instance.e2e.ts
@@ -5,7 +5,7 @@
  *
  * Copyright Oxide Computer Company
  */
-import { expect, refreshInstance, sleep, test } from './utils'
+import { expect, expectRowVisible, refreshInstance, sleep, test } from './utils'
 
 test('can delete a failed instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances')
@@ -78,3 +78,27 @@ test('delete from instance detail', async ({ page }) => {
   await expect(page.getByRole('cell', { name: 'db1' })).toBeVisible()
   await expect(page.getByRole('cell', { name: 'you-fail' })).toBeHidden()
 })
+
+test('instance table', async ({ page }) => {
+  await page.goto('/projects/mock-project/instances')
+
+  const table = page.getByRole('table')
+  await expectRowVisible(table, {
+    name: 'db1',
+    CPU: '2 vCPU',
+    Memory: '4 GiB',
+    status: 'running0s',
+  })
+  await expectRowVisible(table, {
+    name: 'you-fail',
+    CPU: '4 vCPU',
+    Memory: '6 GiB',
+    status: 'failed0s',
+  })
+  await expectRowVisible(table, {
+    name: 'not-there-yet',
+    CPU: '2 vCPU',
+    Memory: '8 GiB',
+    status: 'starting0s',
+  })
+})