From a9588f4d9486ba43c2e25ee91cdde809a73eaec9 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 2 Jan 2023 19:02:40 +0100 Subject: [PATCH] further public apps improvements --- backend/windmill-api/src/jobs.rs | 2 +- .../src/lib/components/apps/editor/AppEditorHeader.svelte | 5 ++++- .../src/routes/public/[workspace]/[...secret]/+page.svelte | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs index 03adbee7d1..ac8afe9073 100644 --- a/backend/windmill-api/src/jobs.rs +++ b/backend/windmill-api/src/jobs.rs @@ -63,7 +63,6 @@ pub fn workspaced_service() -> Router { .route("/completed/get_result/:id", get(get_completed_job_result)) .route("/completed/delete/:id", post(delete_completed_job)) .route("/flow/resume/:id", post(resume_suspended_flow_as_owner)) - .route("/getupdate/:id", get(get_job_update)) .route( "/job_signature/:job_id/:resume_id", get(create_job_signature), @@ -95,6 +94,7 @@ pub fn global_service() -> Router { get(get_suspended_job_flow), ) .route("/get/:id", get(get_job)) + .route("/getupdate/:id", get(get_job_update)) } async fn get_result_by_id( diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte index b24d8885d9..fb6c8797e9 100644 --- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte @@ -63,7 +63,10 @@ console.log(staticInputs) return [`rawscript/${hex}`, staticInputs] } else if (c.componentInput.runnable?.type == 'runnableByPath') { - return [c.componentInput.runnable.path, staticInputs] + return [ + `${c.componentInput.runnable.runType}/${c.componentInput.runnable.path}`, + staticInputs + ] } } return [] diff --git a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte index 64ee1d6221..4e83d86b53 100644 --- a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte +++ b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte @@ -7,6 +7,7 @@ import { Skeleton } from '$lib/components/common' import { WindmillIcon } from '$lib/components/icons' import { AppService, AppWithLastVersion, GlobalUserInfo, UserService } from '$lib/gen' + import github from 'svelte-highlight/styles/github' import { writable } from 'svelte/store' let app: AppWithLastVersion | undefined = undefined @@ -32,6 +33,10 @@ const breakpoint = writable('lg') + + {@html github} + +