Update frontend/src/lib/components/ArrayTypeNarrowing.svelte

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

backend/.sqlx/query-364248db86a9228bba6ff522e811d68c5c902ee0a07ea69bff772ff10d0dc5aa.json

@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE queue SET flow_status = JSONB_SET(flow_status,  ARRAY['user_states'], JSONB_SET(COALESCE(flow_status->'user_states', '{}'::jsonb), ARRAY[$1], $2))\n        WHERE id = $3 AND workspace_id = $4 AND job_kind IN ('flow', 'flowpreview', 'flownode') RETURNING 1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Jsonb",
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "364248db86a9228bba6ff522e811d68c5c902ee0a07ea69bff772ff10d0dc5aa"
+}

backend/.sqlx/query-84576f6add15108ade2ed3a88185d67db17904859e5f01f1d578af4e1d062a85.json

@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE queue SET running = false, started_at = null\n                WHERE last_ping < now() - ($1 || ' seconds')::interval\n                 AND running = true AND job_kind NOT IN ('flow', 'flowpreview', 'flownode', 'singlescriptflow') AND same_worker = false RETURNING id, workspace_id, last_ping",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "last_ping",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "84576f6add15108ade2ed3a88185d67db17904859e5f01f1d578af4e1d062a85"
+}

backend/.sqlx/query-f6a275ad8bc7dfec7f9a6b60c669f6f2ff93ce57b5afadabd618e1fb52951fef.json

@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n    SELECT usr.email, usage.executions\n        FROM usr\n            , LATERAL (\n            SELECT COALESCE(SUM(duration_ms + 1000)/1000 , 0)::BIGINT executions\n                FROM completed_job\n                WHERE workspace_id = $1\n                AND job_kind NOT IN ('flow', 'flowpreview', 'flownode')\n                AND email = usr.email\n                AND now() - '1 week'::interval < created_at \n            ) usage\n        WHERE workspace_id = $1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "executions",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "f6a275ad8bc7dfec7f9a6b60c669f6f2ff93ce57b5afadabd618e1fb52951fef"
+}

backend/src/monitor.rs

@@ -1497,7 +1497,7 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
         let restarted = sqlx::query!(
                 "UPDATE queue SET running = false, started_at = null
                 WHERE last_ping < now() - ($1 || ' seconds')::interval
-                 AND running = true AND job_kind NOT IN ('flow', 'flowpreview', 'singlescriptflow') AND same_worker = false RETURNING id, workspace_id, last_ping",
+                 AND running = true AND job_kind NOT IN ('flow', 'flowpreview', 'flownode', 'singlescriptflow') AND same_worker = false RETURNING id, workspace_id, last_ping",
                 *ZOMBIE_JOB_TIMEOUT,
             )
             .fetch_all(db)
@@ -1534,7 +1534,7 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
 
     let mut timeout_query =
         "SELECT * FROM queue WHERE last_ping < now() - ($1 || ' seconds')::interval 
-    AND running = true  AND job_kind NOT IN ('flow', 'flowpreview', 'singlescriptflow')"
+    AND running = true  AND job_kind NOT IN ('flow', 'flowpreview', 'flownode', 'singlescriptflow')"
             .to_string();
     if *RESTART_ZOMBIE_JOBS {
         timeout_query.push_str(" AND same_worker = true");
@@ -1618,7 +1618,7 @@ async fn handle_zombie_flows(db: &DB) -> error::Result<()> {
         r#"
         SELECT *
         FROM queue
-        WHERE running = true AND suspend = 0 AND suspend_until IS null AND scheduled_for <= now() AND (job_kind = 'flow' OR job_kind = 'flowpreview')
+        WHERE running = true AND suspend = 0 AND suspend_until IS null AND scheduled_for <= now() AND (job_kind = 'flow' OR job_kind = 'flowpreview' OR job_kind = 'flownode')
             AND last_ping IS NOT NULL AND last_ping < NOW() - ($1 || ' seconds')::interval AND canceled = false
         "#,
     ).bind(FLOW_ZOMBIE_TRANSITION_TIMEOUT.as_str())

backend/windmill-api/src/args.rs

@@ -65,6 +65,7 @@ impl WebhookArgs {
                     let s3_client = build_object_store_client(&s3_resource).await?;
 
                     let mut body = HashMap::new();
+                    let mut files = HashMap::new();
 
                     while let Some(field) = multipart.next_field().await.map_err(|e| {
                         Error::BadRequest(format!(
@@ -107,12 +108,9 @@ impl WebhookArgs {
                                 )
                                 .await?;
 
-                                body.insert(
-                                    name,
-                                    to_raw_value(&serde_json::json!({
-                                        "s3": &file_key
-                                    })),
-                                );
+                                files.entry(name).or_insert(vec![]).push(serde_json::json!({
+                                    "s3": &file_key
+                                }));
                             } else {
                                 body.insert(
                                     name,
@@ -122,6 +120,10 @@ impl WebhookArgs {
                         }
                     }
 
+                    for (k, v) in files {
+                        body.insert(k, to_raw_value(&v));
+                    }
+
                     if self.wrap_body.unwrap_or(false) {
                         self.args
                             .args

backend/windmill-api/src/jobs.rs

@@ -2340,7 +2340,7 @@ pub async fn set_flow_user_state(
     let r = sqlx::query_scalar!(
         r#"
         UPDATE queue SET flow_status = JSONB_SET(flow_status,  ARRAY['user_states'], JSONB_SET(COALESCE(flow_status->'user_states', '{}'::jsonb), ARRAY[$1], $2))
-        WHERE id = $3 AND workspace_id = $4 AND job_kind IN ('flow', 'flowpreview') RETURNING 1
+        WHERE id = $3 AND workspace_id = $4 AND job_kind IN ('flow', 'flowpreview', 'flownode') RETURNING 1
         "#,
         key,
         value,

backend/windmill-api/src/users.rs

@@ -473,7 +473,7 @@ async fn list_user_usage(
             SELECT COALESCE(SUM(duration_ms + 1000)/1000 , 0)::BIGINT executions
                 FROM completed_job
                 WHERE workspace_id = $1
-                AND job_kind NOT IN ('flow', 'flowpreview')
+                AND job_kind NOT IN ('flow', 'flowpreview', 'flownode')
                 AND email = usr.email
                 AND now() - '1 week'::interval < created_at 
             ) usage

frontend/src/lib/components/ArrayTypeNarrowing.svelte

@@ -42,7 +42,7 @@
 	}
 </script>
 
-{#if canEditResourceType}
+{#if (itemsType?.type === 'resource' && canEditResourceType) || itemsType?.type !== 'resource'}
 	<Label label="Items type">
 		<select
 			bind:value={selected}