From 283f54813646a4eafab89301555374b10d6489e8 Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Sat, 22 Jun 2024 20:54:45 -0400 Subject: [PATCH 1/7] add optional to publishIntervalSecs and positionPrecision --- src/validation/moduleConfig/mqtt.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/validation/moduleConfig/mqtt.ts b/src/validation/moduleConfig/mqtt.ts index 07f8da54..d018f5b9 100644 --- a/src/validation/moduleConfig/mqtt.ts +++ b/src/validation/moduleConfig/mqtt.ts @@ -1,6 +1,6 @@ import type { Message } from "@bufbuild/protobuf"; import type { Protobuf } from "@meshtastic/js"; -import { IsBoolean, IsString, Length, IsNumber } from "class-validator"; +import { IsBoolean, IsString, Length, IsNumber, IsOptional } from "class-validator"; export class MqttValidation implements @@ -46,9 +46,11 @@ export class MqttValidationMapReportSettings implements Omit { + @IsOptional() @IsNumber() publishIntervalSecs: number; + @IsOptional() @IsNumber() positionPrecision: number; } From a5a37cd4ab7db6163da235d260895697c3e24346 Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Sat, 22 Jun 2024 21:14:50 -0400 Subject: [PATCH 2/7] update setWorkingModuleConfig to include mapReportSettings --- src/components/PageComponents/ModuleConfig/MQTT.tsx | 5 ++++- src/validation/moduleConfig/mqtt.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/PageComponents/ModuleConfig/MQTT.tsx b/src/components/PageComponents/ModuleConfig/MQTT.tsx index 9653a2cb..b5343487 100644 --- a/src/components/PageComponents/ModuleConfig/MQTT.tsx +++ b/src/components/PageComponents/ModuleConfig/MQTT.tsx @@ -11,7 +11,10 @@ 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 index d018f5b9..fbeef623 100644 --- a/src/validation/moduleConfig/mqtt.ts +++ b/src/validation/moduleConfig/mqtt.ts @@ -46,11 +46,11 @@ export class MqttValidationMapReportSettings implements Omit { - @IsOptional() @IsNumber() + @IsOptional() publishIntervalSecs: number; - @IsOptional() @IsNumber() + @IsOptional() positionPrecision: number; } From 2f3739098567c6a11d892db1da2423bf08eb05df Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Tue, 25 Jun 2024 12:39:06 -0400 Subject: [PATCH 3/7] Linting --- src/components/PageComponents/ModuleConfig/MQTT.tsx | 5 ++++- src/validation/moduleConfig/mqtt.ts | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/PageComponents/ModuleConfig/MQTT.tsx b/src/components/PageComponents/ModuleConfig/MQTT.tsx index 281cf556..1dc324bb 100644 --- a/src/components/PageComponents/ModuleConfig/MQTT.tsx +++ b/src/components/PageComponents/ModuleConfig/MQTT.tsx @@ -13,7 +13,10 @@ export const MQTT = (): JSX.Element => { case: "mqtt", value: { ...data, - mapReportSettings: new Protobuf.ModuleConfig.ModuleConfig_MapReportSettings(data.mapReportSettings) + mapReportSettings: + new Protobuf.ModuleConfig.ModuleConfig_MapReportSettings( + data.mapReportSettings, + ), }, }, }), diff --git a/src/validation/moduleConfig/mqtt.ts b/src/validation/moduleConfig/mqtt.ts index d9876532..7a2c9170 100644 --- 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, IsOptional, IsString, Length } from "class-validator"; +import { + IsBoolean, + IsNumber, + IsOptional, + IsString, + Length, +} from "class-validator"; export class MqttValidation implements From 22c862fd08033ff358cab04dbf42bdb8dde8d6fa Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Tue, 25 Jun 2024 12:43:14 -0400 Subject: [PATCH 4/7] revert package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index d32ef6b7..392d8cd6 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,5 @@ "typescript": "^5.4.3", "vite": "^5.2.6", "vite-plugin-environment": "^1.1.3" - }, - "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a" + } } From 723c9ee5d81e5c85b3bd5c8767581ac21ea27d29 Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Tue, 25 Jun 2024 14:16:19 -0400 Subject: [PATCH 5/7] vercel fix --- vercel.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vercel.json b/vercel.json index 7ae9a3de..89a11a41 100644 --- a/vercel.json +++ b/vercel.json @@ -1,5 +1 @@ -{ - "github": { - "silent": true - } -} +{ "github": { "silent": true } } \ No newline at end of file From fdbcdd955b6358bb88f88e8d6c7003c996c171fe Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Tue, 25 Jun 2024 14:18:03 -0400 Subject: [PATCH 6/7] vercel fix v2 --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 89a11a41..29bf418c 100644 --- a/vercel.json +++ b/vercel.json @@ -1 +1 @@ -{ "github": { "silent": true } } \ No newline at end of file +{ "github": { "silent": true } } From 8893a196c2a074a1b4b578489d2bec2ac30c6308 Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Tue, 25 Jun 2024 14:31:37 -0400 Subject: [PATCH 7/7] ignore vercel.json in biome --- biome.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/biome.json b/biome.json index c0f18797..6d2c7f6c 100644 --- a/biome.json +++ b/biome.json @@ -4,7 +4,8 @@ "enabled": true }, "files": { - "ignoreUnknown": true + "ignoreUnknown": true, + "ignore": ["vercel.json"] }, "vcs": { "enabled": true,