1 files changed, 45 insertions, 46 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx
index e44cf5c0f..9da7f7efb 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2021-2023 Taler Systems S.A.
+ (C) 2021-2024 Taler Systems S.A.
 
  GNU Taler is free software; you can redistribute it and/or modify it under the
  terms of the GNU General Public License as published by the Free Software
@@ -13,83 +13,79 @@
  You should have received a copy of the GNU General Public License along with
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
-import { HttpStatusCode } from "@gnu-taler/taler-util";
+import { HttpStatusCode, TalerError, TalerMerchantApi, TalerMerchantInstanceHttpClient, TalerMerchantManagementResultByMethod, assertUnreachable } from "@gnu-taler/taler-util";
 import {
-  ErrorType,
-  HttpError,
-  HttpResponse,
-  useTranslationContext,
+  useTranslationContext
 } from "@gnu-taler/web-util/browser";
 import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
+import { ErrorLoadingMerchant } from "../../../components/ErrorLoadingMerchant.js";
 import { Loading } from "../../../components/exception/loading.js";
 import { NotificationCard } from "../../../components/menu/index.js";
-import { useInstanceContext } from "../../../context/instance.js";
-import { AccessToken, MerchantBackend } from "../../../declaration.js";
+import { useSessionContext } from "../../../context/session.js";
 import {
-  useInstanceAPI,
   useInstanceDetails,
   useManagedInstanceDetails,
-  useManagementAPI,
 } from "../../../hooks/instance.js";
 import { Notification } from "../../../utils/types.js";
+import { LoginPage } from "../../login/index.js";
+import { NotFoundPageOrAdminCreate } from "../../notfound/index.js";
 import { UpdatePage } from "./UpdatePage.js";
 
 export interface Props {
   onBack: () => void;
   onConfirm: () => void;
 
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (e: HttpError<MerchantBackend.ErrorDetail>) => VNode;
-  onUpdateError: (e: HttpError<MerchantBackend.ErrorDetail>) => void;
+  // onUnauthorized: () => VNode;
+  // onNotFound: () => VNode;
+  // onLoadError: (e: HttpError<TalerErrorDetail>) => VNode;
+  // onUpdateError: (e: HttpError<TalerErrorDetail>) => void;
 }
 
 export default function Update(props: Props): VNode {
-  const { updateInstance } = useInstanceAPI();
+  const { lib } = useSessionContext();
+  const updateInstance = lib.instance.updateCurrentInstance.bind(lib.instance)
   const result = useInstanceDetails();
-  return CommonUpdate(props, result, updateInstance, );
+  return CommonUpdate(props, result, updateInstance,);
 }
 
 export function AdminUpdate(props: Props & { instanceId: string }): VNode {
-  const { updateInstance } = useManagementAPI(
-    props.instanceId,
-  );
+  const { lib } = useSessionContext();
+  const t = lib.subInstanceApi(props.instanceId).instance;
+  const updateInstance = t.updateCurrentInstance.bind(t)
   const result = useManagedInstanceDetails(props.instanceId);
-  return CommonUpdate(props, result, updateInstance, );
+  return CommonUpdate(props, result, updateInstance,);
 }
 
+
 function CommonUpdate(
   {
     onBack,
     onConfirm,
-    onLoadError,
-    onNotFound,
-    onUpdateError,
-    onUnauthorized,
   }: Props,
-  result: HttpResponse<
-    MerchantBackend.Instances.QueryInstancesResponse,
-    MerchantBackend.ErrorDetail
-  >,
-  updateInstance: any,
+  result: TalerMerchantManagementResultByMethod<"getInstanceDetails"> | TalerError | undefined,
+  updateInstance: typeof TalerMerchantInstanceHttpClient.prototype.updateCurrentInstance,
 ): VNode {
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
   const { i18n } = useTranslationContext();
+  const { state } = useSessionContext();
 
-  if (result.loading) return <Loading />;
-  if (!result.ok) {
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    return onLoadError(result);
+  if (!result) return <Loading />
+  if (result instanceof TalerError) {
+    return <ErrorLoadingMerchant error={result} />
+  }
+  if (result.type === "fail") {
+    switch(result.case) {
+      case HttpStatusCode.Unauthorized: {
+        return <LoginPage />
+      }
+      case HttpStatusCode.NotFound: {
+        return <NotFoundPageOrAdminCreate />;
+      }
+      default: {
+        assertUnreachable(result)
+      }
+    }
   }
 
   return (
@@ -98,15 +94,18 @@ function CommonUpdate(
       <UpdatePage
         onBack={onBack}
         isLoading={false}
-        selected={result.data}
+        selected={result.body}
         onUpdate={(
-          d: MerchantBackend.Instances.InstanceReconfigurationMessage,
+          d: TalerMerchantApi.InstanceReconfigurationMessage,
         ): Promise<void> => {
-          return updateInstance(d)
+          if (state.status !== "loggedIn") {
+            return Promise.resolve();
+          }
+          return updateInstance(state.token, d)
             .then(onConfirm)
             .catch((error: Error) =>
               setNotif({
-                message: i18n.str`Failed to create instance`,
+                message: i18n.str`Failed to update instance`,
                 type: "ERROR",
                 description: error.message,
               }),