show test results; wip

evcc-io · Oct 13, 2023 · 0cc5145 · 0cc5145
1 parent fe33ad3
commit 0cc5145
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/assets/js/components/Config/MeterModal.vue b/assets/js/components/Config/MeterModal.vue
@@ -95,6 +95,7 @@
 								:unknown="testUnknown"
 								:running="testRunning"
 								:result="testResult"
+								:error="testError"
 								@test="testManually"
 							/>
 
@@ -346,7 +347,7 @@ export default {
 			if (!this.isNew) {
 				url += `/merge/${this.id}`;
 			}
-			await api.post(url, this.apiData);
+			return await api.post(url, this.apiData);
 		},
 		async update() {
 			if (this.testUnknown) {

diff --git a/assets/js/components/Config/TestResult.vue b/assets/js/components/Config/TestResult.vue
@@ -26,6 +26,10 @@
 				{{ $t("config.validation.validate") }}
 			</a>
 		</div>
+		<hr v-if="error" />
+		<div v-if="error">
+			{{ error }}
+		</div>
 		<hr v-if="result" />
 		<div v-if="result">
 			{{ result }}
@@ -41,7 +45,8 @@ export default {
 		failed: Boolean,
 		unknown: Boolean,
 		running: Boolean,
-		result: String,
+		result: Object,
+		error: String,
 	},
 	emits: ["test"],
 };

diff --git a/assets/js/components/Config/VehicleModal.vue b/assets/js/components/Config/VehicleModal.vue
@@ -93,6 +93,7 @@
 								:unknown="testUnknown"
 								:running="testRunning"
 								:result="testResult"
+								:error="testError"
 								@test="testManually"
 							/>
 
@@ -306,7 +307,7 @@ export default {
 			if (!this.isNew) {
 				url += `/merge/${this.id}`;
 			}
-			await api.post(url, this.apiData);
+			return await api.post(url, this.apiData);
 		},
 		async update() {
 			if (this.testUnknown) {

diff --git a/assets/js/components/Config/mixins/test.js b/assets/js/components/Config/mixins/test.js
@@ -6,8 +6,9 @@ const TEST_RUNNING = "running";
 export default {
   data() {
     return {
-      testResult: "",
       testState: TEST_UNKNOWN,
+      testError: null,
+      testResult: null,
     };
   },
   computed: {
@@ -27,21 +28,34 @@ export default {
   methods: {
     resetTest() {
       this.testState = TEST_UNKNOWN;
+      this.testError = null;
       this.testResult = null;
     },
 
     async test(testApi) {
       if (!this.$refs.form.reportValidity()) return false;
       this.testState = TEST_RUNNING;
       try {
-        await testApi();
+        const res = await testApi();
+        const result = [];
+        for (const [key, { value, error }] of Object.entries(res.data.result)) {
+          if (error) {
+            this.testState = TEST_FAILED;
+            this.testResult = null;
+            this.testError = `${key}: ${error}`;
+            return false;
+          }
+          result.push({ key, value });
+        }
+        this.testResult = result;
+        this.testError = null;
         this.testState = TEST_SUCCESS;
-        this.testResult = null;
         return true;
       } catch (e) {
         console.error(e);
         this.testState = TEST_FAILED;
-        this.testResult = e.response?.data?.error || e.message;
+        this.testResult = null;
+        this.testError = e.response?.data?.error || e.message;
       }
       return false;
     },