Fix instance delete success callback (#2165)

* fix instance delete success callback

* obviously we should make sure the instance isn't there anymore

Author: david-crespo

app/pages/project/instances/InstancesPage.tsx

@@ -59,7 +59,10 @@ export function InstancesPage() {
   const queryClient = useApiQueryClient()
   const refetchInstances = () => queryClient.invalidateQueries('instanceList')
 
-  const makeActions = useMakeInstanceActions({ project }, { onSuccess: refetchInstances })
+  const makeActions = useMakeInstanceActions(
+    { project },
+    { onSuccess: refetchInstances, onDelete: refetchInstances }
+  )
 
   const { data: instances } = usePrefetchedApiQuery('instanceList', {
     query: { project, limit: PAGE_SIZE },

app/pages/project/instances/actions.tsx

@@ -40,7 +40,8 @@ export const useMakeInstanceActions = (
   const startInstance = useApiMutation('instanceStart', opts)
   const stopInstance = useApiMutation('instanceStop', opts)
   const rebootInstance = useApiMutation('instanceReboot', opts)
-  const deleteInstance = useApiMutation('instanceDelete', opts)
+  // delete has its own
+  const deleteInstance = useApiMutation('instanceDelete', { onSuccess: options.onDelete })
 
   return useCallback(
     (instance) => {
@@ -123,10 +124,8 @@ export const useMakeInstanceActions = (
           onActivate: confirmDelete({
             doDelete: () =>
               deleteInstance.mutateAsync(instanceParams, {
-                onSuccess: () => {
-                  options.onDelete?.()
-                  addToast({ title: `Deleting instance '${instance.name}'` })
-                },
+                onSuccess: () =>
+                  addToast({ title: `Deleting instance '${instance.name}'` }),
               }),
             label: instance.name,
             resourceKind: 'instance',
@@ -138,14 +137,6 @@ export const useMakeInstanceActions = (
         },
       ]
     },
-    [
-      projectSelector,
-      deleteInstance,
-      navigate,
-      options,
-      rebootInstance,
-      startInstance,
-      stopInstance,
-    ]
+    [projectSelector, deleteInstance, navigate, rebootInstance, startInstance, stopInstance]
   )
 }

test/e2e/instance/disks.e2e.ts renamed to test/e2e/instance-disks.e2e.ts

@@ -13,7 +13,7 @@ import {
   expectVisible,
   stopInstance,
   test,
-} from '../utils'
+} from './utils'
 
 test('Attach disk', async ({ page }) => {
   await page.goto('/projects/mock-project/instances/db1')

test/e2e/instance/networking.e2e.ts renamed to test/e2e/instance-networking.e2e.ts

@@ -13,9 +13,9 @@ import {
   expectRowVisible,
   expectVisible,
   stopInstance,
-} from '../utils'
+} from './utils'
 
-test('Instance networking tab — NIC table', async ({ page }) => {
+test('Instance networking tab — NIC table', async ({ page }) => {
   await page.goto('/projects/mock-project/instances/db1')
 
   // links to VPC and external IPs appear in table

test/e2e/instance/list.e2e.ts renamed to test/e2e/instance.e2e.ts

@@ -5,7 +5,7 @@
  *
  * Copyright Oxide Computer Company
  */
-import { expect, test } from '../utils'
+import { expect, test } from './utils'
 
 test('can delete a failed instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances')
@@ -60,3 +60,15 @@ test('can stop a starting instance', async ({ page }) => {
 
   await expect(row.getByRole('cell', { name: /stopped/ })).toBeVisible()
 })
+
+test('delete from instance detail', async ({ page }) => {
+  await page.goto('/projects/mock-project/instances/you-fail')
+
+  await page.getByRole('button', { name: 'Instance actions' }).click()
+  await page.getByRole('menuitem', { name: 'Delete' }).click()
+  await page.getByRole('button', { name: 'Confirm' }).click()
+
+  await expect(page).toHaveURL('/projects/mock-project/instances')
+  await expect(page.getByRole('cell', { name: 'db1' })).toBeVisible()
+  await expect(page.getByRole('cell', { name: 'you-fail' })).toBeHidden()
+})