s0

backend/migrations/20241223155748_raw_apps_v2.down.sql

@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE app_version DROP COLUMN IF EXISTS raw_app;

backend/migrations/20241223155748_raw_apps_v2.up.sql

@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE app_version ADD COLUMN IF NOT EXISTS raw_app BOOLEAN NOT NULL DEFAULT FALSE;

backend/parsers/windmill-parser-ts/src/lib.rs

@@ -49,8 +49,12 @@ impl Visit for ImportsFinder {
 pub fn parse_expr_for_imports(code: &str) -> anyhow::Result<Vec<String>> {
     let cm: Lrc<SourceMap> = Default::default();
     let fm = cm.new_source_file(FileName::Custom("main.d.ts".into()).into(), code.into());
+    let mut tss = TsSyntax::default();
+    tss.disallow_ambiguous_jsx_like;
+    tss.tsx = true;
+    tss.no_early_errors = true;
     let lexer = Lexer::new(
-        Syntax::Typescript(TsSyntax::default()),
+        Syntax::Typescript(tss),
         // EsVersion defaults to es5
         Default::default(),
         StringInput::from(&*fm),

backend/windmill-api/openapi.yaml

@@ -5422,6 +5422,8 @@ paths:
                   type: string
                 custom_path:
                   type: string
+                raw_app:
+                  type: boolean
               required:
                 - path
                 - value
@@ -5766,6 +5768,8 @@ paths:
                   type: string
                 custom_path:
                   type: string
+                raw_app:
+                  type: boolean
       responses:
         "200":
           description: app updated
@@ -12914,6 +12918,8 @@ components:
         execution_mode:
           type: string
           enum: [viewer, publisher, anonymous]
+        raw_app:
+          type: boolean
       required:
         - id
         - workspace_id

backend/windmill-api/src/apps.rs

@@ -26,8 +26,9 @@ use crate::{
     users::fetch_api_authed_from_permissioned_as,
 };
 use axum::{
+    body::Body,
     extract::{Extension, Json, Path, Query},
-    response::IntoResponse,
+    response::{IntoResponse, Response},
     routing::{delete, get, post},
     Router,
 };
@@ -78,6 +79,7 @@ pub fn workspaced_service() -> Router {
         .route("/get/draft/*path", get(get_app_w_draft))
         .route("/secret_of/*path", get(get_secret_id))
         .route("/get/v/*id", get(get_app_by_id))
+        .route("/get_data/v/*id", get(get_raw_app_data))
         .route("/exists/*path", get(exists_app))
         .route("/update/*path", post(update_app))
         .route("/delete/*path", delete(delete_app))
@@ -118,6 +120,12 @@ pub struct ListableApp {
     #[sqlx(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub deployment_msg: Option<String>,
+    #[serde(skip_serializing_if = "is_false")]
+    pub raw_app: bool,
+}
+
+fn is_false(b: &bool) -> bool {
+    !b
 }
 
 #[derive(FromRow, Serialize, Deserialize)]
@@ -240,6 +248,7 @@ pub struct CreateApp {
     pub draft_only: Option<bool>,
     pub deployment_message: Option<String>,
     pub custom_path: Option<String>,
+    pub raw_app: Option<bool>,
 }
 
 #[derive(Deserialize)]
@@ -250,6 +259,7 @@ pub struct EditApp {
     pub policy: Option<Policy>,
     pub deployment_message: Option<String>,
     pub custom_path: Option<String>,
+    pub raw_app: Option<bool>,
 }
 
 #[derive(Serialize, FromRow)]
@@ -303,7 +313,8 @@ async fn list_apps(
             "app.extra_perms",
             "favorite.path IS NOT NULL as starred",
             "draft.path IS NOT NULL as has_draft",
-            "draft_only"
+            "draft_only",
+            "app_version.raw_app",
         ])
         .left()
         .join("favorite")
@@ -362,6 +373,44 @@ async fn list_apps(
     Ok(Json(rows))
 }
 
+async fn get_raw_app_data(Path((w_id, version_id)): Path<(String, String)>) -> Result<Response> {
+    let file_path = format!("/home/rfiszel/wmill/{}/{}", w_id, version_id);
+    let file = tokio::fs::File::open(file_path).await?;
+    let stream = tokio_util::io::ReaderStream::new(file);
+    let res = Response::builder().header(
+        http::header::CONTENT_TYPE,
+        if version_id.ends_with(".css") {
+            "text/css"
+        } else {
+            "text/javascript"
+        },
+    );
+    Ok(res.body(Body::from_stream(stream)).unwrap())
+}
+
+// async fn get_app_version(
+//     authed: ApiAuthed,
+//     Extension(user_db): Extension<UserDB>,
+//     Path((w_id, path)): Path<(String, StripPath)>,
+// ) -> JsonResult<i64> {
+//     let path = path.to_path();
+//     let mut tx = user_db.begin(&authed).await?;
+
+//     let version_o = sqlx::query_scalar!(
+//         "SELECT app.versions[array_upper(app.versions, 1)] as version FROM app
+//             WHERE app.path = $1 AND app.workspace_id = $2",
+//         path,
+//         &w_id,
+//     )
+//     .fetch_optional(&mut *tx)
+//     .await?
+//     .flatten();
+//     tx.commit().await?;
+
+//     let version = not_found_if_none(version_o, "App", path)?;
+//     Ok(Json(version))
+// }
+
 async fn get_app(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -780,12 +829,13 @@ async fn create_app(
 
     let v_id = sqlx::query_scalar!(
         "INSERT INTO app_version
-            (app_id, value, created_by)
-            VALUES ($1, $2::text::json, $3) RETURNING id",
+            (app_id, value, created_by, raw_app)
+            VALUES ($1, $2::text::json, $3, $4) RETURNING id",
         id,
         //to preserve key orders
         serde_json::to_string(&app.value).unwrap(),
         authed.username,
+        app.raw_app.unwrap_or(false)
     )
     .fetch_one(&mut *tx)
     .await?;
@@ -1069,12 +1119,13 @@ async fn update_app(
 
         let v_id = sqlx::query_scalar!(
             "INSERT INTO app_version
-                (app_id, value, created_by)
-                VALUES ($1, $2::text::json, $3) RETURNING id",
+                (app_id, value, created_by, raw_app)
+                VALUES ($1, $2::text::json, $3, $4) RETURNING id",
             app_id,
             //to preserve key orders
             serde_json::to_string(&nvalue).unwrap(),
             authed.username,
+            ns.raw_app.unwrap_or(false)
         )
         .fetch_one(&mut *tx)
         .await?;
@@ -1197,7 +1248,7 @@ fn digest(code: &str) -> String {
     format!("rawscript/{:x}", result)
 }
 
-async fn get_on_behalf_details_from_policy_and_authed(
+fn get_on_behalf_details_from_policy_and_authed(
     policy: &Policy,
     opt_authed: &Option<ApiAuthed>,
 ) -> Result<(String, String, String)> {
@@ -1375,7 +1426,7 @@ async fn execute_component(
     };
 
     let (username, permissioned_as, email) =
-        get_on_behalf_details_from_policy_and_authed(&policy, &opt_authed).await?;
+        get_on_behalf_details_from_policy_and_authed(&policy, &opt_authed)?;
 
     let (args, job_id) = build_args(
         policy,
@@ -1501,7 +1552,7 @@ async fn upload_s3_file_from_app(
         let s3_inputs = policy.s3_inputs.as_ref().unwrap();
 
         let (username, permissioned_as, email) =
-            get_on_behalf_details_from_policy_and_authed(&policy, &opt_authed).await?;
+            get_on_behalf_details_from_policy_and_authed(&policy, &opt_authed)?;
 
         let on_behalf_authed = fetch_api_authed_from_permissioned_as(
             permissioned_as,

backend/windmill-api/src/lib.rs

@@ -93,6 +93,7 @@ mod scim_ee;
 mod scripts;
 mod service_logs;
 mod settings;
+mod slack_approvals;
 #[cfg(feature = "smtp")]
 mod smtp_server_ee;
 mod static_assets;
@@ -109,7 +110,6 @@ mod websocket_triggers;
 mod workers;
 mod workspaces;
 mod workspaces_ee;
-mod slack_approvals;
 mod workspaces_export;
 mod workspaces_extra;
 
@@ -417,7 +417,10 @@ pub async fn run_server(
                     jobs::workspace_unauthed_service().layer(cors.clone()),
                 )
                 .route("/slack", post(slack_approvals::slack_app_callback_handler))
-                .route("/w/:workspace_id/jobs/slack_approval/:job_id", get(slack_approvals::request_slack_approval))
+                .route(
+                    "/w/:workspace_id/jobs/slack_approval/:job_id",
+                    get(slack_approvals::request_slack_approval),
+                )
                 .nest(
                     "/w/:workspace_id/resources_u",
                     resources::public_service().layer(cors.clone()),

backend/windmill-api/src/workspaces_export.rs

@@ -475,7 +475,7 @@ pub(crate) async fn tarball_workspace(
             "SELECT app.id, app.path, app.summary, app.versions, app.policy, app.custom_path,
             app.extra_perms, app_version.value, 
             app_version.created_at, app_version.created_by from app, app_version 
-            WHERE app.workspace_id = $1 AND app_version.id = app.versions[array_upper(app.versions, 1)]",
+            WHERE app.workspace_id = $1 AND app_version.id = app.versions[array_upper(app.versions, 1)] AND app_version.raw_app IS false",
         )
         .bind(&w_id)
         .fetch_all(&mut *tx)

backend/windmill-common/src/apps.rs

@@ -6,6 +6,8 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+use std::collections::HashMap;
+
 use serde::{Deserialize, Serialize};
 
 /// Id in the `app_script` table.
@@ -21,3 +23,8 @@ pub struct ListAppQuery {
     pub include_draft_only: Option<bool>,
     pub with_deployment_msg: Option<bool>,
 }
+
+#[derive(Deserialize)]
+pub struct RawAppValue {
+    pub files: HashMap<String, String>,
+}

backend/windmill-common/src/s3_helpers.rs

@@ -474,3 +474,7 @@ impl CredentialProvider for AwsCredentialAdapter {
 pub fn bundle(w_id: &str, hash: &str) -> String {
     format!("script_bundle/{}/{}", w_id, hash)
 }
+
+pub fn raw_app(w_id: &str, version: &i64) -> String {
+    format!("/home/rfiszel/raw_app/{}/{}", w_id, version)
+}

backend/windmill-queue/src/jobs.rs

@@ -3465,6 +3465,7 @@ pub async fn push<'c, 'd>(
             } else if job_kind == JobKind::Dependencies
                 || job_kind == JobKind::FlowDependencies
                 || job_kind == JobKind::DeploymentCallback
+                || job_kind == JobKind::AppDependencies
             {
                 // using the dependency tag for deployment callback for now. We can create a separate tag when we need
                 "dependency".to_string()