From bcd2cfe674038042f08f22d05286596b3442caf9 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 10 Dec 2024 19:37:00 +0100 Subject: [PATCH] fix(frontend): fix newly deployed apps with frontend scripts --- backend/migrations/20241210184049_drop_app_lite.down.sql | 1 + backend/migrations/20241210184049_drop_app_lite.up.sql | 2 ++ backend/windmill-worker/src/worker_lockfiles.rs | 7 +++++++ 3 files changed, 10 insertions(+) create mode 100644 backend/migrations/20241210184049_drop_app_lite.down.sql create mode 100644 backend/migrations/20241210184049_drop_app_lite.up.sql diff --git a/backend/migrations/20241210184049_drop_app_lite.down.sql b/backend/migrations/20241210184049_drop_app_lite.down.sql new file mode 100644 index 0000000000..d2f607c5b8 --- /dev/null +++ b/backend/migrations/20241210184049_drop_app_lite.down.sql @@ -0,0 +1 @@ +-- Add down migration script here diff --git a/backend/migrations/20241210184049_drop_app_lite.up.sql b/backend/migrations/20241210184049_drop_app_lite.up.sql new file mode 100644 index 0000000000..eab39e59de --- /dev/null +++ b/backend/migrations/20241210184049_drop_app_lite.up.sql @@ -0,0 +1,2 @@ +-- Add up migration script here +delete from app_version_lite; \ No newline at end of file diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs index ff1216da65..959757d117 100644 --- a/backend/windmill-worker/src/worker_lockfiles.rs +++ b/backend/windmill-worker/src/worker_lockfiles.rs @@ -1243,6 +1243,13 @@ async fn reduce_app(db: &sqlx::Pool, value: &mut Value, app: i64 match value { Value::Object(object) => { if let Some(Value::Object(script)) = object.get_mut("inlineScript") { + if script + .get("language") + .and_then(|x| x.as_str()) + .is_some_and(|x| x == "frontend") + { + return Ok(()); + } // replace `content` with an empty string: let Some(Value::String(code)) = script.get_mut("content").map(std::mem::take) else {