Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
90 changes: 76 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.2",
"@codemirror/lang-javascript": "^6.2.5",
"@codemirror/lint": "^6.9.5",
"@icons-pack/react-simple-icons": "^13.13.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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<InputWrapperProps<NodeParameterValue | NodeFunction>, "onChange"> {
schema: (NodeSchema | Schema)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
4 changes: 2 additions & 2 deletions src/packages/ce/src/namespace/views/NamespaceServersView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ export const ProjectSettingsAssignedServersView: React.FC = () => {
<Flex align={"center"} justify={"space-between"} w={"100%"}
style={{gap: "0.7rem"}}>
<Text hierarchy={"primary"}>{runtime?.name}</Text>
<Badge color={runtime?.status === "CONNECTED" ? "success" : "error"}
<Badge color={runtime?.status?.status === "RUNNING" ? "success" : "error"}
border>
<Text style={{color: "inherit"}}>{runtime?.status}</Text>
<Text style={{color: "inherit"}}>{runtime?.status?.status}</Text>
</Badge>
</Flex>
</Flex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export const RuntimeDataTableRowComponent: React.FC<ProjectDataTableRowComponent
</Flex>
</DataTableColumn>
<DataTableColumn>
<Badge color={runtime?.status === "CONNECTED" ? "success" : "error"} border>
<Text style={{color: "inherit"}}>{runtime?.status}</Text>
<Badge color={runtime?.status?.status === "RUNNING" ? "success" : "error"} border>
<Text style={{color: "inherit"}}>{runtime?.status?.status}</Text>
</Badge>
</DataTableColumn>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ export const RuntimeProjectDataTableRowComponent: React.FC<RuntimeProjectDataTab
Status
</Text>
<Spacing spacing={"xxs"}/>
<Badge color={runtime?.status === "CONNECTED" ? "success" : "error"} border>
<Text style={{color: "inherit"}}>{runtime?.status}</Text>
<Badge color={runtime?.status?.status === "RUNNING" ? "success" : "error"} border>
<Text style={{color: "inherit"}}>{runtime?.status?.status}</Text>
</Badge>
</DataTableColumn>
<DataTableColumn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ fragment Runtime on Runtime {
__typename
id
name
status
status {
__typename
id
status
lastHeartbeat
uptimes
}
description
namespace {
__typename
Expand Down