From 9200c865f8474333cf6269d306b85d5348f7958f Mon Sep 17 00:00:00 2001
From: Jonas Plum <cugu@users.noreply.github.com>
Date: Sat, 22 Oct 2022 14:10:07 +0200
Subject: [PATCH] Hide userdata fail message (#536)

* Hide userdata fail message

* Change axios imports

Co-authored-by: Jonas Plum <git@jonasplum.de>
---
 ui/src/components/User.vue | 4 ++--
 ui/src/store/index.ts      | 9 +++++++--
 ui/src/views/Dashboard.vue | 4 ++--
 ui/src/views/Profile.vue   | 8 +++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ui/src/components/User.vue b/ui/src/components/User.vue
index 5b28a95..4bcd425 100644
--- a/ui/src/components/User.vue
+++ b/ui/src/components/User.vue
@@ -22,7 +22,7 @@
 import Vue from "vue";
 import {UserData} from "@/client";
 import {API} from "@/services/api";
-import {AxiosTransformer} from "axios";
+import {AxiosResponseTransformer} from "axios";
 
 interface State {
   user?: UserData,
@@ -46,7 +46,7 @@ export default Vue.extend({
         return
       }
 
-      let defaultTransformers = this.axios.defaults.transformResponse as AxiosTransformer[]
+      let defaultTransformers = this.axios.defaults.transformResponse as AxiosResponseTransformer[]
       let transformResponse = defaultTransformers.concat((data) => {
         data.notoast = true;
         return data
diff --git a/ui/src/store/index.ts b/ui/src/store/index.ts
index fd961c4..a5f36bb 100644
--- a/ui/src/store/index.ts
+++ b/ui/src/store/index.ts
@@ -2,7 +2,7 @@ import Vue from "vue";
 import Vuex, {ActionContext} from "vuex";
 import {API} from "@/services/api";
 import {UserData, TicketList, UserResponse, SettingsResponse} from "@/client";
-import {AxiosResponse} from "axios";
+import axios, {AxiosResponse, AxiosResponseTransformer} from "axios";
 import {Alert} from "@/types/types";
 import {templateStore} from "./modules/templates";
 import {socketStore} from "@/store/modules/socket";
@@ -63,7 +63,12 @@ export default new Vuex.Store({
       })
     },
     getUserData (context: ActionContext<any, any>) {
-      API.currentUserData().then((response: AxiosResponse<UserData>) => {
+      const defaultTransformers = axios.defaults.transformResponse as AxiosResponseTransformer[]
+      const transformResponse = defaultTransformers.concat((data) => {
+        data.notoast = true;
+        return data
+      });
+      API.currentUserData({transformResponse: transformResponse}).then((response: AxiosResponse<UserData>) => {
         context.commit("setUserData", response.data);
       })
     },
diff --git a/ui/src/views/Dashboard.vue b/ui/src/views/Dashboard.vue
index 28b9586..8cc2378 100644
--- a/ui/src/views/Dashboard.vue
+++ b/ui/src/views/Dashboard.vue
@@ -109,7 +109,7 @@ import LineChart from "../components/charts/Line";
 import BarChart from "../components/charts/Bar";
 import PieChart from "../components/charts/Doughnut";
 import {ChartData} from "chart.js";
-import {AxiosError, AxiosTransformer} from "axios";
+import {AxiosError, AxiosResponseTransformer} from "axios";
 
 interface State {
   dashboard?: DashboardResponse;
@@ -215,7 +215,7 @@ export default Vue.extend({
     loadWidgetData: function (widgets: Array<Widget>) {
       this.lodash.forEach(widgets, (widget: Widget, index: number) => {
         let widgetErrors = {};
-        let defaultTransformers = this.axios.defaults.transformResponse as AxiosTransformer[]
+        let defaultTransformers = this.axios.defaults.transformResponse as AxiosResponseTransformer[]
         let transformResponse = defaultTransformers.concat((data) => {
           data.notoast = true;
           return data
diff --git a/ui/src/views/Profile.vue b/ui/src/views/Profile.vue
index 16aacec..16d3aae 100644
--- a/ui/src/views/Profile.vue
+++ b/ui/src/views/Profile.vue
@@ -9,6 +9,7 @@ import Vue from "vue";
 import { UserData } from "@/client";
 import { API } from "@/services/api";
 import UserDataEditor from "@/components/UserDataEditor.vue";
+import axios, {AxiosResponseTransformer} from "axios";
 
 interface State {
   userdata?: UserData;
@@ -34,7 +35,12 @@ export default Vue.extend({
       });
     },
     loadUserData: function () {
-      API.currentUserData().then((response) => {
+      const defaultTransformers = axios.defaults.transformResponse as AxiosResponseTransformer[]
+      const transformResponse = defaultTransformers.concat((data) => {
+        data.notoast = true;
+        return data
+      });
+      API.currentUserData({transformResponse: transformResponse}).then((response) => {
         this.userdata = response.data;
       });
     }