windmill-components 1.558.4 → 1.596.0

package/package/components/triggers/http/RouteBodyTransformerOption.svelte

@@ -4,7 +4,7 @@ import Tooltip from '../../Tooltip.svelte';
 let { raw_string = $bindable(), wrap_body = $bindable(), disabled = false, testingBadge = undefined } = $props();
 </script>
 
-<Label label="Raw body" class="w-full">
+<Label label="Raw body" for="raw-body-toggle" class="w-full">
 	{#snippet header()}
 		<Tooltip
 			documentationLink="https://www.windmill.dev/docs/core_concepts/http_routing#body-processing-options"
@@ -24,10 +24,11 @@ let { raw_string = $bindable(), wrap_body = $bindable(), disabled = false, testi
 				raw_string = !raw_string
 			}}
 			{disabled}
+			id="raw-body-toggle"
 		/>
 	{/snippet}
 </Label>
-<Label label="Wrap body" class="w-full">
+<Label label="Wrap body" for="wrap-body-toggle" class="w-full">
 	{#snippet header()}
 		<Tooltip
 			documentationLink="https://www.windmill.dev/docs/core_concepts/http_routing#body-processing-options"
@@ -46,6 +47,7 @@ let { raw_string = $bindable(), wrap_body = $bindable(), disabled = false, testi
 				wrap_body = !wrap_body
 			}}
 			{disabled}
+			id="wrap-body-toggle"
 		/>
 	{/snippet}
 </Label>

package/package/components/triggers/http/RouteCapture.svelte.d.ts

@@ -35,7 +35,9 @@ declare const RouteCapture: $$__sveltets_2_IsomorphicComponent<Props, {
         redirect: boolean;
         args?: boolean;
     }>;
-    addPreprocessor: CustomEvent<null>;
+    addPreprocessor: CustomEvent<{
+        args: Record<string, any>;
+    } | null>;
     testWithArgs: CustomEvent<Record<string, any>>;
 } & {
     [evt: string]: CustomEvent<any>;

package/package/components/triggers/http/RouteEditorConfigSection.svelte

@@ -11,6 +11,7 @@ import { isCloudHosted } from '../../../cloud';
 import Toggle from '../../Toggle.svelte';
 import TestingBadge from '../testingBadge.svelte';
 import { untrack } from 'svelte';
+import TextInput from '../../text_input/TextInput.svelte';
 let { initialTriggerPath = undefined, dirtyRoutePath = $bindable(false), route_path = $bindable(), http_method = $bindable(), can_write = false, static_asset_config = $bindable(undefined), headless = false, workspaced_route = $bindable(false), isValid = $bindable(false), isDraftOnly = true, showTestingBadge = false } = $props();
 let validateTimeout = undefined;
 let routeError = $state('');
@@ -19,7 +20,9 @@ async function validateRoute(routePath, method, workspaced_route) {
         clearTimeout(validateTimeout);
     }
     validateTimeout = setTimeout(async () => {
-        if (!routePath || !method || !/^:?[-\w]+(\/:?[-\w]+)*$/.test(routePath)) {
+        if (!routePath ||
+            !method ||
+            !/^(\*[-\w]+$|:?[-\w]+)(\/(\*[-\w]+$|:?[-\w]+))*$/.test(routePath)) {
             routeError = 'Endpoint not valid';
         }
         else if (await routeExists(routePath, method, workspaced_route)) {
@@ -76,29 +79,32 @@ let userCanEditConfig = $derived(userIsAdmin || isDraftOnly); // User can edit c
 			</Alert>
 			<div class="my-2"></div>
 		{/if}
-		<div class="flex flex-col w-full gap-4">
+		<div class="flex flex-col w-full gap-6">
 			<label class="block grow w-full">
 				<div class="flex flex-col gap-1">
-					<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
+					<div
+						class="text-emphasis text-xs font-semibold flex items-center gap-1 w-full justify-between"
+					>
 						<div>
 							Path
 							<Required required={true} />
 						</div>
-						<div class="text-2xs text-tertiary"> ':myparam' for path params </div>
 					</div>
 					<!-- svelte-ignore a11y_autofocus -->
-					<input
-						type="text"
-						autocomplete="off"
-						bind:value={route_path}
-						disabled={!userCanEditConfig || !can_write}
-						class={routeError === ''
-							? ''
-							: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
-						oninput={() => {
-							dirtyRoutePath = true
+					<TextInput
+						inputProps={{
+							autocomplete: 'off',
+							disabled: !userCanEditConfig || !can_write,
+							oninput: () => {
+								dirtyRoutePath = true
+							}
 						}}
+						bind:value={route_path}
+						error={routeError !== ''}
 					/>
+					<div class="text-2xs text-secondary">
+						Use ':myparam' for path params and '*mywildcard' for wildcards
+					</div>
 				</div>
 			</label>
 
@@ -115,31 +121,28 @@ let userCanEditConfig = $derived(userIsAdmin || isDraftOnly); // User can edit c
 					<ToggleButton label="DELETE" value="delete" {item} {disabled} />
 				{/snippet}
 			</ToggleButtonGroup>
-			<div class="flex flex-col w-full">
+			<div class="flex flex-col w-full gap-1">
 				<Url url={fullRoute} label="Production URL" />
 
-				<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5"
-					>{dirtyRoutePath ? routeError : ''}</div
+				<div class="text-red-600 dark:text-red-400 text-2xs">{dirtyRoutePath ? routeError : ''}</div
 				>
 				{#if !isCloudHosted()}
-					<div class="mt-1">
-						<Toggle
-							size="sm"
-							checked={workspaced_route}
-							disabled={!can_write || !userCanEditConfig}
-							on:change={() => {
-								workspaced_route = !workspaced_route
-								dirtyRoutePath = true
-							}}
-							options={{
-								right: 'Prefix with workspace',
-								rightTooltip:
-									'Prefixes the route with the workspace ID (e.g., {base_url}/api/r/{workspace_id}/{route}). Note: deploying the HTTP trigger to another workspace updates the route workspace prefix accordingly.',
-								rightDocumentationLink:
-									'https://www.windmill.dev/docs/core_concepts/http_routing#workspace-prefix'
-							}}
-						/>
-					</div>
+					<Toggle
+						size="sm"
+						checked={workspaced_route}
+						disabled={!can_write || !userCanEditConfig}
+						on:change={() => {
+							workspaced_route = !workspaced_route
+							dirtyRoutePath = true
+						}}
+						options={{
+							right: 'Prefix with workspace',
+							rightTooltip:
+								'Prefixes the route with the workspace ID (e.g., {base_url}/api/r/{workspace_id}/{route}). Note: deploying the HTTP trigger to another workspace updates the route workspace prefix accordingly.',
+							rightDocumentationLink:
+								'https://www.windmill.dev/docs/core_concepts/http_routing#workspace-prefix'
+						}}
+					/>
 				{/if}
 			</div>
 		</div>