fix type inference for assertConfirm

houston-common-lib/lib/utils.ts

@@ -1,6 +1,15 @@
 import { KeyValueData } from "@/syntax";
 import { Maybe, None, Some } from "monet";
 
+export type ValueElseUndefiend<T> = T extends
+  | string
+  | number
+  | boolean
+  | symbol
+  | object
+  ? T
+  : undefined;
+
 export type MethodFunctor<T extends {}, R> = (v: T) => R;
 export function MethodFunctor<
   T extends { [P in TMethod]: (..._: any[]) => any },

houston-common-ui/lib/components/modals/ModalConfirm.vue

@@ -20,6 +20,7 @@ import { type Action } from "@/composables/wrapActions";
 import CardContainer from "@/components/CardContainer.vue";
 import Modal from "./Modal.vue";
 import { ExclamationCircleIcon } from "@heroicons/vue/20/solid";
+import { CancelledByUser, type ValueElseUndefiend } from "@45drives/houston-common-lib";
 
 const _ = cockpit.gettext;
 
@@ -109,23 +110,14 @@ const confirmBeforeAction = (
   };
 };
 
-type ValueElseUndefiend<T> = T extends
-  | string
-  | number
-  | boolean
-  | symbol
-  | object
-  ? T
-  : undefined;
-
 const assertConfirm = <T,>(
   options: ConfirmOptions,
   resultIfConfirmed?: T
 ): ResultAsync<ValueElseUndefiend<T>, Error> => {
   return confirm(options).andThen((confirmed) =>
     confirmed
       ? okAsync(resultIfConfirmed as any)
-      : errAsync(new Error("Cancelled by user."))
+      : errAsync(new CancelledByUser(options.header))
   );
 };
 

houston-common-ui/lib/composables/globalModalConfirm.ts

@@ -2,17 +2,18 @@ import { type ConfirmOptions } from "@/components/modals";
 import { ResultAsync } from "neverthrow";
 import { type Action } from "@/composables/wrapActions";
 import { ref } from "vue";
+import { type ValueElseUndefiend } from "@45drives/houston-common-lib";
 
 export type GlobalModalConfirmFunctions = {
   confirm: (options: ConfirmOptions) => ResultAsync<boolean, never>;
   confirmBeforeAction: (
     options: ConfirmOptions,
     action: Action<any, any, any>
   ) => typeof action;
-  assertConfirm: (
+  assertConfirm: <T>(
     options: ConfirmOptions,
-    resultIfConfirmed?: unknown
-  ) => ResultAsync<typeof resultIfConfirmed, Error>;
+    resultIfConfirmed?: T
+  ) => ResultAsync<ValueElseUndefiend<T>, Error>;
 };
 
 const globalModalConfirmFuncs = ref<GlobalModalConfirmFunctions>();