From 211d64c3dea458b18ba268a66fa2e292dcf0ed7d Mon Sep 17 00:00:00 2001
From: Mustafa-Zarkash <mustafataherzaky@outlook.com>
Date: Wed, 18 Oct 2023 11:39:31 +0300
Subject: [PATCH] align houdini shelves manager in OP and Ayon

---
 .../schemas/schema_houdini_scriptshelf.json   |  6 ++++-
 .../houdini/server/settings/shelves.py        | 25 +++++++------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
index bab9b604b4..35d768843d 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
@@ -40,6 +40,10 @@
                             "object_type": {
                                 "type": "dict",
                                 "children": [
+                                    {
+                                        "type": "label",
+                                        "label": "Name and Script Path are mandatory."
+                                    },
                                     {
                                         "type": "text",
                                         "key": "label",
@@ -68,4 +72,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/server_addon/houdini/server/settings/shelves.py b/server_addon/houdini/server/settings/shelves.py
index c8bda515f9..ac7922e058 100644
--- a/server_addon/houdini/server/settings/shelves.py
+++ b/server_addon/houdini/server/settings/shelves.py
@@ -1,23 +1,16 @@
 from pydantic import Field
 from ayon_server.settings import (
     BaseSettingsModel,
-    MultiplatformPathModel,
-    MultiplatformPathListModel,
+    MultiplatformPathModel
 )
 
 
 class ShelfToolsModel(BaseSettingsModel):
-    name: str = Field(title="Name")
-    help: str = Field(title="Help text")
-    # TODO: The following settings are not compatible with OP
-    script: MultiplatformPathModel = Field(
-        default_factory=MultiplatformPathModel,
-        title="Script Path "
-    )
-    icon: MultiplatformPathModel = Field(
-        default_factory=MultiplatformPathModel,
-        title="Icon Path "
-    )
+    """Name and Script Path are mandatory."""
+    label: str = Field(title="Name")
+    script: str = Field(title="Script Path")
+    icon: str = Field( "", title="Icon Path")
+    help: str = Field("", title="Help text")
 
 
 class ShelfDefinitionModel(BaseSettingsModel):
@@ -31,10 +24,10 @@ class ShelfDefinitionModel(BaseSettingsModel):
 
 class ShelvesModel(BaseSettingsModel):
     _layout = "expanded"
-    shelf_set_name: str = Field(title="Shelfs set name")
+    shelf_set_name: str = Field("", title="Shelfs set name")
 
-    shelf_set_source_path: MultiplatformPathListModel = Field(
-        default_factory=MultiplatformPathListModel,
+    shelf_set_source_path: MultiplatformPathModel = Field(
+        default_factory=MultiplatformPathModel,
         title="Shelf Set Path (optional)"
     )