From 0069e51e55a141fe732b29e7d1ef8889fb9e4059 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Wed, 6 Dec 2023 16:39:26 +0530 Subject: [PATCH] fix: Default name, let it be Webhook-1 Webhook-2 and such --- packages/nc-gui/components/webhook/Editor.vue | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue index 65628703e0..b72d0aace1 100644 --- a/packages/nc-gui/components/webhook/Editor.vue +++ b/packages/nc-gui/components/webhook/Editor.vue @@ -49,11 +49,13 @@ const titleDomRef = ref() const useForm = Form.useForm +const defaultWebhookName = 'Webhook' + let hookRef = reactive< Omit & { notification: Record; eventOperation?: string; condition: boolean } >({ id: '', - title: 'Untitled Webhook', + title: defaultWebhookName, event: undefined, operation: undefined, eventOperation: undefined, @@ -472,6 +474,30 @@ async function testWebhook() { await webhookTestRef.value.testWebhook() } +function getDefaultTokenValue(hooks: HookType[]) { + let extractedSortedTokenNumbers = + [...hooks] + .map((hook) => { + let hookName = hook.title?.split('-') + if (hookName && hookName[hookName.length - 1] && !isNaN(Number(hookName[hookName.length - 1]?.trim()))) { + return Number(hookName[hookName.length - 1]?.trim()) + } + }) + .filter((e) => e) + .sort((a, b) => { + if (a !== undefined && b !== undefined) { + return a - b + } + return 0 + }) || [] + + if (extractedSortedTokenNumbers.length) { + return `${defaultWebhookName}-${(extractedSortedTokenNumbers[extractedSortedTokenNumbers.length - 1] || 0) + 1}` + } else { + return `${defaultWebhookName}-1` + } +} + watch( () => hookRef.eventOperation, () => { @@ -499,7 +525,10 @@ onMounted(async () => { if (hookRef.event && hookRef.operation) { hookRef.eventOperation = `${hookRef.event} ${hookRef.operation}` + } else { + hookRef.eventOperation = eventList.value[0].value.join(' ') } + hookRef.title = getDefaultTokenValue(hooks.value) onNotificationTypeChange()