bugfix: colorpicker return object instead of string (fix #193)

Signed-off-by: Stefan Dej <meteyou@gmail.com>

src/components/panels/ToolsPanel.vue

@@ -361,10 +361,8 @@
                 }
             },
             setChartColor(value) {
-                if (
-                    "name" in this.editHeater.object &&
-                    typeof value === "string"
-                ) {
+                if ("name" in this.editHeater.object) {
+                    if (typeof value === "object" && 'hex' in value) value = value.hex
                     this.$store.commit('printer/tempHistory/setColor', { name: this.editHeater.object.name, value: value })
                     this.$store.dispatch('gui/setTempchartDatasetSetting', { name: this.editHeater.object.name, type: 'color', value: value })
                 }

src/store/gui/actions.js

@@ -5,8 +5,23 @@ export default {
 		commit('reset')
 	},
 
-	getData({ commit }, payload) {
+	getData({ commit, dispatch }, payload) {
 		commit('setData', payload)
+
+		if (
+			'state' in payload &&
+			'tempchart' in payload.state &&
+			'datasetSettings' in payload.state.tempchart
+		) {
+			for (const key of Object.keys(payload.state.tempchart.datasetSettings)) {
+				if (
+					'color' in payload.state.tempchart.datasetSettings[key] &&
+					typeof payload.state.tempchart.datasetSettings[key].color === "object"
+				) {
+					dispatch('setTempchartDatasetSetting', { name: key, type: 'color', value: payload.state.tempchart.datasetSettings[key].color.hex })
+				}
+			}
+		}
 	},
 
 	setSettings({ commit, dispatch }, payload) {

src/store/server/actions.js

@@ -12,16 +12,17 @@ export default {
 		Vue.prototype.$socket.sendObj('server.files.list', { root: 'config' }, 'server/checkMainsailJson')
 	},
 
-	checkMainsailJson({ commit, dispatch, rootState }, payload) {
+	checkMainsailJson({ dispatch, rootState }, payload) {
 		let boolFallback = true
 
 		Object.entries(payload).forEach(([, file]) => {
 			if ('filename' in file && file.filename === '.mainsail.json') {
 				boolFallback = false
+				window.console.log(".mainsail.json gefunden")
 
 				fetch('//'+rootState.socket.hostname+':'+rootState.socket.port+'/server/files/config/.mainsail.json?time='+Date.now())
 					.then(res => res.json()).then(file => {
-					commit('gui/setData', file, { root: true })
+					dispatch('gui/getData', file, { root: true })
 					if (!rootState.socket.remoteMode) dispatch('farm/readStoredPrinters', {}, { root: true })
 					dispatch('printer/init', null, { root: true })
 				})