From 672af1c63d99fcaffe3bfdcbf52e91b277112e54 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 3 Sep 2025 12:41:26 +0200 Subject: [PATCH] ui/update: fix cancel/close --- .../ui/src/workflows/InstallMachine/InstallMachine.tsx | 2 +- .../ui/src/workflows/InstallMachine/UpdateMachine.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-app/ui/src/workflows/InstallMachine/InstallMachine.tsx b/pkgs/clan-app/ui/src/workflows/InstallMachine/InstallMachine.tsx index dc73de69d..971fc5fc6 100644 --- a/pkgs/clan-app/ui/src/workflows/InstallMachine/InstallMachine.tsx +++ b/pkgs/clan-app/ui/src/workflows/InstallMachine/InstallMachine.tsx @@ -57,7 +57,7 @@ export interface InstallStoreType { machineName: string; mainDisk?: string; // ...TODO Vars - progress: ApiCall<"run_machine_install">; + progress: ApiCall<"run_machine_install" | "run_machine_update">; promptValues: PromptValues; prepareStep: "disk" | "generators" | "install"; }; diff --git a/pkgs/clan-app/ui/src/workflows/InstallMachine/UpdateMachine.tsx b/pkgs/clan-app/ui/src/workflows/InstallMachine/UpdateMachine.tsx index 5efce9745..d46ddf22a 100644 --- a/pkgs/clan-app/ui/src/workflows/InstallMachine/UpdateMachine.tsx +++ b/pkgs/clan-app/ui/src/workflows/InstallMachine/UpdateMachine.tsx @@ -27,7 +27,7 @@ interface UpdateStepperProps { const UpdateStepper = (props: UpdateStepperProps) => { const stepSignal = useStepper(); - const [store, _set] = getStepStore(stepSignal); + const [store, set] = getStepStore(stepSignal); const [alert, setAlert] = createSignal(); @@ -62,6 +62,8 @@ const UpdateStepper = (props: UpdateStepperProps) => { }, }, }); + // For cancel + set("install", "progress", call); const result = await call.result; @@ -294,7 +296,7 @@ export const UpdateModal = (props: UpdateModalProps) => { // @ts-expect-error some steps might not have disablePadding={stepper.currentStep()?.isSplash} > - props.onClose} /> + props.onClose?.()} /> );