From cc65bf5f48447cd52547a50a714ece38f5c445f7 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sat, 5 Nov 2022 02:29:32 +0100 Subject: [PATCH] feat(frontend): fill schema and test args from payload --- frontend/package-lock.json | 11 +++ frontend/package.json | 1 + .../lib/components/FlowPreviewContent.svelte | 28 ++++-- .../src/lib/components/SchemaEditor.svelte | 2 +- .../src/lib/components/SchemaViewer.svelte | 9 +- .../src/lib/components/ScriptEditor.svelte | 18 ++-- .../components/common/button/Button.svelte | 3 +- .../components/common/drawer/Drawer.svelte | 2 +- .../flows/content/CapturePayload.svelte | 96 +++++++++++++++++++ .../flows/content/CopyFirstStepSchema.svelte | 15 --- .../components/flows/content/FlowInput.svelte | 33 ++++++- .../lib/components/icons/WindmillIcon.svelte | 11 ++- frontend/src/routes/__layout@root.svelte | 3 +- .../src/routes/oauth/callback_slack.svelte | 3 +- .../login_callback/[client_name]@none.svelte | 3 +- 15 files changed, 192 insertions(+), 46 deletions(-) create mode 100644 frontend/src/lib/components/flows/content/CapturePayload.svelte delete mode 100644 frontend/src/lib/components/flows/content/CopyFirstStepSchema.svelte diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1c56aafc22..a1a1e26750 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@fortawesome/free-brands-svg-icons": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", + "@redocly/json-to-json-schema": "^0.0.1", "async-mutex": "^0.4.0", "fuse.js": "^6.4.6", "highlight.js": "^11.5.1", @@ -403,6 +404,11 @@ "url": "https://opencollective.com/popperjs" } }, + "node_modules/@redocly/json-to-json-schema": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@redocly/json-to-json-schema/-/json-to-json-schema-0.0.1.tgz", + "integrity": "sha512-dSMyuNPN2k+tFeNZ0+QJ7S1zDJ0UeNL+lpnPFR9K5avj2V4uG4m6FdjrApQ9Zi35AIocaDp/KGfBD9gR5MLUbQ==" + }, "node_modules/@rollup/pluginutils": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", @@ -6847,6 +6853,11 @@ "dev": true, "peer": true }, + "@redocly/json-to-json-schema": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@redocly/json-to-json-schema/-/json-to-json-schema-0.0.1.tgz", + "integrity": "sha512-dSMyuNPN2k+tFeNZ0+QJ7S1zDJ0UeNL+lpnPFR9K5avj2V4uG4m6FdjrApQ9Zi35AIocaDp/KGfBD9gR5MLUbQ==" + }, "@rollup/pluginutils": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 3a3b3e5c85..b6c5f2ef36 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -56,6 +56,7 @@ "dependencies": { "@fortawesome/free-brands-svg-icons": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", + "@redocly/json-to-json-schema": "^0.0.1", "async-mutex": "^0.4.0", "fuse.js": "^6.4.6", "highlight.js": "^11.5.1", diff --git a/frontend/src/lib/components/FlowPreviewContent.svelte b/frontend/src/lib/components/FlowPreviewContent.svelte index 574c895ad9..5b820c813b 100644 --- a/frontend/src/lib/components/FlowPreviewContent.svelte +++ b/frontend/src/lib/components/FlowPreviewContent.svelte @@ -12,7 +12,9 @@ import FlowStatusViewer from '../components/FlowStatusViewer.svelte' import FlowProgressBar from './flows/FlowProgressBar.svelte' import { flowStateStore } from './flows/flowState' + import CapturePayload from './flows/content/CapturePayload.svelte' + let capturePayload: CapturePayload export let previewMode: 'upTo' | 'whole' export let open: boolean @@ -89,19 +91,33 @@ } + +
-
-
+
+
-

- Test preview - {previewMode === 'upTo' - ? `up to step ${$selectedId.split('-').join(',')}` - : ' whole flow'} +

+
+ Test preview - {previewMode === 'upTo' + ? `up to step ${$selectedId.split('-').join(',')}` + : ' whole flow'} +
+

{:else} diff --git a/frontend/src/lib/components/common/button/Button.svelte b/frontend/src/lib/components/common/button/Button.svelte index 2bf93e3e3b..9c73a0299d 100644 --- a/frontend/src/lib/components/common/button/Button.svelte +++ b/frontend/src/lib/components/common/button/Button.svelte @@ -61,7 +61,8 @@ 'focus:ring-4 font-semibold', 'rounded-md', 'justify-center items-center text-center whitespace-nowrap inline-flex', - btnClasses + btnClasses, + disabled ? 'bg-gray-200' : '' ), disabled, href, diff --git a/frontend/src/lib/components/common/drawer/Drawer.svelte b/frontend/src/lib/components/common/drawer/Drawer.svelte index 23726352b9..aa56695673 100644 --- a/frontend/src/lib/components/common/drawer/Drawer.svelte +++ b/frontend/src/lib/components/common/drawer/Drawer.svelte @@ -61,7 +61,7 @@ -