From c6e61d5d761d223bb420cb299b0a8c018e59aa3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <jmm@yavook.de>
Date: Wed, 3 Apr 2024 18:29:08 +0000
Subject: [PATCH] move `*_user_error` from `advent22.ts` to `store.ts`, fixing
 `advent22Store.init`

---
 ui/src/components/AdminButton.vue         |  2 +-
 ui/src/components/Calendar.vue            |  2 +-
 ui/src/components/admin/DoorMapEditor.vue |  6 ++-
 ui/src/plugins/advent22.ts                | 59 +---------------------
 ui/src/plugins/store.ts                   | 61 ++++++++++++++++++++++-
 5 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/ui/src/components/AdminButton.vue b/ui/src/components/AdminButton.vue
index 09f0978..433bcdc 100644
--- a/ui/src/components/AdminButton.vue
+++ b/ui/src/components/AdminButton.vue
@@ -44,7 +44,7 @@ export default class extends Vue {
 
     this.store
       .login(creds)
-      .catch(this.$advent22.alert_user_error)
+      .catch(this.store.alert_user_error)
       .finally(() => (this.is_busy = false));
   }
 
diff --git a/ui/src/components/Calendar.vue b/ui/src/components/Calendar.vue
index fdd4d14..6790242 100644
--- a/ui/src/components/Calendar.vue
+++ b/ui/src/components/Calendar.vue
@@ -109,7 +109,7 @@ export default class extends Vue {
         this.multi_modal!.show_image(image_src, this.$advent22.name_door(day));
       })
       .catch((error) => {
-        this.$advent22.alert_user_error(error);
+        this.store.alert_user_error(error);
         this.multi_modal!.hide();
       });
   }
diff --git a/ui/src/components/admin/DoorMapEditor.vue b/ui/src/components/admin/DoorMapEditor.vue
index 73e678a..bdbef3d 100644
--- a/ui/src/components/admin/DoorMapEditor.vue
+++ b/ui/src/components/admin/DoorMapEditor.vue
@@ -71,6 +71,7 @@
 <script lang="ts">
 import { DoorSaved } from "@/lib/api";
 import { Door } from "@/lib/door";
+import { advent22Store } from "@/plugins/store";
 import { Options, Vue } from "vue-class-component";
 
 import { toast } from "bulma-toast";
@@ -99,6 +100,7 @@ export default class extends Vue {
   ];
   public current_step = 0;
   public doors: Door[] = [];
+  private readonly store = advent22Store();
 
   public loading_doors = false;
   public saving_doors = false;
@@ -117,7 +119,7 @@ export default class extends Vue {
           resolve();
         })
         .catch((error) => {
-          this.$advent22.alert_user_error(error);
+          this.store.alert_user_error(error);
           reject();
         });
     });
@@ -135,7 +137,7 @@ export default class extends Vue {
         .api_put("admin/doors", data)
         .then(resolve)
         .catch((error) => {
-          this.$advent22.alert_user_error(error);
+          this.store.alert_user_error(error);
           reject();
         });
     });
diff --git a/ui/src/plugins/advent22.ts b/ui/src/plugins/advent22.ts
index 8338b50..d86ca30 100644
--- a/ui/src/plugins/advent22.ts
+++ b/ui/src/plugins/advent22.ts
@@ -1,5 +1,4 @@
-import axios, { AxiosError, AxiosInstance, ResponseType } from "axios";
-import { toast } from "bulma-toast";
+import axios, { AxiosInstance, ResponseType } from "axios";
 import { App, Plugin } from "vue";
 import { advent22Store } from "./store";
 
@@ -29,62 +28,6 @@ export class Advent22 {
     return `Türchen ${day}`;
   }
 
-  public format_user_error([reason, endpoint]: [unknown, string]): string {
-    let msg =
-      "Unbekannter Fehler, bitte wiederholen! Besteht das Problem länger, bitte Admin benachrichtigen!";
-    let code = "U";
-    const result = () => `${msg} (Fehlercode: ${code}/${endpoint})`;
-
-    if (!(reason instanceof AxiosError)) return result();
-
-    switch (reason.code) {
-      case "ECONNABORTED":
-        // API unerreichbar
-        msg =
-          "API antwortet nicht, bitte später wiederholen! Besteht das Problem länger, bitte Admin benachrichtigen!";
-        code = "D";
-        break;
-
-      case "ERR_NETWORK":
-        // Netzwerk nicht verbunden
-        msg = "Sieht aus, als sei deine Netzwerkverbindung gestört.";
-        code = "N";
-        break;
-
-      default:
-        if (reason.response === undefined) return result();
-
-        switch (reason.response.status) {
-          case 401:
-            // UNAUTHORIZED
-            msg = "Netter Versuch :)";
-            code = "A";
-            break;
-
-          case 422:
-            // UNPROCESSABLE ENTITY
-            msg = "Funktion ist kaputt, bitte Admin benachrichtigen!";
-            code = "I";
-            break;
-
-          default:
-            // HTTP
-            code = `H${reason.response.status}`;
-            break;
-        }
-        break;
-    }
-
-    return result();
-  }
-
-  public alert_user_error(param: [unknown, string]): void {
-    toast({
-      message: this.format_user_error(param),
-      type: "is-danger",
-    });
-  }
-
   public api_url(): string;
   public api_url(endpoint: string): string;
   public api_url(endpoint?: string): string {
diff --git a/ui/src/plugins/store.ts b/ui/src/plugins/store.ts
index 6547db4..7ae0b1e 100644
--- a/ui/src/plugins/store.ts
+++ b/ui/src/plugins/store.ts
@@ -2,7 +2,8 @@ import { Credentials, DoorSaved, SiteConfigModel } from "@/lib/api";
 import { Door } from "@/lib/door";
 import { Advent22 } from "@/plugins/advent22";
 import { RemovableRef, useLocalStorage } from "@vueuse/core";
-import { AxiosBasicCredentials } from "axios";
+import { AxiosBasicCredentials, AxiosError } from "axios";
+import { toast } from "bulma-toast";
 import { acceptHMRUpdate, defineStore } from "pinia";
 
 declare global {
@@ -65,7 +66,63 @@ export const advent22Store = defineStore({
           this.is_initialized = true;
           for (const callback of this.on_initialized) callback();
         })
-        .catch(this.advent22.alert_user_error);
+        .catch(this.alert_user_error);
+    },
+
+    format_user_error([reason, endpoint]: [unknown, string]): string {
+      let msg =
+        "Unbekannter Fehler, bitte wiederholen! Besteht das Problem länger, bitte Admin benachrichtigen!";
+      let code = "U";
+      const result = () => `${msg} (Fehlercode: ${code}/${endpoint})`;
+
+      if (!(reason instanceof AxiosError)) return result();
+
+      switch (reason.code) {
+        case "ECONNABORTED":
+          // API unerreichbar
+          msg =
+            "API antwortet nicht, bitte später wiederholen! Besteht das Problem länger, bitte Admin benachrichtigen!";
+          code = "D";
+          break;
+
+        case "ERR_NETWORK":
+          // Netzwerk nicht verbunden
+          msg = "Sieht aus, als sei deine Netzwerkverbindung gestört.";
+          code = "N";
+          break;
+
+        default:
+          if (reason.response === undefined) return result();
+
+          switch (reason.response.status) {
+            case 401:
+              // UNAUTHORIZED
+              msg = "Netter Versuch :)";
+              code = "A";
+              break;
+
+            case 422:
+              // UNPROCESSABLE ENTITY
+              msg = "Funktion ist kaputt, bitte Admin benachrichtigen!";
+              code = "I";
+              break;
+
+            default:
+              // HTTP
+              code = `H${reason.response.status}`;
+              break;
+          }
+          break;
+      }
+
+      return result();
+    },
+
+    alert_user_error(param: [unknown, string]): void {
+      toast({
+        message: this.format_user_error(param),
+        type: "is-danger",
+      });
     },
 
     update(): Promise<void> {