From 0e331db93a0de805a55e88711d5d880f6281715e Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Wed, 1 Nov 2023 11:24:48 +0200
Subject: [PATCH] Adjust Houdini Shelves Ayon settings

---
 .../houdini/server/settings/shelves.py        | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/server_addon/houdini/server/settings/shelves.py b/server_addon/houdini/server/settings/shelves.py
index 651af27537..a0acc90505 100644
--- a/server_addon/houdini/server/settings/shelves.py
+++ b/server_addon/houdini/server/settings/shelves.py
@@ -21,32 +21,47 @@ class ShelfDefinitionModel(BaseSettingsModel):
         title="Shelf Tools"
     )
 
+
+class AddShelfFileModel(BaseSettingsModel):
+    shelf_set_source_path: MultiplatformPathModel = Field(
+        default_factory=MultiplatformPathModel,
+        title="Shelf Set Path"
+    )
+
+
+class AddSetAndDefinitionsModel(BaseSettingsModel):
+    shelf_set_name: str = Field(title="Shelf Set Name")
+    shelf_definition: list[ShelfDefinitionModel] = Field(
+        default_factory=list,
+        title="Shelves Definitions"
+    )
+
+
 def shelves_enum_options():
     return [
-        {"value": "add_shelf_file", "label": "Add a .shelf file"},
-        {"value": "add_set_and_definitions", "label": "Add Shelf Set Name and Shelves Definitions"}
+        {
+            "value": "add_shelf_file",
+            "label": "Add a .shelf file"
+        },
+        {
+            "value": "add_set_and_definitions",
+            "label": "Add Shelf Set Name and Shelves Definitions"
+        }
     ]
 
+
 class ShelvesModel(BaseSettingsModel):
-    _layout = "expanded"
     options: str = Field(
         title="Options",
         description="Switch between shelves manager options",
         enum_resolver=shelves_enum_options,
         conditionalEnum=True
     )
-    shelf_set_source_path: MultiplatformPathModel = Field(
-        default_factory=MultiplatformPathModel,
-        title="Shelf Set Path",
-        section="Option 1: Add a .shelf file."
+    add_shelf_file: AddShelfFileModel = Field(
+        title="Add a .shelf file",
+        default_factory=AddShelfFileModel
     )
-    shelf_set_name: str = Field(
-        "",
-        title="Shelf Set Name",
-        section=("OR Option 2: Add Shelf Set Name "
-                 "and Shelves Definitions.")
-    )
-    shelf_definition: list[ShelfDefinitionModel] = Field(
-        default_factory=list,
-        title="Shelves Definitions"
+    add_set_and_definitions: AddSetAndDefinitionsModel = Field(
+        title="Add Shelf Set Name and Shelves Definitions",
+        default_factory=AddSetAndDefinitionsModel
     )