From d490187178b4d5b2b5acbaf7af6e2f3b1277a21f Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 1 Jul 2024 20:52:34 +0200
Subject: [PATCH] Remove optional/active state because it's all based on the
 "Enabled" state of the USD Contribution toggle

---
 server/settings/publish_plugins.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index edaac88274..36bb3f7340 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -68,7 +68,8 @@ class ContributionLayersModel(BaseSettingsModel):
                     "layer on top.")
 
 
-class CollectUSDLayerContributionsModel(ValidateBaseModel):
+class CollectUSDLayerContributionsModel(BaseSettingsModel):
+    enabled: bool = SettingsField(True, title="Enabled")
     contribution_layers: list[ContributionLayersModel] = SettingsField(
         title="Department Layer Orders",
         description=(
@@ -914,8 +915,6 @@ DEFAULT_PUBLISH_VALUES = {
     },
     "CollectUSDLayerContributions": {
         "enabled": True,
-        "optional": False,
-        "active": True,
         "contribution_layers": [
             # Asset layers
             {"name": "model", "order": 100},