refactor(dashboard): Let the statuses and layout endpoints use a saner format

Signed-off-by: provokateurin <kate@provokateurin.de>

1 files changed, 10 insertions, 7 deletions

diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue
index c7143335078..b3dd3d285be 100644
--- a/apps/dashboard/src/DashboardApp.vue
+++ b/apps/dashboard/src/DashboardApp.vue
@@ -229,7 +229,7 @@ export default {
 			return (panel) => this.layout.indexOf(panel.id) > -1
 		},
 		isStatusActive() {
-			return (status) => !(status in this.enabledStatuses) || this.enabledStatuses[status]
+			return (status) => this.enabledStatuses.findIndex((s) => s === status) !== -1
 		},
 
 		sortedAllStatuses() {
@@ -350,12 +350,12 @@ export default {
 		},
 		saveLayout() {
 			axios.post(generateOcsUrl('/apps/dashboard/api/v3/layout'), {
-				layout: this.layout.join(','),
+				layout: this.layout,
 			})
 		},
 		saveStatuses() {
 			axios.post(generateOcsUrl('/apps/dashboard/api/v3/statuses'), {
-				statuses: JSON.stringify(this.enabledStatuses),
+				statuses: this.enabledStatuses,
 			})
 		},
 		showModal() {
@@ -395,15 +395,18 @@ export default {
 			}
 		},
 		enableStatus(app) {
-			this.enabledStatuses[app] = true
+			this.enabledStatuses.push(app)
 			this.registerStatus(app, this.allCallbacksStatus[app])
 			this.saveStatuses()
 		},
 		disableStatus(app) {
-			this.enabledStatuses[app] = false
-			const i = this.registeredStatus.findIndex((s) => s === app)
+			const i = this.enabledStatuses.findIndex((s) => s === app)
 			if (i !== -1) {
-				this.registeredStatus.splice(i, 1)
+				this.enabledStatuses.splice(i, 1)
+			}
+			const j = this.registeredStatus.findIndex((s) => s === app)
+			if (j !== -1) {
+				this.registeredStatus.splice(j, 1)
 				Vue.set(this.statuses, app, { mounted: false })
 				this.$nextTick(() => {
 					Vue.delete(this.callbacksStatus, app)