From 2a0d70dcbc92afd75026986ded08fe17586edb20 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 31 Jul 2022 01:20:52 +0200 Subject: [PATCH] change openflow encoding for more proper oneOf + fix all from svelte:check --- Dockerfile | 1 + backend/openapi.yaml | 5 +- frontend/src/app.d.ts | 8 ++ frontend/src/lib/components/ArgInfo.svelte | 5 -- .../src/lib/components/DisplayResult.svelte | 4 - frontend/src/lib/components/EditorBar.svelte | 5 -- .../src/lib/components/FlowBuilder.svelte | 4 +- .../lib/components/FlowStatusViewer.svelte | 4 +- frontend/src/lib/components/FlowViewer.svelte | 31 ++++---- .../lib/components/InviteGlobalUser.svelte | 4 +- frontend/src/lib/components/InviteUser.svelte | 4 +- frontend/src/lib/components/Modal.svelte | 4 +- frontend/src/lib/components/ModuleStep.svelte | 16 ++-- .../src/lib/components/SchemaModal.svelte | 1 - .../src/lib/components/SchemaViewer.svelte | 5 -- .../src/lib/components/ScriptBuilder.svelte | 3 +- .../src/lib/components/ScriptEditor.svelte | 9 ++- .../src/lib/components/ScriptPicker.svelte | 10 +-- .../src/lib/components/ScriptSchema.svelte | 5 -- frontend/src/lib/components/ShareModal.svelte | 2 +- .../lib/components/flows/FlowInputs.svelte | 6 +- .../components/flows/FlowModuleHeader.svelte | 28 +++---- .../src/lib/components/flows/flowStore.ts | 39 ++++++---- frontend/src/lib/components/flows/utils.ts | 22 +++--- frontend/src/lib/infer.ts | 1 - frontend/src/lib/utils.ts | 10 +-- frontend/src/routes/__layout-root@none.svelte | 5 ++ frontend/src/routes/__layout@root.svelte | 3 +- frontend/src/routes/audit_logs.svelte | 2 +- frontend/src/routes/flows.svelte | 2 +- .../src/routes/flows/edit/[...path].svelte | 2 +- frontend/src/routes/groups.svelte | 4 +- .../src/routes/oauth/callback_slack.svelte | 5 +- frontend/src/routes/resources.svelte | 9 +-- frontend/src/routes/run/[...run].svelte | 22 +----- frontend/src/routes/runs/[...path].svelte | 13 +--- frontend/src/routes/scripts.svelte | 7 +- .../src/routes/scripts/get/[...hash].svelte | 10 +-- .../src/routes/user/accept_invite@user.svelte | 4 +- .../routes/user/create_workspace@user.svelte | 4 +- frontend/src/routes/user/login@user.svelte | 4 +- .../login_callback/[client_name]@none.svelte | 2 +- frontend/src/routes/workspace_settings.svelte | 8 +- openflow.openapi.yaml | 76 ++++++++++++++++--- python-client/build.sh | 6 +- 45 files changed, 219 insertions(+), 205 deletions(-) diff --git a/Dockerfile b/Dockerfile index d645d457fa..6cce869779 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ RUN mkdir /backend COPY /backend/openapi.yaml /backend/openapi.yaml COPY /openflow.openapi.yaml /openflow.openapi.yaml RUN npm run generate-backend-client +RUN npm run check RUN npm run build FROM rust:slim-buster as builder diff --git a/backend/openapi.yaml b/backend/openapi.yaml index b12fd95b05..015c857aad 100644 --- a/backend/openapi.yaml +++ b/backend/openapi.yaml @@ -3423,7 +3423,7 @@ components: type: array items: type: string - job_duration_ms: + usage: $ref: "#/components/schemas/Usage" required: - email @@ -4050,6 +4050,3 @@ components: required: - access_token - - expires_in - - refresh_token - - scope diff --git a/frontend/src/app.d.ts b/frontend/src/app.d.ts index 02f477e4dc..f9e6238d88 100644 --- a/frontend/src/app.d.ts +++ b/frontend/src/app.d.ts @@ -7,3 +7,11 @@ declare namespace App { title: string? } } + +declare var __pkg__: { version: string } + +declare module 'svelte-highlight/languages/json' +declare module 'svelte-highlight/languages/python' +declare module 'svelte-highlight/languages/typescript' +declare module 'svelte-highlight/styles/github' +declare module 'svelte-split-pane' diff --git a/frontend/src/lib/components/ArgInfo.svelte b/frontend/src/lib/components/ArgInfo.svelte index 49479cb22c..c806eaa09a 100644 --- a/frontend/src/lib/components/ArgInfo.svelte +++ b/frontend/src/lib/components/ArgInfo.svelte @@ -3,7 +3,6 @@ import Modal from './Modal.svelte' import Tooltip from './Tooltip.svelte' import json from 'svelte-highlight/languages/json' - import github from 'svelte-highlight/styles/github' import { Highlight } from 'svelte-highlight' import { ResourceService, type Resource } from '$lib/gen' import { workspaceStore } from '$lib/stores' @@ -23,10 +22,6 @@ let asJson: string = JSON.stringify(value, null, 4) - - {@html github} - -
{resource.path}
diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte index 9725584543..7bb1d09126 100644 --- a/frontend/src/lib/components/DisplayResult.svelte +++ b/frontend/src/lib/components/DisplayResult.svelte @@ -1,6 +1,5 @@ - - {@html github} - {#if result} {#if Object.keys(result).length > 0}
The result keys are: {Object.keys(result).join(', ')} diff --git a/frontend/src/lib/components/EditorBar.svelte b/frontend/src/lib/components/EditorBar.svelte index 6cade9d6db..2ffc35437e 100644 --- a/frontend/src/lib/components/EditorBar.svelte +++ b/frontend/src/lib/components/EditorBar.svelte @@ -11,7 +11,6 @@ import ResourceEditor from './ResourceEditor.svelte' import { Highlight } from 'svelte-highlight' import { python, typescript } from 'svelte-highlight/languages' - import github from 'svelte-highlight/styles/github' import Modal from './Modal.svelte' import type Editor from './Editor.svelte' @@ -55,10 +54,6 @@ } - - {@html github} - - { diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte index 233a3b2f1b..79a54144f6 100644 --- a/frontend/src/lib/components/FlowBuilder.svelte +++ b/frontend/src/lib/components/FlowBuilder.svelte @@ -1,8 +1,8 @@ - - {@html github} - + function toAny(x: unknown): any { + return x as any + } + {#if !embedded} {v.default != undefined ? 'default: ' + JSON.stringify(v.default) : ''}{toAny(v)?.default != undefined + ? 'default: ' + JSON.stringify(toAny(v)?.default) + : ''} {/each} @@ -98,13 +99,13 @@

- {#if mod?.value?.type == FlowModuleValue.type.SCRIPT} + {#if mod?.value?.type == 'script'} Script at path {mod?.value?.path} - {:else if mod?.value?.type == FlowModuleValue.type.RAWSCRIPT} + {:else if mod?.value?.type == 'rawscript'}

{/if} - {:else if mod?.value?.type == FlowModuleValue.type.FLOW} + {:else if mod?.value?.type == 'flow'} Flow at path {mod?.value?.path} - {:else if mod?.value?.type == FlowModuleValue.type.FORLOOPFLOW} + {:else if mod?.value?.type == 'forloopflow'} For loop over step {i}'s result': {/if} diff --git a/frontend/src/lib/components/InviteGlobalUser.svelte b/frontend/src/lib/components/InviteGlobalUser.svelte index c01fd2698b..f114153a27 100644 --- a/frontend/src/lib/components/InviteGlobalUser.svelte +++ b/frontend/src/lib/components/InviteGlobalUser.svelte @@ -23,8 +23,8 @@ let company: string | undefined function handleKeyUp(event: KeyboardEvent) { - const key = event.key || event.keyCode - if (key === 13 || key === 'Enter') { + const key = event.key + if (key === 'Enter') { event.preventDefault() addUser() } diff --git a/frontend/src/lib/components/InviteUser.svelte b/frontend/src/lib/components/InviteUser.svelte index 85f4697695..f013ef7bd2 100644 --- a/frontend/src/lib/components/InviteUser.svelte +++ b/frontend/src/lib/components/InviteUser.svelte @@ -21,8 +21,8 @@ let is_admin = false function handleKeyUp(event: KeyboardEvent) { - const key = event.key || event.keyCode - if (key === 13 || key === 'Enter') { + const key = event.key + if (key === 'Enter') { event.preventDefault() inviteUser() } diff --git a/frontend/src/lib/components/Modal.svelte b/frontend/src/lib/components/Modal.svelte index 453f5b1235..cb3ce7c57d 100644 --- a/frontend/src/lib/components/Modal.svelte +++ b/frontend/src/lib/components/Modal.svelte @@ -20,8 +20,8 @@ } function handleKeyUp(event: KeyboardEvent): void { - const key = event.key || event.keyCode - if (key === 27 || key === 'Escape' || key === 'Esc') { + const key = event.key + if (key === 'Escape' || key === 'Esc') { if (open) { event.preventDefault() closeModal() diff --git a/frontend/src/lib/components/ModuleStep.svelte b/frontend/src/lib/components/ModuleStep.svelte index df2fa822dc..95537a6f3e 100644 --- a/frontend/src/lib/components/ModuleStep.svelte +++ b/frontend/src/lib/components/ModuleStep.svelte @@ -1,8 +1,8 @@ - - {@html github} - -