added disk-setup specfic sanity checks

Fixes for removal of keys and restrictions.

README.md

@@ -2,7 +2,7 @@
 
 ## Demo
 
-[autopve_demo.webm](https://github.com/natankeddem/autopve/assets/44515217/827bdd22-5311-43c1-9452-a56fa11998aa)
+https://github.com/natankeddem/autopve/assets/44515217/7c766078-a69f-4dc3-889c-6d7113fd3421
 
 ## Information
 

autopve/tabs/settings.py

@@ -14,92 +14,96 @@ class Setting(Tab):
         super().__init__(answer, type=type)
 
     def _build(self):
-        self.key_picker()
+        self.keys_controls()
 
-    def key_picker(self):
+    def keys_controls(self):
-        def keys_controls():
+        with ui.column() as col:
-            with ui.column() as col:
+            col.tailwind.width("[560px]").align_items("center")
-                col.tailwind.width("[560px]").align_items("center")
+            with ui.card() as card:
-                with ui.card() as card:
+                card.tailwind.width("full")
-                    card.tailwind.width("full")
+                key_select = ui.select(list(self.keys.keys()), label="key", new_value_mode="add", with_input=True)
-                    key_select = ui.select(list(self.keys.keys()), label="key", new_value_mode="add", with_input=True)
+                key_select.tailwind.width("full")
-                    key_select.tailwind.width("full")
+                with ui.row() as row:
+                    row.tailwind.width("full").align_items("center").justify_content("between")
                     with ui.row() as row:
-                        row.tailwind.width("full").align_items("center").justify_content("between")
+                        row.tailwind.align_items("center")
-                        with ui.row() as row:
+                        self.help = None
-                            row.tailwind.align_items("center")
+                        key = el.FInput(label="key", on_change=lambda e: self.key_changed(e.value), read_only=True)
-                            self.help = None
+                        key.bind_value_from(key_select)
-                            key = el.FInput(label="key", on_change=lambda e: key_changed(e), read_only=True)
+                        with ui.button(icon="help"):
-                            key.bind_value_from(key_select)
+                            self.help = ui.tooltip("NA")
+                    ui.button(icon="add", on_click=lambda key=key: self.add_key(key.value))
+            ui.separator()
+            self._scroll = ui.scroll_area()
+            self._scroll.tailwind.width("full").height("[480px]")
+        items = storage.answer(self.answer)
+        if self.type is not None and self.type in items:
+            for key, value in items[self.type].items():
+                if isinstance(value, list):
+                    self.add_key(key, "[" + ",".join(str(v) for v in value) + "]")
+                else:
+                    self.add_key(key, str(value))
+
+    def add_key(self, key: str, value: str = ""):
+        if self.key_valid(key) is True:
+            with self._scroll:
+                with ui.row() as key_row:
+                    key_row.tailwind.width("full").align_items("center").justify_content("between")
+                    with ui.row() as row:
+                        row.tailwind.align_items("center")
+                        self._elements[key] = {
+                            "control": el.FInput(
+                                key,
+                                password=True if key == "root_password" else False,
+                                autocomplete=self.keys[key]["options"] if key in self.keys and "options" in self.keys[key] else None,
+                                on_change=lambda e, key=key: self.set_key(key, e.value),
+                            ),
+                            "row": key_row,
+                        }
+                        self._elements[key]["control"].value = value
+                        if key in self.keys:
                             with ui.button(icon="help"):
-                                self.help = ui.tooltip("NA")
+                                ui.tooltip(self.keys[key]["description"])
-                        ui.button(icon="add", on_click=lambda key=key: add_key(key.value))
+                    ui.button(icon="remove", on_click=lambda _, key=key: self.remove_key(key))
-                ui.separator()
-                self._scroll = ui.scroll_area()
-                self._scroll.tailwind.width("full").height("[480px]")
-            items = storage.answer(self.answer)
-            if self.type is not None and self.type in items:
-                for key, value in items[self.type].items():
-                    if isinstance(value, list):
-                        add_key(key, "[" + ",".join(str(v) for v in value) + "]")
-                    else:
-                        add_key(key, str(value))
 
-        def add_key(key: str, value: str = ""):
+    def key_valid(self, key: str) -> bool:
-            if key is not None and key != "" and key not in self._elements.keys():
+        if key is not None and key != "" and key not in self._elements.keys():
-                with self._scroll:
+            return True
-                    with ui.row() as key_row:
+        return False
-                        key_row.tailwind.width("full").align_items("center").justify_content("between")
-                        with ui.row() as row:
-                            row.tailwind.align_items("center")
-                            self._elements[key] = {
-                                "control": el.FInput(
-                                    key,
-                                    password=True if key == "root_password" else False,
-                                    autocomplete=self.keys[key]["options"] if key in self.keys and "options" in self.keys[key] else None,
-                                    on_change=lambda e, key=key: set_key(key, e.value),
-                                ),
-                                "row": key_row,
-                            }
-                            self._elements[key]["control"].value = value
-                            if key in self.keys:
-                                with ui.button(icon="help"):
-                                    ui.tooltip(self.keys[key]["description"])
-                        ui.button(icon="remove", on_click=lambda _, key=key: remove_key(key))
 
-        def remove_key(key):
+    def remove_key(self, key: str):
-            self._scroll.remove(self._elements[key]["row"])
+        self._scroll.remove(self._elements[key]["row"])
-            del self._elements[key]
+        del self._elements[key]
+        if key in storage.answer(self.answer)[self.type]:
+            del storage.answer(self.answer)[self.type][key]
 
-        def set_key(key, value: str):
+    def set_key(self, key: str, value: str):
-            v: Any = None
+        v: Any = ""
-            if len(value) > 0:
+        if len(value) > 0:
-                if key in self.keys and "type" in self.keys[key]:
+            if key in self.keys and "type" in self.keys[key]:
-                    if self.keys[key]["type"] == "list":
+                if self.keys[key]["type"] == "list":
-                        v = value[1:-1].split(",")
+                    v = value[1:-1].split(",")
-                    elif self.keys[key]["type"] == "int":
+                elif self.keys[key]["type"] == "int":
-                        v = int(value)
+                    v = int(value)
-                    else:
-                        v = value
                 else:
-                    if len(value) > 2 and value.strip()[0] == "[" and value.strip()[-1] == "]":
+                    v = value
-                        v = value[1:-1].split(",")
+            else:
-                    elif value.isnumeric():
+                if len(value) > 2 and value.strip()[0] == "[" and value.strip()[-1] == "]":
-                        v = int(value)
+                    v = value[1:-1].split(",")
-                    else:
+                elif value.isnumeric():
-                        v = value
+                    v = int(value)
-            if self.type not in storage.answer(self.answer):
-                storage.answer(self.answer)[self.type] = {}
-            storage.answer(self.answer)[self.type][key] = v
-
-        def key_changed(e):
-            if self.help is not None:
-                if e.value in self.keys:
-                    self.help.text = self.keys[e.value]["description"]
                 else:
-                    self.help.text = "NA"
+                    v = value
+        if self.type not in storage.answer(self.answer):
+            storage.answer(self.answer)[self.type] = {}
+        storage.answer(self.answer)[self.type][key] = v
 
-        keys_controls()
+    def key_changed(self, value: str):
+        if self.help is not None:
+            if value in self.keys:
+                self.help.text = self.keys[value]["description"]
+            else:
+                self.help.text = "NA"
 
 
 class Global(Setting):
@@ -163,3 +167,14 @@ class Disk(Setting):
             "btrfs.hdsize": {"description": ""},
         }
         super().__init__(answer, type="disk-setup", keys=keys)
+
+    def key_valid(self, key: str) -> bool:
+        if super().key_valid(key) is True:
+            if "filter" in key and "disk_list" in self._elements.keys():
+                el.Notification(f"Can not add {key} when disk_list is utilized!", type="negative", timeout=5)
+                return False
+            elif key == "disk_list" and any("filter" in k for k in self._elements.keys()):
+                el.Notification("Can not add disk_list when a filter is utilized!", type="negative", timeout=5)
+                return False
+            return True
+        return False

autopve/tabs/system.py

@@ -48,13 +48,11 @@ class System(Tab):
                 with self.scroll:
                     with ui.row() as row:
                         row.tailwind.width("full").align_items("center").justify_content("between")
-                        with ui.row() as row:
+                        self._elements[restriction] = {
-                            row.tailwind.align_items("center")
+                            "control": el.FInput(value=restriction, read_only=True),
-                            self._elements[restriction] = {
+                            "row": row,
-                                "control": el.FInput(value=restriction, read_only=True),
+                        }
-                                "row": row,
+                        self._elements[restriction]["control"].tailwind.width("[420px]")
-                            }
-                            self._elements[restriction]["control"].tailwind.width("[420px]")
                         ui.button(icon="remove", on_click=lambda _, r=restriction: remove_restriction(r))
                 if self.type not in storage.answer(self.answer):
                     storage.answer(self.answer)[self.type] = []

main.py

@@ -102,6 +102,12 @@ async def post_answer(request: Request) -> PlainTextResponse:
             if "network" in default_data and "network" in answer_data:
                 default_data["network"].update(answer_data["network"])
             if "disk-setup" in default_data and "disk-setup" in answer_data:
+                if any("filter" in k for k in answer_data["disk-setup"]):
+                    del default_data["disk-setup"]["disk_list"]
+                if "disk_list" in answer_data["disk-setup"]:
+                    for key in list(default_data["disk-setup"].keys()):
+                        if "filter" in key:
+                            del default_data["disk-setup"][key]
                 default_data["disk-setup"].update(answer_data["disk-setup"])
             return response(answer, system_info, default_data)
     return response("Default", system_info, default_data)