Merge branch 'main' into hc/fix-invite-add-conflict-and-deprecate-invites

Author: HugoCasa

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.315.1](https://github.com/windmill-labs/windmill/compare/v1.315.0...v1.315.1) (2024-04-24)
+
+
+### Bug Fixes
+
+* fix label from completed_job ([534f877](https://github.com/windmill-labs/windmill/commit/534f877a7a9983b1808ce10b7f8fcac1547d7634))
+
+## [1.315.0](https://github.com/windmill-labs/windmill/compare/v1.314.0...v1.315.0) (2024-04-24)
+
+
+### Features
+
+* **frontend:** Aggrid infinite ([#3592](https://github.com/windmill-labs/windmill/issues/3592)) ([7a8ffbe](https://github.com/windmill-labs/windmill/commit/7a8ffbea46e81bfd031e4e064bb96ce41b3a77b3))
+
 ## [1.314.0](https://github.com/windmill-labs/windmill/compare/v1.313.0...v1.314.0) (2024-04-23)
 
 

backend/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.314.0"
+version = "1.315.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -24,7 +24,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.314.0"
+version = "1.315.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 

backend/Cargo.toml

@@ -1026,7 +1026,7 @@ async fn listen_for_uuid_on(
 
 async fn completed_job(uuid: Uuid, db: &Pool<Postgres>) -> CompletedJob {
 
-    sqlx::query_as::<_, CompletedJob>("SELECT * FROM completed_job  WHERE id = $1").bind(uuid)
+    sqlx::query_as::<_, CompletedJob>("SELECT *, result->>'wm_label' as label FROM completed_job  WHERE id = $1").bind(uuid)
         .fetch_one(db)
         .await
         .unwrap()

backend/tests/worker.rs

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.314.0
+  version: 1.315.1
   title: Windmill API
 
   contact:

backend/windmill-api/openapi.yaml

@@ -2298,7 +2298,7 @@ pub async fn restart_flow(
     check_license_key_valid().await?;
 
     let completed_job = sqlx::query_as::<_, CompletedJob>(
-        "SELECT * from completed_job WHERE id = $1 and workspace_id = $2",
+        "SELECT *, result->>'wm_label' as label from completed_job WHERE id = $1 and workspace_id = $2",
     )
     .bind(job_id)
     .bind(&w_id)

backend/windmill-api/src/jobs.rs

@@ -2076,7 +2076,7 @@ async fn get_result_by_id_from_original_flow(
     json_path: Option<String>,
 ) -> error::Result<Box<RawValue>> {
     let flow_job = sqlx::query_as::<_, CompletedJob>(
-        "SELECT * FROM completed_job WHERE id = $1 AND workspace_id = $2",
+        "SELECT *, null as label FROM completed_job WHERE id = $1 AND workspace_id = $2",
     )
     .bind(completed_flow_id)
     .bind(w_id)
@@ -3469,7 +3469,7 @@ async fn restarted_flows_resolution(
     Error,
 > {
     let completed_job = sqlx::query_as::<_, CompletedJob>(
-        "SELECT * FROM completed_job WHERE id = $1 and workspace_id = $2",
+        "SELECT *, null as label FROM completed_job WHERE id = $1 and workspace_id = $2",
     )
     .bind(completed_flow_id)
     .bind(workspace_id)

backend/windmill-queue/src/jobs.rs

@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.314.0";
+export const VERSION = "v1.315.1";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({

benchmarks/lib.ts

@@ -31,7 +31,7 @@ addEventListener("error", (event) => {
   }
 });
 
-export const VERSION = "v1.314.0";
+export const VERSION = "v1.315.1";
 
 let command: any = new Command()
   .name("wmill")

cli/main.ts

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.314.0",
+	"version": "1.315.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",

frontend/package-lock.json

@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.314.0"
-wmill_pg = ">=1.314.0"
+wmill = ">=1.315.1"
+wmill_pg = ">=1.315.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"

frontend/package.json

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.314.0
+  version: 1.315.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel

lsp/Pipfile

@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.314.0'
+ModuleVersion = '1.315.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

openflow.openapi.yaml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.314.0"
+version = "1.315.1"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"

powershell-client/WindmillClient/WindmillClient.psd1

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.314.0"
+version = "1.315.1"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"

python-client/wmill/pyproject.toml

@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.314.0",
+  "version": "1.315.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {

python-client/wmill_pg/pyproject.toml

@@ -1 +1 @@
-1.314.0
+1.315.1