From 5fcdf12ef567f1e58580593eef2d81d668ae64ee Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 4 Dec 2023 20:59:51 +0100 Subject: [PATCH] nit webhook panel --- .../details/DetailPageDetailPanel.svelte | 5 +++-- .../components/details/DetailPageLayout.svelte | 5 +++-- .../lib/components/details/WebhooksPanel.svelte | 15 +++++---------- .../(logged)/flows/get/[...path]/+page.svelte | 4 ++++ .../(logged)/scripts/get/[...hash]/+page.svelte | 7 +++++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte index 3d9d80f4de..ee820bacbe 100644 --- a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte +++ b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte @@ -14,7 +14,8 @@ export let isOperator: boolean = false - let selected = 'saved_inputs' + export let selected: string + let rawType: 'json' | 'yaml' = 'yaml' $: if (hasStepDetails) { @@ -27,7 +28,7 @@ - + Saved inputs {#if !isOperator} Details & Triggers diff --git a/frontend/src/lib/components/details/DetailPageLayout.svelte b/frontend/src/lib/components/details/DetailPageLayout.svelte index 65f5066a6c..b93b32ffe4 100644 --- a/frontend/src/lib/components/details/DetailPageLayout.svelte +++ b/frontend/src/lib/components/details/DetailPageLayout.svelte @@ -7,6 +7,7 @@ export let isOperator: boolean = false export let flow_json: any | undefined = undefined export let hasStepDetails: boolean = false + export let selected: string let mobileTab: 'form' | 'detail' = 'form' @@ -23,7 +24,7 @@ - + @@ -46,7 +47,7 @@ - + diff --git a/frontend/src/lib/components/details/WebhooksPanel.svelte b/frontend/src/lib/components/details/WebhooksPanel.svelte index ac5f3684a3..7278b5e2fb 100644 --- a/frontend/src/lib/components/details/WebhooksPanel.svelte +++ b/frontend/src/lib/components/details/WebhooksPanel.svelte @@ -31,6 +31,7 @@ get_path?: string } } + export let token: string export let args: any export let scopes: string[] = [] export let isFlow: boolean = false @@ -44,8 +45,6 @@ requestType = 'hash' } - let token = 'TOKEN_TO_CREATE' - $: url = webhooks[webhookType][requestType] + (tokenType === 'query' @@ -155,12 +154,8 @@ function waitForJobCompletion(UUID) { } function curlCode() { - return `${ - requestType !== 'get_path' - ? `TOKEN='${token}' -BODY='${JSON.stringify(args)}'` - : '' - } + return `TOKEN='${token}' +${requestType !== 'get_path' ? `BODY='${JSON.stringify(args)}'` : ''} URL='${url}' ${webhookType === 'sync' ? 'RESULT' : 'UUID'}=$(curl -s ${ requestType != 'get_path' ? "-H 'Content-Type: application/json'" : '' @@ -214,12 +209,12 @@ done` diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte index 4fd668cf5b..70de5ab883 100644 --- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte @@ -229,6 +229,8 @@ } } let stepDetail: FlowModule | string | undefined = undefined + let token = 'TOKEN_TO_CREATE' + let detailSelected = 'saved_inputs' - + - +