refactor(ui): delete the connection directly from the reset dialog

Author: iagodahlem

packages/ui/src/components/ConfigureSSO/ConfigureSSOContext.tsx

@@ -45,17 +45,6 @@ export interface ConfigureSSOData {
    * derive the connection name without each calling `useUser` itself.
    */
   primaryEmailAddress: EmailAddressResource | undefined;
-  /**
-   * Deletes the current connection. Reset does NOT navigate: once the delete
-   * revalidates the source and drops `hasConnection`, the active step's entry
-   * guard breaks and the wizard self-corrects, re-seating to the
-   * furthest-reachable step (the same `initialState` derivation it uses on
-   * mount). Reads the reverification-wrapped `deleteConnection` mutation off the
-   * bundle. A no-op when there is no connection. Reset affordances call this
-   * instead of `useWizard().goToStep`, so they work from ANY footer (including
-   * nested SAML configure footers) without binding to a nested wizard.
-   */
-  resetConnection: () => Promise<void>;
 }
 
 interface ConfigureSSOProviderProps {
@@ -96,21 +85,6 @@ export const ConfigureSSOProvider = ({
   primaryEmailAddress,
   children,
 }: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
-  const { deleteConnection } = mutations;
-  const connectionId = enterpriseConnection?.id;
-
-  // Reset is pure deletion — no navigation. Deleting revalidates the source and
-  // drops `hasConnection`, which breaks the active step's entry guard; the
-  // wizard self-corrects in its render phase, re-seating to the
-  // furthest-reachable step (verified email → select-provider; unverified →
-  // verify-domain). Never a hardcoded step, never a remount.
-  const resetConnection = React.useCallback(async () => {
-    if (!connectionId) {
-      return;
-    }
-    await deleteConnection(connectionId);
-  }, [connectionId, deleteConnection]);
-
   const value = React.useMemo<ConfigureSSOData>(
     () => ({
       contentRef,
@@ -119,9 +93,8 @@ export const ConfigureSSOProvider = ({
       testRuns,
       mutations,
       primaryEmailAddress,
-      resetConnection,
     }),
-    [contentRef, enterpriseConnection, mutations, connectionState, testRuns, primaryEmailAddress, resetConnection],
+    [contentRef, enterpriseConnection, mutations, connectionState, testRuns, primaryEmailAddress],
   );
 
   return <ConfigureSSOContext.Provider value={value}>{children}</ConfigureSSOContext.Provider>;

packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

@@ -14,7 +14,7 @@ import { useWizard } from './elements/Wizard';
  * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
  * a disabled breadcrumb item and a blocked jump always agree. Completion stays
  * positional. The reset affordance now lives in the step footers
- * (`Step.Footer.Reset`), which drive it off the context `resetConnection()`
+ * (`Step.Footer.Reset`), which delete the connection via the context mutation
  * rather than a wizard binding.
  */
 export const ConfigureSSOHeader = (): JSX.Element => {

packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

@@ -46,7 +46,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
   const { onClose, confirmationValue } = props;
   const card = useCardState();
-  const { enterpriseConnection, resetConnection } = useConfigureSSO();
+  const { enterpriseConnection, mutations } = useConfigureSSO();
 
   const confirmationField = useFormControl('deleteConfirmation', '', {
     type: 'text',
@@ -65,12 +65,13 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
     }
 
     try {
-      // `resetConnection` deletes the connection — a pure delete, no navigation.
-      // Dropping `hasConnection` breaks the active step's entry guard, so the
-      // wizard self-corrects to the furthest-reachable step. No `useWizard()`
-      // here — that lets this dialog be triggered from ANY footer (including the
-      // nested SAML configure footers) without binding to a nested wizard.
-      await resetConnection();
+      // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
+      // the active step's entry guard, so the wizard self-corrects to the
+      // furthest-reachable step. The mutation is already reverification-wrapped.
+      // No `useWizard()` here — that lets this dialog be triggered from ANY
+      // footer (including the nested SAML configure footers) without binding to
+      // a nested wizard.
+      await mutations.deleteConnection(enterpriseConnection.id);
       onClose();
     } catch (err) {
       handleError(err as Error, [confirmationField], card.setError);

packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

@@ -5,12 +5,13 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
 import { render, screen, waitFor } from '@/test/utils';
 import { CardStateProvider } from '@/ui/elements/contexts';
 
-// The dialog no longer touches the wizard. On confirm it calls the context
-// `resetConnection()` — a pure delete, no navigation — and the wizard
-// self-corrects to the furthest-reachable step once the active step's guard
-// breaks. That lets the dialog be triggered from ANY footer (including nested
-// SAML configure footers) without binding to a nested wizard.
-const resetConnection = vi.fn();
+// The dialog no longer touches the wizard. On confirm it calls the
+// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
+// delete, no navigation — and the wizard self-corrects to the
+// furthest-reachable step once the active step's guard breaks. That lets the
+// dialog be triggered from ANY footer (including nested SAML configure footers)
+// without binding to a nested wizard.
+const deleteConnection = vi.fn();
 
 const connectionMockState = vi.hoisted(() => ({
   current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
@@ -20,9 +21,9 @@ vi.mock('../ConfigureSSOContext', () => ({
   useConfigureSSO: () => ({
     enterpriseConnection: connectionMockState.current,
     contentRef: { current: null },
-    // The dialog's confirm calls the context `resetConnection`, which owns the
-    // reverification-wrapped delete. No navigation — the wizard self-corrects.
-    resetConnection,
+    // The dialog's confirm calls the reverification-wrapped `deleteConnection`
+    // mutation directly. No navigation — the wizard self-corrects.
+    mutations: { deleteConnection },
   }),
 }));
 
@@ -49,8 +50,8 @@ const renderDialog = (
 };
 
 const resetMocks = () => {
-  resetConnection.mockReset();
-  resetConnection.mockResolvedValue(undefined);
+  deleteConnection.mockReset();
+  deleteConnection.mockResolvedValue(undefined);
   connectionMockState.current = { id: 'idn_connection_1' };
 };
 
@@ -116,7 +117,7 @@ describe('ResetConnectionDialog', () => {
 
     await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
     expect(onClose).toHaveBeenCalledTimes(1);
-    expect(resetConnection).not.toHaveBeenCalled();
+    expect(deleteConnection).not.toHaveBeenCalled();
   });
 
   it('resets the connection (delete + re-derive) and closes on a successful submit', async () => {
@@ -129,8 +130,9 @@ describe('ResetConnectionDialog', () => {
     await userEvent.click(screen.getByRole('button', { name: 'Reset connection' }));
 
     await waitFor(() => {
-      expect(resetConnection).toHaveBeenCalledTimes(1);
+      expect(deleteConnection).toHaveBeenCalledTimes(1);
     });
+    expect(deleteConnection).toHaveBeenCalledWith('idn_connection_1');
     await waitFor(() => {
       expect(onClose).toHaveBeenCalledTimes(1);
     });

packages/ui/src/components/ConfigureSSO/elements/Step.tsx

@@ -197,12 +197,12 @@ FooterContinue.displayName = 'Step.Footer.Continue';
  * there is no connection (so it only shows on configure / test / confirmation,
  * never on verify-domain / select-provider).
  *
- * It deliberately does NOT call `useWizard()`. The confirm path calls the
- * context `resetConnection()` (a pure delete; the wizard then self-corrects to
- * the furthest-reachable step when the active step's guard breaks), so this
- * works from ANY footer — including the nested SAML configure footers, which
- * have their own (linear) wizard. That is what kills the old per-step
- * nested-binding trap.
+ * It deliberately does NOT call `useWizard()`. The confirm path deletes the
+ * connection directly via the context mutation (a pure delete; the wizard then
+ * self-corrects to the furthest-reachable step when the active step's guard
+ * breaks), so this works from ANY footer — including the nested SAML configure
+ * footers, which have their own (linear) wizard. That is what kills the old
+ * per-step nested-binding trap.
  *
  * `marginInlineStart: 'auto'` pushes it to the far-left of the `justify='end'`
  * footer row, matching the prior destructive affordance.