From baaaa50049c024dab19f0ceab88608d3411fdfe8 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 28 Aug 2020 16:11:51 -0400
Subject: [PATCH] Show error on hydration problem

---
 app/src/app.vue            | 14 ++++++++++++--
 app/src/stores/settings.ts |  6 ++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/app.vue b/app/src/app.vue
index 64e0de3271..784db96b0f 100644
--- a/app/src/app.vue
+++ b/app/src/app.vue
@@ -6,7 +6,15 @@
 			</div>
 		</transition>
 
-		<router-view v-if="!hydrating && appAccess" />
+		<v-info v-if="error" type="danger" :title="$t('unexpected_error')" icon="error" center>
+			{{ $t('unexpected_error_copy') }}
+
+			<template #append>
+				<v-error :error="error" />
+			</template>
+		</v-info>
+
+		<router-view v-else-if="!hydrating && appAccess" />
 
 		<v-info v-else-if="appAccess === false" center :title="$t('no_app_access')" type="danger" icon="block">
 			{{ $t('no_app_access_copy') }}
@@ -82,7 +90,9 @@ export default defineComponent({
 			return userStore.state.currentUser?.role?.app_access;
 		});
 
-		return { hydrating, brandStyle, appAccess };
+		const error = computed(() => appStore.state.error);
+
+		return { hydrating, brandStyle, appAccess, error };
 	},
 });
 </script>
diff --git a/app/src/stores/settings.ts b/app/src/stores/settings.ts
index e03eba37c5..b085496edf 100644
--- a/app/src/stores/settings.ts
+++ b/app/src/stores/settings.ts
@@ -11,8 +11,10 @@ export const useSettingsStore = createStore({
 	}),
 	actions: {
 		async hydrate() {
-			const response = await api.get(`/settings`, { params: { fields: ['*.*'] } });
-			this.state.settings = response.data.data;
+			try {
+				const response = await api.get(`/settings`, { params: { fields: ['*.*'] } });
+				this.state.settings = response.data.data;
+			} catch {}
 		},
 
 		async dehydrate() {