From 71f6bed5d8dc5d5e08305585750d07b652b04db4 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 3 Oct 2022 21:34:52 +0200 Subject: [PATCH] progress --- .../flows/common/FlowCardHeader.svelte | 2 +- .../components/flows/content/FlowLoop.svelte | 5 ++- .../flows/map/FlowModuleSchemaMap.svelte | 4 +- frontend/src/lib/editorUtils.ts | 1 + openflow.openapi.yaml | 42 +++++++++++-------- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/frontend/src/lib/components/flows/common/FlowCardHeader.svelte b/frontend/src/lib/components/flows/common/FlowCardHeader.svelte index c98c812f3f..001ec1df68 100644 --- a/frontend/src/lib/components/flows/common/FlowCardHeader.svelte +++ b/frontend/src/lib/components/flows/common/FlowCardHeader.svelte @@ -38,7 +38,7 @@ {/if} {#if title} - {title} +
{title}
{/if} diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte index afcd5cf2b3..8c7d1becbc 100644 --- a/frontend/src/lib/components/flows/content/FlowLoop.svelte +++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte @@ -25,6 +25,9 @@ +
+ +
{#if $flowStore.value.modules[index].value.type === 'forloopflow'} @@ -52,7 +55,7 @@ />
- Skip failures + Skip failures {index + 1}
-
- For loop +
+ {mod.summary || 'For loop'}
diff --git a/frontend/src/lib/editorUtils.ts b/frontend/src/lib/editorUtils.ts index 2f037f11eb..82b9823154 100644 --- a/frontend/src/lib/editorUtils.ts +++ b/frontend/src/lib/editorUtils.ts @@ -12,6 +12,7 @@ export function editorConfig(model: any, code: string, lang: string, automaticLa //lineNumbers: 'off', //lineDecorationsWidth: 0, lineNumbersMinChars: 4, + scrollbar: { alwaysConsumeMouseWheel: false }, lineNumbers: (ln) => '' + ln + '', folding: false, scrollBeyondLastLine: false, diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml index 663f775420..edb2d5a4b3 100644 --- a/openflow.openapi.yaml +++ b/openflow.openapi.yaml @@ -43,27 +43,31 @@ components: failure_module: $ref: "#/components/schemas/FlowModule" retry: - type: object - properties: - constant: - type: object - properties: - attempts: - type: integer - seconds: - type: integer - exponential: - type: object - properties: - attempts: - type: integer - multiplier: - type: integer - seconds: - type: integer + $ref: "#/components/schemas/Retry" + required: - modules + Retry: + type: object + properties: + constant: + type: object + properties: + attempts: + type: integer + seconds: + type: integer + exponential: + type: object + properties: + attempts: + type: integer + multiplier: + type: integer + seconds: + type: integer + FlowModule: type: object properties: @@ -86,6 +90,8 @@ components: type: string suspend: type: integer + retry: + $ref: "#/components/schemas/Retry" required: - input_transforms - value