adding unreadable http response case and removing deprecated fields

4 files changed, 60 insertions, 12 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/templates/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/templates/list/index.tsx
index ea8f4e7e3..ccbead14d 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/templates/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/templates/list/index.tsx
@@ -20,6 +20,7 @@
  */
 
 import {
+  ErrorType,
   HttpError,
   useTranslationContext,
 } from "@gnu-taler/web-util/lib/index.browser";
@@ -34,6 +35,7 @@ import {
 } from "../../../../hooks/templates.js";
 import { Notification } from "../../../../utils/types.js";
 import { ListPage } from "./ListPage.js";
+import { HttpStatusCode } from "@gnu-taler/taler-util";
 
 interface Props {
   onUnauthorized: () => VNode;
@@ -60,10 +62,20 @@ export default function ListTemplates({
   const { deleteTemplate } = useTemplateAPI();
   const result = useInstanceTemplates({ position }, (id) => setPosition(id));
 
-  if (result.clientError && result.isUnauthorized) return onUnauthorized();
-  if (result.clientError && result.isNotfound) return onNotFound();
   if (result.loading) return <Loading />;
-  if (!result.ok) return onLoadError(result);
+  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);
+  }
 
   return (
     <Fragment>
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/templates/qr/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/templates/qr/index.tsx
index 044cc7d79..70818268e 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/templates/qr/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/templates/qr/index.tsx
@@ -20,6 +20,7 @@
  */
 
 import {
+  ErrorType,
   HttpError,
   useTranslationContext,
 } from "@gnu-taler/web-util/lib/index.browser";
@@ -34,6 +35,7 @@ import {
 } from "../../../../hooks/templates.js";
 import { Notification } from "../../../../utils/types.js";
 import { QrPage } from "./QrPage.js";
+import { HttpStatusCode } from "@gnu-taler/taler-util";
 
 export type Entity = MerchantBackend.Transfers.TransferInformation;
 interface Props {
@@ -54,10 +56,20 @@ export default function TemplateQrPage({
   const result = useTemplateDetails(tid);
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
 
-  if (result.clientError && result.isUnauthorized) return onUnauthorized();
-  if (result.clientError && result.isNotfound) return onNotFound();
   if (result.loading) return <Loading />;
-  if (!result.ok) return onLoadError(result);
+  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);
+  }
 
   return (
     <>
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx
index 73489869b..88790a13a 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx
@@ -20,6 +20,7 @@
  */
 
 import {
+  ErrorType,
   HttpError,
   useTranslationContext,
 } from "@gnu-taler/web-util/lib/index.browser";
@@ -34,6 +35,7 @@ import {
 } from "../../../../hooks/templates.js";
 import { Notification } from "../../../../utils/types.js";
 import { UpdatePage } from "./UpdatePage.js";
+import { HttpStatusCode } from "@gnu-taler/taler-util";
 
 export type Entity = MerchantBackend.Template.TemplatePatchDetails & WithId;
 
@@ -59,10 +61,20 @@ export default function UpdateTemplate({
 
   const { i18n } = useTranslationContext();
 
-  if (result.clientError && result.isUnauthorized) return onUnauthorized();
-  if (result.clientError && result.isNotfound) return onNotFound();
   if (result.loading) return <Loading />;
-  if (!result.ok) return onLoadError(result);
+  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);
+  }
 
   return (
     <Fragment>
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/templates/use/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/templates/use/index.tsx
index b6175bcfb..3c9f82ece 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/templates/use/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/templates/use/index.tsx
@@ -20,6 +20,7 @@
  */
 
 import {
+  ErrorType,
   HttpError,
   useTranslationContext,
 } from "@gnu-taler/web-util/lib/index.browser";
@@ -34,6 +35,7 @@ import {
 } from "../../../../hooks/templates.js";
 import { Notification } from "../../../../utils/types.js";
 import { UsePage } from "./UsePage.js";
+import { HttpStatusCode } from "@gnu-taler/taler-util";
 
 export type Entity = MerchantBackend.Transfers.TransferInformation;
 interface Props {
@@ -58,10 +60,20 @@ export default function TemplateUsePage({
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
   const { i18n } = useTranslationContext();
 
-  if (result.clientError && result.isUnauthorized) return onUnauthorized();
-  if (result.clientError && result.isNotfound) return onNotFound();
   if (result.loading) return <Loading />;
-  if (!result.ok) return onLoadError(result);
+  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);
+  }
 
   return (
     <>