ui/clan: wire up service create

This commit is contained in:
Johannes Kirschbauer
2025-08-28 14:13:39 +02:00
parent 9a903be6d4
commit a92a1a7dd1
3 changed files with 71 additions and 10 deletions

View File

@@ -36,6 +36,11 @@ import { createForm, FieldValues, reset } from "@modular-forms/solid";
import { Sidebar } from "@/src/components/Sidebar/Sidebar";
import { UseQueryResult } from "@tanstack/solid-query";
import { ListClansModal } from "@/src/modals/ListClansModal/ListClansModal";
import {
InventoryInstance,
ServiceWorkflow,
} from "@/src/workflows/Service/Service";
import { useApiClient } from "@/src/hooks/ApiClient";
interface ClanContextProps {
clanURI: string;
@@ -179,7 +184,10 @@ const ClanSceneController = (props: RouteSectionProps) => {
const navigate = useNavigate();
const [dialogHandlers, setDialogHandlers] = createSignal<{
const [showService, setShowService] = createSignal(false);
const [showModal, setShowModal] = createSignal(false);
const [currentPromise, setCurrentPromise] = createSignal<{
resolve: ({ id }: { id: string }) => void;
reject: (err: unknown) => void;
} | null>(null);
@@ -187,7 +195,15 @@ const ClanSceneController = (props: RouteSectionProps) => {
const onCreate = async (): Promise<{ id: string }> => {
return new Promise((resolve, reject) => {
setShowModal(true);
setDialogHandlers({ resolve, reject });
setCurrentPromise({ resolve, reject });
});
};
const onAddService = async (): Promise<{ id: string }> => {
return new Promise((resolve, reject) => {
setShowService(true);
console.log("setting current promise");
setCurrentPromise({ resolve, reject });
});
};
@@ -217,8 +233,6 @@ const ClanSceneController = (props: RouteSectionProps) => {
return { id: values.name };
};
const [showModal, setShowModal] = createSignal(false);
const [loadingError, setLoadingError] = createSignal<
{ title: string; description: string } | undefined
>();
@@ -265,6 +279,26 @@ const ClanSceneController = (props: RouteSectionProps) => {
}),
);
const client = useApiClient();
const handleSubmitService = async (instance: InventoryInstance) => {
console.log("Create Instance", instance);
const call = client.fetch("create_service_instance", {
flake: {
identifier: ctx.clanURI,
},
module_ref: instance.module,
roles: instance.roles,
});
const result = await call.result;
if (result.status === "error") {
console.error("Error creating service instance", result.errors);
}
//
currentPromise()?.resolve({ id: "0" });
setShowService(false);
};
return (
<>
<Show when={loadingError()}>
@@ -274,15 +308,15 @@ const ClanSceneController = (props: RouteSectionProps) => {
<MockCreateMachine
onClose={() => {
setShowModal(false);
dialogHandlers()?.reject(new Error("User cancelled"));
currentPromise()?.reject(new Error("User cancelled"));
}}
onSubmit={async (values) => {
try {
const result = await sendCreate(values);
dialogHandlers()?.resolve(result);
currentPromise()?.resolve(result);
setShowModal(false);
} catch (err) {
dialogHandlers()?.reject(err);
currentPromise()?.reject(err);
setShowModal(false);
}
}}
@@ -297,10 +331,22 @@ const ClanSceneController = (props: RouteSectionProps) => {
</div>
<CubeScene
onAddService={onAddService}
selectedIds={selectedIds}
onSelect={onMachineSelect}
isLoading={ctx.isLoading()}
cubesQuery={ctx.machinesQuery}
toolbarPopup={
<Show when={showService()}>
<ServiceWorkflow
handleSubmit={handleSubmitService}
onClose={() => {
setShowService(false);
currentPromise()?.resolve({ id: "0" });
}}
/>
</Show>
}
onCreate={onCreate}
clanURI={ctx.clanURI}
sceneStore={() => store.sceneData?.[ctx.clanURI]}

View File

@@ -4,6 +4,8 @@
cursor: pointer;
}
/* <div class="absolute bottom-4 left-1/2 flex -translate-x-1/2 flex-col items-center">
<Show when={show()}> */
.toolbar-container {
@apply absolute bottom-10 z-10 w-full;
@apply flex justify-center items-center;

View File

@@ -1,4 +1,11 @@
import { createSignal, createEffect, onCleanup, onMount, on } from "solid-js";
import {
createSignal,
createEffect,
onCleanup,
onMount,
on,
JSX,
} from "solid-js";
import "./cubes.css";
import * as THREE from "three";
@@ -34,12 +41,14 @@ function garbageCollectGroup(group: THREE.Group) {
export function CubeScene(props: {
cubesQuery: MachinesQueryResult;
onCreate: () => Promise<{ id: string }>;
onAddService: () => Promise<{ id: string }>;
selectedIds: Accessor<Set<string>>;
onSelect: (v: Set<string>) => void;
sceneStore: Accessor<SceneData>;
setMachinePos: (machineId: string, pos: [number, number] | null) => void;
isLoading: boolean;
clanURI: string;
toolbarPopup?: JSX.Element;
}) {
let container: HTMLDivElement;
let scene: THREE.Scene;
@@ -213,7 +222,7 @@ export function CubeScene(props: {
controls = new MapControls(camera, renderer.domElement);
controls.enableDamping = true; // an animation loop is required when either damping or auto-rotation are enabled
controls.mouseButtons.RIGHT = null;
controls.enableRotate = false;
// controls.enableRotate = false;
controls.minZoom = 1.2;
controls.maxZoom = 3.5;
controls.addEventListener("change", () => {
@@ -543,6 +552,9 @@ export function CubeScene(props: {
<>
<div class="cubes-scene-container" ref={(el) => (container = el)} />
<div class="toolbar-container">
<div class="absolute bottom-full left-1/2 mb-2 -translate-x-1/2">
{props.toolbarPopup}
</div>
<Toolbar>
<ToolbarButton
description="Select machine"
@@ -563,7 +575,8 @@ export function CubeScene(props: {
<ToolbarButton
description="Add new Service"
name="modules"
icon="Modules"
icon="Services"
onClick={props.onAddService}
/>
<ToolbarButton
icon="Reload"