From 6f9c3384a43e52880f33b95eb5a8972f8f0f5ba2 Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Thu, 15 Feb 2024 21:05:13 +0100
Subject: [PATCH] Config UI: move generic meters to top (#12281)

---
 assets/js/components/Config/MeterModal.vue       | 16 +++++++++++++++-
 .../meter/sunspec-battery-control.yaml           |  4 ++--
 templates/definition/meter/sunspec-hybrid.yaml   |  4 ++--
 .../meter/sunspec-inverter-control.yaml          |  4 ++--
 templates/definition/meter/sunspec-inverter.yaml |  4 ++--
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/assets/js/components/Config/MeterModal.vue b/assets/js/components/Config/MeterModal.vue
index d72ee2494..d930bdd43 100644
--- a/assets/js/components/Config/MeterModal.vue
+++ b/assets/js/components/Config/MeterModal.vue
@@ -44,6 +44,16 @@
 									:disabled="!isNew"
 									class="form-select w-100"
 								>
+									<option
+										v-for="option in genericOptions"
+										:key="option.name"
+										:value="option.template"
+									>
+										{{ option.name }}
+									</option>
+									<option v-if="genericOptions.length" disabled>
+										──────────
+									</option>
 									<option
 										v-for="option in templateOptions"
 										:key="option.name"
@@ -52,6 +62,7 @@
 										{{ option.name }}
 									</option>
 								</select>
+								{{ templateName }}
 							</FormRow>
 							<p v-if="loadingTemplate">Loading ...</p>
 							<Modbus
@@ -198,7 +209,10 @@ export default {
 			return this.type || this.selectedType;
 		},
 		templateOptions() {
-			return this.products;
+			return this.products.filter((p) => p.group !== "generic");
+		},
+		genericOptions() {
+			return this.products.filter((p) => p.group === "generic");
 		},
 		templateParams() {
 			const params = this.template?.Params || [];
diff --git a/templates/definition/meter/sunspec-battery-control.yaml b/templates/definition/meter/sunspec-battery-control.yaml
index 31271bc57..2e9151599 100644
--- a/templates/definition/meter/sunspec-battery-control.yaml
+++ b/templates/definition/meter/sunspec-battery-control.yaml
@@ -1,8 +1,8 @@
 template: sunspec-battery-control
 products:
   - description:
-      de: Sunspec Batterie (Model 802)
-      en: Sunspec Battery (Model 802)
+      de: SunSpec Batterie (Model 802)
+      en: SunSpec Battery (Model 802)
 capabilities: ["battery-control"]
 group: generic
 params:
diff --git a/templates/definition/meter/sunspec-hybrid.yaml b/templates/definition/meter/sunspec-hybrid.yaml
index 4c44d1e03..42c531d7b 100644
--- a/templates/definition/meter/sunspec-hybrid.yaml
+++ b/templates/definition/meter/sunspec-hybrid.yaml
@@ -2,8 +2,8 @@ template: sunspec-hybrid
 covers: ["sunspec-hybrid-inverter"]
 products:
   - description:
-      de: Hybridwechselrichter
-      en: Hybrid Inverter
+      de: SunSpec Hybridwechselrichter
+      en: SunSpec Hybrid Inverter
 group: generic
 params:
   - name: usage
diff --git a/templates/definition/meter/sunspec-inverter-control.yaml b/templates/definition/meter/sunspec-inverter-control.yaml
index 30ff31ff4..364f4410c 100644
--- a/templates/definition/meter/sunspec-inverter-control.yaml
+++ b/templates/definition/meter/sunspec-inverter-control.yaml
@@ -1,8 +1,8 @@
 template: sunspec-inverter-control
 products:
   - description:
-      de: Sunspec Batterie (Model 124)
-      en: Sunspec Battery (Model 124)
+      de: SunSpec Batterie (Model 124)
+      en: SunSpec Battery (Model 124)
 capabilities: ["battery-control"]
 group: generic
 params:
diff --git a/templates/definition/meter/sunspec-inverter.yaml b/templates/definition/meter/sunspec-inverter.yaml
index 2f8be7caa..e5db0b52d 100644
--- a/templates/definition/meter/sunspec-inverter.yaml
+++ b/templates/definition/meter/sunspec-inverter.yaml
@@ -1,8 +1,8 @@
 template: sunspec-inverter
 products:
   - description:
-      de: Wechselrichter
-      en: Inverter
+      de: SunSpec Wechselrichter
+      en: SunSpec Inverter
 group: generic
 params:
   - name: usage