Merge pull request #49 from Thymis-io/feat/settings-order

Explicit settings order
Thymis-io · Jul 12, 2024 · 89407cf · 89407cf
2 parents 4546a56 + b12b3b8
commit 89407cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/controller/thymis_controller/models/module.py b/controller/thymis_controller/models/module.py
@@ -10,6 +10,7 @@ class Setting(BaseModel):
     default: object
     description: str
     example: Optional[str] = None
+    order: int = 0
 
 
 class Module(BaseModel):

diff --git a/controller/thymis_controller/modules/thymis.py b/controller/thymis_controller/modules/thymis.py
@@ -29,6 +29,7 @@ class ThymisDevice(modules.Module):
         default="",
         description="The device type of the thymis device.",
         example="",
+        order=10,
     )
 
     device_name = models.Setting(
@@ -37,6 +38,7 @@ class ThymisDevice(modules.Module):
         default="",
         description="The device name of the thymis device.",
         example="",
+        order=20,
     )
 
     password = models.Setting(
@@ -45,6 +47,7 @@ class ThymisDevice(modules.Module):
         default="",
         description="The password of the thymis device.",
         example="",
+        order=30,
     )
 
     wifi_ssid = models.Setting(
@@ -53,6 +56,7 @@ class ThymisDevice(modules.Module):
         default="",
         description="The wifi ssid of the thymis device.",
         example="",
+        order=40,
     )
 
     wifi_password = models.Setting(
@@ -61,6 +65,7 @@ class ThymisDevice(modules.Module):
         default="",
         description="The wifi password of the thymis device.",
         example="",
+        order=50,
     )
 
     def write_nix_settings(self, f, module_settings: ModuleSettings, priority: int):

diff --git a/frontend/src/lib/state.ts b/frontend/src/lib/state.ts
@@ -17,6 +17,7 @@ export type Setting = {
 	default: string;
 	description: string;
 	example: string | null;
+	order: number;
 };
 
 export type Module = {

diff --git a/frontend/src/routes/config/+page.svelte b/frontend/src/routes/config/+page.svelte
@@ -135,6 +135,9 @@
 	$: if (selectedModule) {
 		console.log(selectedModule);
 		selectedModulesValidSettingkeys = Object.keys(selectedModule.settings);
+		selectedModulesValidSettingkeys.sort(
+			(a, b) => selectedModule.settings[a].order - selectedModule.settings[b].order
+		);
 		console.log(selectedModulesValidSettingkeys);
 	}