Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(dashboard): ignore a second Create while a webhook create runs

Yudhi Armyndharis35a9f97962a6
diff --git a/dashboard/src/pages/Webhooks.test.ts b/dashboard/src/pages/Webhooks.test.ts
index f823905d5..2914cdc7c 100644
--- a/dashboard/src/pages/Webhooks.test.ts
+++ b/dashboard/src/pages/Webhooks.test.ts
@@ -9,16 +9,23 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
let webhooksStatus = 200;
let webhookList: unknown[] = [];
+let sessionList: unknown[] = [];
+let createCalls = 0;
function jsonResponse(data: unknown, status = 200): Response {
return new Response(JSON.stringify(data), { status, headers: { 'Content-Type': 'application/json' } });
}
function installFetchStub(): void {
- globalThis.fetch = ((input: RequestInfo | URL): Promise<Response> => {
+ globalThis.fetch = ((input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
const url = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
const path = url.replace(/^https?:\/\/[^/]+/, '');
- if (path === '/api/sessions') return Promise.resolve(jsonResponse([]));
+ if (path === '/api/sessions') return Promise.resolve(jsonResponse(sessionList));
+ if (init?.method === 'POST' && path === '/api/sessions/sess-1/webhooks') {
+ // Never answers: the create stays in flight, like one held up by the gateway's URL check.
+ createCalls++;
+ return new Promise<Response>(() => {});
+ }
if (path === '/api/webhooks') {
if (webhooksStatus === 403) {
return Promise.resolve(jsonResponse({ message: 'Insufficient permissions. Required: operator' }, 403));
@@ -54,6 +61,9 @@ afterEach(() => {
queryClient?.clear();
queryClient = undefined;
webhookList = [];
+ sessionList = [];
+ createCalls = 0;
+ window.sessionStorage.setItem('openwa_user_role', 'viewer');
});
function renderWebhooks(): void {
@@ -131,3 +141,26 @@ test('the filter badge popover names enum values in words, like the filter build
'Sender is [email protected]',
]);
});
+
+test('a second click on Create while the first create is in flight sends nothing', async () => {
+ const { screen, fireEvent, waitFor } = rtl;
+ webhooksStatus = 200;
+ sessionList = [{ id: 'sess-1', name: 'Main', status: 'ready', createdAt: '2026-01-01T00:00:00.000Z' }];
+ window.sessionStorage.setItem('openwa_user_role', 'operator');
+ renderWebhooks();
+
+ fireEvent.click(await screen.findByRole('button', { name: 'Add Webhook' }));
+ const sessionSelect = screen.getByLabelText<HTMLSelectElement>('Session');
+ await rtl.findByText(sessionSelect, 'Main');
+ fireEvent.change(sessionSelect, { target: { value: 'sess-1' } });
+ fireEvent.change(screen.getByLabelText('URL'), { target: { value: 'https://example.test/hook' } });
+
+ const create = screen.getByRole<HTMLButtonElement>('button', { name: 'Create' });
+ fireEvent.click(create);
+ await waitFor(() => assert.equal(createCalls, 1));
+ // A double click lands a moment later, after the pending create has rendered.
+ await new Promise(resolve => setTimeout(resolve, 50));
+ fireEvent.click(create);
+ await new Promise(resolve => setTimeout(resolve, 50));
+ assert.equal(createCalls, 1);
+});
diff --git a/dashboard/src/pages/Webhooks.tsx b/dashboard/src/pages/Webhooks.tsx
index f70ed025c..fad95bdb5 100644
--- a/dashboard/src/pages/Webhooks.tsx
+++ b/dashboard/src/pages/Webhooks.tsx
@@ -122,7 +122,8 @@ export function Webhooks() {
};
const handleCreate = async () => {
- if (!newWebhook.url || !newWebhook.sessionId) return;
+ // The gateway saves every create it receives, so a double click would register the webhook twice.
+ if (createMutation.isPending || !newWebhook.url || !newWebhook.sessionId) return;
try {
await createMutation.mutateAsync({
sessionId: newWebhook.sessionId,
@@ -278,7 +279,7 @@ export function Webhooks() {
<button className="btn-secondary" onClick={() => setShowCreateModal(false)}>
{t('common.cancel')}
</button>
- <button className="btn-primary" onClick={handleCreate}>
+ <button className="btn-primary" onClick={handleCreate} disabled={createMutation.isPending}>
{t('common.create')}
</button>
</>