Merge pull request #252 from Hunter275/issue-251-mqtt-saving

Fix MQTT settings
meshtastic · Jun 26, 2024 · 2566395 · 2566395
2 parents 0dddf6a + 8893a19
commit 2566395
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/biome.json b/biome.json
@@ -4,7 +4,8 @@
     "enabled": true
   },
   "files": {
-    "ignoreUnknown": true
+    "ignoreUnknown": true,
+    "ignore": ["vercel.json"]
   },
   "vcs": {
     "enabled": true,

diff --git a/src/components/PageComponents/ModuleConfig/MQTT.tsx b/src/components/PageComponents/ModuleConfig/MQTT.tsx
@@ -11,7 +11,13 @@ export const MQTT = (): JSX.Element => {
       new Protobuf.ModuleConfig.ModuleConfig({
         payloadVariant: {
           case: "mqtt",
-          value: data,
+          value: {
+            ...data,
+            mapReportSettings:
+              new Protobuf.ModuleConfig.ModuleConfig_MapReportSettings(
+                data.mapReportSettings,
+              ),
+          },
         },
       }),
     );

diff --git a/src/validation/moduleConfig/mqtt.ts b/src/validation/moduleConfig/mqtt.ts
@@ -1,6 +1,12 @@
 import type { Message } from "@bufbuild/protobuf";
 import type { Protobuf } from "@meshtastic/js";
-import { IsBoolean, IsNumber, IsString, Length } from "class-validator";
+import {
+  IsBoolean,
+  IsNumber,
+  IsOptional,
+  IsString,
+  Length,
+} from "class-validator";
 
 export class MqttValidation
   implements
@@ -47,8 +53,10 @@ export class MqttValidationMapReportSettings
     Omit<Protobuf.ModuleConfig.ModuleConfig_MapReportSettings, keyof Message>
 {
   @IsNumber()
+  @IsOptional()
   publishIntervalSecs: number;
 
   @IsNumber()
+  @IsOptional()
   positionPrecision: number;
 }
diff --git a/vercel.json b/vercel.json
@@ -1,5 +1 @@
-{
-  "github": {
-    "silent": true
-  }
-}
+{ "github": { "silent": true } }