From e2b377f85c54b1cc1a776590f35704d4b42e00a9 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Tue, 18 Apr 2023 15:06:08 +0200
Subject: [PATCH] fix(status): Fix infinite loading of predefined statuses

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../src/components/PredefinedStatusesList.vue     | 15 ++++-----------
 apps/user_status/src/store/predefinedStatuses.js  |  6 +++++-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/user_status/src/components/PredefinedStatusesList.vue b/apps/user_status/src/components/PredefinedStatusesList.vue
index 6d62eee8b0c..a3ac3c68677 100644
--- a/apps/user_status/src/components/PredefinedStatusesList.vue
+++ b/apps/user_status/src/components/PredefinedStatusesList.vue
@@ -20,7 +20,7 @@
   -->
 
 <template>
-	<div v-if="hasLoaded"
+	<div v-if="statusesHaveLoaded"
 		class="predefined-statuses-list">
 		<PredefinedStatus v-for="status in predefinedStatuses"
 			:key="status.id"
@@ -38,7 +38,7 @@
 
 <script>
 import PredefinedStatus from './PredefinedStatus.vue'
-import { mapState } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 
 export default {
 	name: 'PredefinedStatusesList',
@@ -49,20 +49,13 @@ export default {
 		...mapState({
 			predefinedStatuses: state => state.predefinedStatuses.predefinedStatuses,
 		}),
-		/**
-		 * Indicator whether the predefined statuses have already been loaded
-		 *
-		 * @return {boolean}
-		 */
-		hasLoaded() {
-			return this.predefinedStatuses.length > 0
-		},
+		...mapGetters(['statusesHaveLoaded']),
 	},
 	/**
 	 * Loads all predefined statuses from the server
 	 * when this component is mounted
 	 */
-	mounted() {
+	created() {
 		this.$store.dispatch('loadAllPredefinedStatuses')
 	},
 	methods: {
diff --git a/apps/user_status/src/store/predefinedStatuses.js b/apps/user_status/src/store/predefinedStatuses.js
index 05d18b51771..0c540e5ddee 100644
--- a/apps/user_status/src/store/predefinedStatuses.js
+++ b/apps/user_status/src/store/predefinedStatuses.js
@@ -39,7 +39,11 @@ const mutations = {
 	},
 }
 
-const getters = {}
+const getters = {
+	statusesHaveLoaded(state) {
+		return state.predefinedStatuses.length > 0
+	},
+}
 
 const actions = {