Site: publish meter values as map (BC)

assets/js/components/BatterySettingsModal.vue

@@ -271,7 +271,7 @@ export default {
 		batterySoc: Number,
 		bufferStartSoc: Number,
 		batteryDischargeControl: Boolean,
-		battery: { type: Array, default: () => [] },
+		battery: Object,
 		batteryGridChargeLimit: Number,
 		smartCostType: String,
 		tariffGrid: Number,
@@ -302,7 +302,7 @@ export default {
 			return options;
 		},
 		controllable() {
-			return this.battery.some(({ controllable }) => controllable);
+			return Object.values(this.battery || {}).some(({ controllable }) => controllable);
 		},
 		gridChargePossible() {
 			return (
@@ -356,13 +356,13 @@ export default {
 			return this.prioritySoc;
 		},
 		batteryDetails() {
-			if (!Array.isArray(this.battery)) {
-				return;
-			}
-			return this.battery
+			const batteries = Object.values(this.battery || {});
+			if (batteries.length === 0) return;
+
+			return batteries
 				.filter(({ capacity }) => capacity > 0)
 				.map(({ soc, capacity }) => {
-					const multipleBatteries = this.battery.length > 1;
+					const multipleBatteries = batteries.length > 1;
 					const energy = this.fmtKWh(
 						(capacity / 100) * soc * 1e3,
 						true,

assets/js/components/Energyflow/Energyflow.vue

@@ -198,7 +198,6 @@ import formatter from "../../mixins/formatter";
 import AnimatedNumber from "../AnimatedNumber.vue";
 import settings from "../../settings";
 import { CO2_TYPE } from "../../units";
-import collector from "../../mixins/collector";
 
 export default {
 	name: "Energyflow",
@@ -207,17 +206,16 @@ export default {
 		EnergyflowEntry,
 		AnimatedNumber,
 	},
-	mixins: [formatter, collector],
+	mixins: [formatter],
 	props: {
 		gridConfigured: Boolean,
 		gridPower: { type: Number, default: 0 },
 		homePower: { type: Number, default: 0 },
 		pvConfigured: Boolean,
-		pv: { type: Array },
+		pv: { type: Object },
 		pvPower: { type: Number, default: 0 },
 		loadpointsCompact: { type: Array, default: () => [] },
 		batteryConfigured: { type: Boolean },
-		battery: { type: Array },
 		batteryPower: { type: Number, default: 0 },
 		batterySoc: { type: Number, default: 0 },
 		batteryDischargeControl: { type: Boolean },
@@ -305,10 +303,9 @@ export default {
 			return this.detailsOpen ? this.detailsCompleteHeight + "px" : 0;
 		},
 		pvTooltip() {
-			if (!Array.isArray(this.pv) || this.pv.length <= 1) {
-				return;
-			}
-			return this.pv.map(({ power }) => this.fmtKw(power, this.powerInKw));
+			const pvs = Object.values(this.pv || {});
+			if (pvs.length <= 1) return;
+			return pvs.map(({ power }) => this.fmtKw(power, this.powerInKw));
 		},
 		batteryFmt() {
 			return (soc) => this.fmtPercentage(soc, 0);

assets/js/components/Site.vue

@@ -68,14 +68,14 @@ export default {
 		gridPower: Number,
 		homePower: Number,
 		pvPower: Number,
-		pv: Array,
+		pv: Object,
 		batteryPower: Number,
 		batterySoc: Number,
 		batteryDischargeControl: Boolean,
 		batteryGridChargeLimit: Number,
 		batteryGridChargeActive: Boolean,
 		batteryMode: String,
-		battery: Array,
+		battery: Object,
 		gridCurrents: Array,
 		prioritySoc: Number,
 		bufferSoc: Number,
@@ -106,10 +106,10 @@ export default {
 	},
 	computed: {
 		batteryConfigured: function () {
-			return this.battery?.length > 0;
+			return Object.keys(this.battery || {}).length > 0;
 		},
 		pvConfigured: function () {
-			return this.pv?.length > 0;
+			return Object.keys(this.pv || {}).length > 0;
 		},
 		energyflow: function () {
 			return this.collectProps(Energyflow);

assets/js/components/TopNavigation.vue

@@ -142,7 +142,7 @@ export default {
 				return {};
 			},
 		},
-		battery: Array,
+		battery: Object,
 		fatal: Object,
 	},
 	data() {
@@ -152,7 +152,7 @@ export default {
 	},
 	computed: {
 		batteryConfigured: function () {
-			return this.battery?.length;
+			return Object.keys(this.battery || {}).length > 0;
 		},
 		logoutCount() {
 			return this.providerLogins.filter((login) => !login.loggedIn).length;

assets/js/views/App.vue

@@ -72,7 +72,7 @@ export default {
 			return store.state.version;
 		},
 		batteryModalAvailabe: function () {
-			return store.state.battery?.length;
+			return Object.keys(store.state.battery || {}).length > 0;
 		},
 		globalSettingsProps: function () {
 			return this.collectProps(GlobalSettingsModal, store.state);