Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(dashboard): keep an edited create draft when an old create ends
Yudhi Armyndharis1ecda152b3d1
diff --git a/dashboard/src/hooks/useSessionCreateForm.test.ts b/dashboard/src/hooks/useSessionCreateForm.test.tsnew file mode 100644index 000000000..545b1f623--- /dev/null+++ b/dashboard/src/hooks/useSessionCreateForm.test.ts@@ -0,0 +1,136 @@+// The New Session modal keeps its draft across a create that is still in flight: the answer must not clear or+// close a draft that was edited, or typed after the modal was closed and opened again, since the request was sent.+import '../test-helpers/register-hooks.ts';+import { test, before, afterEach } from 'node:test';+import assert from 'node:assert/strict';+import { createElement, type ReactNode } from 'react';+import type { useSessionCreateForm as useSessionCreateFormFn } from './useSessionCreateForm.ts';+import type { ToastContext as ToastContextType } from './useToast.ts';+import type { Session } from '../services/api.ts';++type RTL = typeof import('@testing-library/react');++let rtl: RTL;+let useSessionCreateForm: typeof useSessionCreateFormFn;+let ToastContext: typeof ToastContextType;++let createAnswer: Promise<Response> = new Promise(() => {});+const created: Session[] = [];+const sentNames: string[] = [];++function sessionRow(name: string): Session {+ return { id: `id-${name}`, name, status: 'created', createdAt: '2026-10-01T00:00:00.000Z', updatedAt: '' };+}++before(async () => {+ const { installJsdomGlobals } = await import('../test-helpers/jsdom.ts');+ await installJsdomGlobals();+ const { i18nReady } = await import('../i18n/index.ts');+ await i18nReady;+ globalThis.fetch = (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {+ const url = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;+ if (url.endsWith('/api/sessions') && init?.method === 'POST') {+ sentNames.push((JSON.parse(String(init.body)) as { name: string }).name);+ return createAnswer;+ }+ return Promise.resolve(new Response('{}', { status: 404 }));+ };+ rtl = await import('@testing-library/react');+ ({ useSessionCreateForm } = await import('./useSessionCreateForm.ts'));+ ({ ToastContext } = await import('./useToast.ts'));+});++afterEach(() => {+ rtl.cleanup();+ createAnswer = new Promise(() => {});+ created.length = 0;+ sentNames.length = 0;+});++function renderForm() {+ const noop = () => {};+ const value = {+ toasts: [],+ addToast: noop,+ removeToast: noop,+ success: noop,+ error: noop,+ warning: noop,+ info: noop,+ };+ const wrapper = ({ children }: { children: ReactNode }) => createElement(ToastContext.Provider, { value }, children);+ return rtl.renderHook(() => useSessionCreateForm({ onCreated: session => created.push(session), onFailed: noop }), {+ wrapper,+ });+}++function holdAnswer(): (name: string) => void {+ let release!: (response: Response) => void;+ createAnswer = new Promise<Response>(resolve => (release = resolve));+ return name => release(new Response(JSON.stringify(sessionRow(name)), { status: 201 }));+}++const settle = () => rtl.act(async () => void (await new Promise<void>(resolve => setImmediate(resolve))));++test('a create answered in the visit that sent it clears the draft and closes the modal', async () => {+ const { result } = renderForm();+ const answer = holdAnswer();+ rtl.act(() => result.current.setShowCreateModal(true));+ rtl.act(() => result.current.setNewSessionName('dummy-a'));+ await rtl.act(async () => void result.current.handleCreate());+ assert.deepEqual(sentNames, ['dummy-a']);+ answer('dummy-a');+ await settle();+ assert.equal(result.current.showCreateModal, false);+ assert.equal(result.current.newSessionName, '');+ assert.deepEqual(+ created.map(s => s.name),+ ['dummy-a'],+ );+});++test('a name edited while a create is in flight is kept when it is answered', async () => {+ const { result } = renderForm();+ const answer = holdAnswer();+ rtl.act(() => result.current.setShowCreateModal(true));+ rtl.act(() => result.current.setNewSessionName('dummy-a'));+ await rtl.act(async () => void result.current.handleCreate());+ rtl.act(() => result.current.setNewSessionName('dummy-ab'));+ answer('dummy-a');+ await settle();+ assert.equal(result.current.showCreateModal, true);+ assert.equal(result.current.newSessionName, 'dummy-ab');+});++test('a create cancelled while in flight still clears the form when it is answered', async () => {+ const { result } = renderForm();+ const answer = holdAnswer();+ rtl.act(() => result.current.setShowCreateModal(true));+ rtl.act(() => result.current.setNewSessionName('dummy-a'));+ await rtl.act(async () => void result.current.handleCreate());+ rtl.act(() => result.current.setShowCreateModal(false));+ answer('dummy-a');+ await settle();+ assert.equal(result.current.showCreateModal, false);+ assert.equal(result.current.newSessionName, '');+});++test('a create answered after the modal was closed and opened again leaves the new draft alone', async () => {+ const { result } = renderForm();+ const answer = holdAnswer();+ rtl.act(() => result.current.setShowCreateModal(true));+ rtl.act(() => result.current.setNewSessionName('dummy-a'));+ await rtl.act(async () => void result.current.handleCreate());+ rtl.act(() => result.current.setShowCreateModal(false));+ rtl.act(() => result.current.setShowCreateModal(true));+ rtl.act(() => result.current.setNewSessionName('dummy-b'));+ answer('dummy-a');+ await settle();+ assert.equal(result.current.showCreateModal, true);+ assert.equal(result.current.newSessionName, 'dummy-b');+ assert.equal(result.current.creating, false);+ assert.deepEqual(+ created.map(s => s.name),+ ['dummy-a'],+ );+});diff --git a/dashboard/src/hooks/useSessionCreateForm.ts b/dashboard/src/hooks/useSessionCreateForm.tsindex 859571dcd..8d0a52a71 100644--- a/dashboard/src/hooks/useSessionCreateForm.ts+++ b/dashboard/src/hooks/useSessionCreateForm.ts@@ -1,4 +1,4 @@-import { useEffect, useState } from 'react';+import { useEffect, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import { sessionApi, type Session } from '../services/api';import { isValidProxyUrl } from '../utils/sessionForm';@@ -37,6 +37,15 @@ export function useSessionCreateForm({ onCreated, onFailed }: UseSessionCreateFoconst [useProxy, setUseProxy] = useState(false);const [proxyUrl, setProxyUrl] = useState('');const [creating, setCreating] = useState(false);+ // Counts what turns the form into a newer draft: an edit, or the modal opening again. A create that answers after+ // either leaves that draft alone. Closing the modal is not one, so a cancelled create still clears the form.+ const draftEdits = useRef(0);+ const edited =+ <T>(set: (value: T) => void) =>+ (value: T) => {+ draftEdits.current += 1;+ set(value);+ };const resetProxyFields = () => {setUseProxy(false);@@ -55,15 +64,18 @@ export function useSessionCreateForm({ onCreated, onFailed }: UseSessionCreateFo// Guarded here rather than only on the Create button: the name field's Enter key calls this// directly, so a button-only check creates a session with no proxy while the toggle says on.if (useProxy && !isValidProxyUrl(proxyUrl.trim())) return;+ const submittedAt = draftEdits.current;try {setCreating(true);const newSession = await sessionApi.create(newSessionName,useProxy && proxyUrl.trim() ? { proxyUrl: proxyUrl.trim() } : undefined,);- setNewSessionName('');- resetProxyFields();- setShowCreateModal(false);+ if (draftEdits.current === submittedAt) {+ setNewSessionName('');+ resetProxyFields();+ setShowCreateModal(false);+ }toast.success(t('sessions.create.successTitle'), t('sessions.create.successDesc', { name: newSession.name }));onCreated(newSession);} catch (err) {@@ -77,13 +89,16 @@ export function useSessionCreateForm({ onCreated, onFailed }: UseSessionCreateForeturn {showCreateModal,- setShowCreateModal,+ setShowCreateModal: (open: boolean) => {+ if (open) draftEdits.current += 1;+ setShowCreateModal(open);+ },newSessionName,- setNewSessionName,+ setNewSessionName: edited(setNewSessionName),useProxy,- setUseProxy,+ setUseProxy: edited(setUseProxy),proxyUrl,- setProxyUrl,+ setProxyUrl: edited(setProxyUrl),creating,handleCreate,};