From 7b418b64f1ed693df6cd85fe3ee1e41ef13e8e45 Mon Sep 17 00:00:00 2001 From: nicosammito Date: Sun, 9 Aug 2026 13:42:43 +0200 Subject: [PATCH 1/4] feat: update dependencies for @code0-tech/pictor and @code0-tech/triangulum --- package-lock.json | 90 +++++++++++++++++++++++++++++++++++++++-------- package.json | 4 +-- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 057b2cc0..ad30986f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.0", "dependencies": { "@apollo/client": "^4.0.9", - "@code0-tech/pictor": "^0.14.0", - "@code0-tech/triangulum": "^0.29.0", + "@code0-tech/pictor": "^0.15.0", + "@code0-tech/triangulum": "^0.30.0", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lint": "^6.9.5", "@icons-pack/react-simple-icons": "^13.13.0", @@ -1900,9 +1900,9 @@ } }, "node_modules/@code0-tech/pictor": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@code0-tech/pictor/-/pictor-0.14.0.tgz", - "integrity": "sha512-Io16vkTpDJtkJelWKKxyu6DxiCId5JtUTh38zuHEGukxCmBNJox9E4vIDEG8HyARASR0+QwMoXXdZbPE03r5Bg==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@code0-tech/pictor/-/pictor-0.15.0.tgz", + "integrity": "sha512-OBsB1CMWxfI49aZeZHB66R1PXeXIHLwa+uUYMro2EUx09AnajNq6JQiloANF9FpgcX7/zOuRawRqMr1Jw/lveg==", "peerDependencies": { "@ark-ui/react": "^5.36.2", "@codemirror/autocomplete": "^6.20.0", @@ -1912,6 +1912,7 @@ "@codemirror/state": "^6.5.4", "@codemirror/view": "^6.39.13", "@icons-pack/react-simple-icons": "^13.13.0", + "@internationalized/date": "^3.12.0", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-context-menu": "^2.2.16", "@radix-ui/react-dialog": "^1.1.15", @@ -1946,19 +1947,20 @@ } }, "node_modules/@code0-tech/sagittarius-graphql-types": { - "version": "0.0.0-experimental-2722865546-50e0e86411a3ab53d9fdd8be7ec7af5c3ab43f8a", - "resolved": "https://registry.npmjs.org/@code0-tech/sagittarius-graphql-types/-/sagittarius-graphql-types-0.0.0-experimental-2722865546-50e0e86411a3ab53d9fdd8be7ec7af5c3ab43f8a.tgz", - "integrity": "sha512-SDNAiVutMgc36fFD5o4mV0GtR3EpLscwystL9SkT+XatMBHHbmwnZu/Kc9vo9EE/ZCHUGkw6XqTZjGNf+S4wNw==", + "version": "0.0.0-experimental-2744343400-55133b9bb6062772c50f83d945a22a531a6e48e2", + "resolved": "https://registry.npmjs.org/@code0-tech/sagittarius-graphql-types/-/sagittarius-graphql-types-0.0.0-experimental-2744343400-55133b9bb6062772c50f83d945a22a531a6e48e2.tgz", + "integrity": "sha512-Dg25HtCsSEhtQ40IccId73JpneIKZqGBLMA8pM3gLF5MZd5Z1wL+yNs/JH32BO22zZRokEBdKLgf7vgpGNK1/Q==", "peer": true }, "node_modules/@code0-tech/triangulum": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@code0-tech/triangulum/-/triangulum-0.29.0.tgz", - "integrity": "sha512-zcsmWpqPyTwsiQmQTzgUy9iqxhG4FQnl88eipdg6mXPwnldkURlMeryP5Q4O4Tf1ZLresZ96BDHJyRfXTYKMIw==", + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/@code0-tech/triangulum/-/triangulum-0.30.0.tgz", + "integrity": "sha512-tIuCZd/XRWo5nF92JsL3aWslAG0S6MopAEkcZ3D9a21Pax/J7oLK1pmEQd6DnP9EmXGPAbmo4H6svDt41n2JFw==", "peerDependencies": { - "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2722865546-50e0e86411a3ab53d9fdd8be7ec7af5c3ab43f8a", + "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2744343400-55133b9bb6062772c50f83d945a22a531a6e48e2", "@typescript/vfs": "^1.6.4", "lossless-json": "^4.3.0", + "ts-json-schema-generator": "^2.9.0", "typescript": "^5.9.3 || ^6.0.2" } }, @@ -5713,7 +5715,6 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, "license": "MIT" }, "node_modules/@types/json5": { @@ -10906,7 +10907,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -12174,6 +12174,15 @@ "dev": true, "license": "MIT" }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -13214,6 +13223,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safe-stable-stringify": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", + "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/sass": { "version": "1.99.0", "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz", @@ -13977,6 +13995,50 @@ "typescript": ">=4.8.4" } }, + "node_modules/ts-json-schema-generator": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.9.0.tgz", + "integrity": "sha512-NR5ZE108uiPtBHBJNGnhwoUaUx5vWTDJzDFG9YlRoqxPU76n+5FClRh92dcGgysbe1smRmYalM9Saj97GW1J4Q==", + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.15", + "commander": "^14.0.3", + "glob": "^13.0.6", + "json5": "^2.2.3", + "normalize-path": "^3.0.0", + "safe-stable-stringify": "^2.5.0", + "tslib": "^2.8.1", + "typescript": "^5.9.3" + }, + "bin": { + "ts-json-schema-generator": "bin/ts-json-schema-generator.js" + }, + "engines": { + "node": ">=22.0.0" + } + }, + "node_modules/ts-json-schema-generator/node_modules/commander": { + "version": "14.0.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz", + "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==", + "license": "MIT", + "engines": { + "node": ">=20" + } + }, + "node_modules/ts-json-schema-generator/node_modules/typescript": { + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", diff --git a/package.json b/package.json index ff02c965..05cb9794 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ }, "dependencies": { "@apollo/client": "^4.0.9", - "@code0-tech/pictor": "^0.14.0", - "@code0-tech/triangulum": "^0.29.0", + "@code0-tech/pictor": "^0.15.0", + "@code0-tech/triangulum": "^0.30.0", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lint": "^6.9.5", "@icons-pack/react-simple-icons": "^13.13.0", From d9cdf8f51ee8d6e3c1b8fcf4efcb1a18c8f9c285 Mon Sep 17 00:00:00 2001 From: nicosammito Date: Sun, 9 Aug 2026 14:37:59 +0200 Subject: [PATCH 2/4] feat: update @code0-tech/pictor to version 0.15.0 and @code0-tech/triangulum to version 0.30.2 --- .env.local | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.local b/.env.local index f5993b0c..2d9a3770 100644 --- a/.env.local +++ b/.env.local @@ -5,7 +5,7 @@ SAGITTARIUS_GRAPHQL_URL=http://localhost:80/graphql SAGITTARIUS_CABLE_URL=http://localhost:80/cable NEXT_PUBLIC_SCULPTOR_VERSION=0.0.0 -NEXT_PUBLIC_PICTOR_VERSION=0.14.0 +NEXT_PUBLIC_PICTOR_VERSION=0.15.0 NEXT_PUBLIC_ALLOWED_REDIRECT_DOMAINS=*.code0.tech,*.codezero.build NEXT_PUBLIC_OTEL_SERVICE_NAME=#"sculptor-client" diff --git a/package-lock.json b/package-lock.json index ad30986f..8f1baab4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@apollo/client": "^4.0.9", "@code0-tech/pictor": "^0.15.0", - "@code0-tech/triangulum": "^0.30.0", + "@code0-tech/triangulum": "^0.30.2", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lint": "^6.9.5", "@icons-pack/react-simple-icons": "^13.13.0", @@ -1953,9 +1953,9 @@ "peer": true }, "node_modules/@code0-tech/triangulum": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/@code0-tech/triangulum/-/triangulum-0.30.0.tgz", - "integrity": "sha512-tIuCZd/XRWo5nF92JsL3aWslAG0S6MopAEkcZ3D9a21Pax/J7oLK1pmEQd6DnP9EmXGPAbmo4H6svDt41n2JFw==", + "version": "0.30.2", + "resolved": "https://registry.npmjs.org/@code0-tech/triangulum/-/triangulum-0.30.2.tgz", + "integrity": "sha512-F0HRpfEpIq8dzd+e0m4uhXagLKGi4gxGGNhuuS2TO6phBlZjtnqHcwxyHISeSNraDIGeJAhlDI9HsHghgtdtBA==", "peerDependencies": { "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2744343400-55133b9bb6062772c50f83d945a22a531a6e48e2", "@typescript/vfs": "^1.6.4", diff --git a/package.json b/package.json index 05cb9794..909a97eb 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "@apollo/client": "^4.0.9", "@code0-tech/pictor": "^0.15.0", - "@code0-tech/triangulum": "^0.30.0", + "@code0-tech/triangulum": "^0.30.2", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lint": "^6.9.5", "@icons-pack/react-simple-icons": "^13.13.0", From b965930c38b55cb243f68209c78361f079183d62 Mon Sep 17 00:00:00 2001 From: nicosammito Date: Sun, 9 Aug 2026 14:38:21 +0200 Subject: [PATCH 3/4] feat: update runtime status checks to use new status structure --- .../ce/src/application/views/ApplicationServersView.tsx | 4 ++-- .../ce/src/namespace/views/NamespaceServersView.tsx | 4 ++-- .../project/views/ProjectSettingsAssignedServersView.tsx | 4 ++-- .../runtime/components/RuntimeDataTableRowComponent.tsx | 4 ++-- .../components/RuntimeProjectDataTableRowComponent.tsx | 4 ++-- .../runtime/services/fragments/Runtime.fragment.graphql | 8 +++++++- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/packages/ce/src/application/views/ApplicationServersView.tsx b/src/packages/ce/src/application/views/ApplicationServersView.tsx index 65af796d..504bab71 100644 --- a/src/packages/ce/src/application/views/ApplicationServersView.tsx +++ b/src/packages/ce/src/application/views/ApplicationServersView.tsx @@ -54,8 +54,8 @@ export const ApplicationServersView: React.FC = () => { const preFilter = React.useCallback((runtime: Runtime) => { if (!isGlobal(runtime)) return false - if (filter === "connected") return runtime.status === "CONNECTED" - if (filter === "disconnected") return runtime.status !== "CONNECTED" + if (filter === "connected") return runtime.status?.status === "RUNNING" + if (filter === "disconnected") return runtime.status?.status !== "RUNNING" return true }, [filter]) diff --git a/src/packages/ce/src/namespace/views/NamespaceServersView.tsx b/src/packages/ce/src/namespace/views/NamespaceServersView.tsx index a3fcda7e..8d1b6f00 100644 --- a/src/packages/ce/src/namespace/views/NamespaceServersView.tsx +++ b/src/packages/ce/src/namespace/views/NamespaceServersView.tsx @@ -55,8 +55,8 @@ export const NamespaceServersView: React.FC = () => { const preFilter = React.useCallback((runtime: Runtime) => { if (runtime?.namespace?.id !== namespaceId) return false - if (filter === "connected") return runtime.status === "CONNECTED" - if (filter === "disconnected") return runtime.status !== "CONNECTED" + if (filter === "connected") return runtime.status?.status === "RUNNING" + if (filter === "disconnected") return runtime.status?.status !== "RUNNING" return true }, [filter, namespaceId]) diff --git a/src/packages/ce/src/project/views/ProjectSettingsAssignedServersView.tsx b/src/packages/ce/src/project/views/ProjectSettingsAssignedServersView.tsx index 17b03b00..00658160 100644 --- a/src/packages/ce/src/project/views/ProjectSettingsAssignedServersView.tsx +++ b/src/packages/ce/src/project/views/ProjectSettingsAssignedServersView.tsx @@ -96,9 +96,9 @@ export const ProjectSettingsAssignedServersView: React.FC = () => { {runtime?.name} - - {runtime?.status} + {runtime?.status?.status} diff --git a/src/packages/ce/src/runtime/components/RuntimeDataTableRowComponent.tsx b/src/packages/ce/src/runtime/components/RuntimeDataTableRowComponent.tsx index a7aed099..01533b68 100644 --- a/src/packages/ce/src/runtime/components/RuntimeDataTableRowComponent.tsx +++ b/src/packages/ce/src/runtime/components/RuntimeDataTableRowComponent.tsx @@ -42,8 +42,8 @@ export const RuntimeDataTableRowComponent: React.FC - - {runtime?.status} + + {runtime?.status?.status} diff --git a/src/packages/ce/src/runtime/components/RuntimeProjectDataTableRowComponent.tsx b/src/packages/ce/src/runtime/components/RuntimeProjectDataTableRowComponent.tsx index b7bd7825..5f72378e 100644 --- a/src/packages/ce/src/runtime/components/RuntimeProjectDataTableRowComponent.tsx +++ b/src/packages/ce/src/runtime/components/RuntimeProjectDataTableRowComponent.tsx @@ -120,8 +120,8 @@ export const RuntimeProjectDataTableRowComponent: React.FC - - {runtime?.status} + + {runtime?.status?.status} diff --git a/src/packages/ce/src/runtime/services/fragments/Runtime.fragment.graphql b/src/packages/ce/src/runtime/services/fragments/Runtime.fragment.graphql index e3fe3af4..f1a8a738 100644 --- a/src/packages/ce/src/runtime/services/fragments/Runtime.fragment.graphql +++ b/src/packages/ce/src/runtime/services/fragments/Runtime.fragment.graphql @@ -3,7 +3,13 @@ fragment Runtime on Runtime { __typename id name - status + status { + __typename + id + status + lastHeartbeat + uptimes + } description namespace { __typename From 1d1717e7575633e4cbd330cb770acc4ac95585df Mon Sep 17 00:00:00 2001 From: nicosammito Date: Sun, 9 Aug 2026 14:38:26 +0200 Subject: [PATCH 4/4] feat: update imports in DataType components to use new structure from @code0-tech/triangulum --- .../src/datatype/components/inputs/DataTypeInputComponent.tsx | 3 +-- .../components/inputs/json/DataTypeJSONInputComponent.tsx | 2 +- .../ce/src/flow/components/FlowExecuteDialogComponent.tsx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx b/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx index e1d3804a..6dbfba99 100644 --- a/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx +++ b/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx @@ -1,6 +1,6 @@ import React from "react"; import {DataTypeTextInputComponent} from "./text/DataTypeTextInputComponent"; -import {NodeSchema} from "@code0-tech/triangulum"; +import {NodeSchema, Schema} from "@code0-tech/triangulum"; import { LiteralValue, NodeFunction, @@ -17,7 +17,6 @@ import {DataTypeGenericInputComponent} from "@edition/datatype/components/inputs import { DataTypeSubFlowInputComponent } from "@edition/datatype/components/inputs/sub-flow/DataTypeSubFlowInputComponent"; -import {Schema} from "@code0-tech/triangulum/dist/util/schema.util"; export interface DataTypeInputComponentProps extends Omit, "onChange"> { schema: (NodeSchema | Schema) diff --git a/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx b/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx index 16bfe37b..208bf266 100644 --- a/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx +++ b/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx @@ -9,7 +9,7 @@ import { } from "@edition/datatype/components/inputs/json/DataTypeJSONInputEditDialogComponent"; import {DataTypeInputValueComponent} from "@edition/datatype/components/inputs/DataTypeInputValueComponent"; import {useDebouncedCallback} from "use-debounce"; -import {DataInput, ListInput} from "@code0-tech/triangulum/dist/util/schema.util"; +import {DataInput, ListInput} from "@code0-tech/triangulum"; export interface EditableJSONEntry { key: string diff --git a/src/packages/ce/src/flow/components/FlowExecuteDialogComponent.tsx b/src/packages/ce/src/flow/components/FlowExecuteDialogComponent.tsx index 8fe996f8..79304474 100644 --- a/src/packages/ce/src/flow/components/FlowExecuteDialogComponent.tsx +++ b/src/packages/ce/src/flow/components/FlowExecuteDialogComponent.tsx @@ -27,7 +27,7 @@ import {useSchemaAction} from "@edition/flow/components/FlowWorkerProvider"; import {DataTypeInputComponent} from "@edition/datatype/components/inputs/DataTypeInputComponent"; import {useFlowExecutionStore} from "@edition/flow/hooks/Flow.execution.hook"; import {useFlowViewStore} from "@edition/flow/hooks/Flow.view.hook"; -import {Schema} from "@code0-tech/triangulum/dist/util/schema.util"; +import {Schema} from "@code0-tech/triangulum"; export interface FlowExecuteDialogComponentProps { flowId: Flow['id']