From d8c8f7f0ec9687afa782eb3fa225e50186a85fc0 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:23:10 +0100
Subject: [PATCH] max 'ValidateLoadedPlugin' can use AYON settings

---
 .../max/plugins/publish/validate_loaded_plugin.py    | 12 ++++++++++--
 client/ayon_core/settings/ayon_settings.py           | 10 ----------
 server_addon/max/server/settings/publishers.py       |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
index fe6e32b27b..bf5ac26fef 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
@@ -25,7 +25,7 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
     optional = True
     actions = [RepairAction]
 
-    family_plugins_mapping = {}
+    family_plugins_mapping = []
 
     @classmethod
     def get_invalid(cls, instance):
@@ -34,6 +34,12 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
         if not family_plugins_mapping:
             return
 
+        # Backward compatibility - settings did have 'product_types'
+        if "product_types" in family_plugins_mapping:
+            family_plugins_mapping["families"] = family_plugins_mapping.pop(
+                "product_types"
+            )
+
         invalid = []
         # Find all plug-in requirements for current instance
         instance_families = {instance.data["family"]}
@@ -47,7 +53,9 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
             if not mapping:
                 return
 
-            match_families = {fam.strip() for fam in mapping["families"]}
+            match_families = {
+                fam.strip() for fam in mapping["families"]
+            }
             has_match = "*" in match_families or match_families.intersection(
                 instance_families)
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 4d79e922b3..02442645bb 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -297,16 +297,6 @@ def _convert_3dsmax_project_settings(ayon_settings, output):
         return
 
     ayon_max = ayon_settings["max"]
-    _convert_host_imageio(ayon_max)
-    # --- Publish (START) ---
-    ayon_publish = ayon_max["publish"]
-
-    if "ValidateLoadedPlugin" in ayon_publish:
-        loaded_plugin = (
-            ayon_publish["ValidateLoadedPlugin"]["family_plugins_mapping"]
-        )
-        for item in loaded_plugin:
-            item["families"] = item.pop("product_types")
 
     output["max"] = ayon_max
 
diff --git a/server_addon/max/server/settings/publishers.py b/server_addon/max/server/settings/publishers.py
index da782cb494..e8a48ec3d1 100644
--- a/server_addon/max/server/settings/publishers.py
+++ b/server_addon/max/server/settings/publishers.py
@@ -28,9 +28,9 @@ class ValidateAttributesModel(BaseSettingsModel):
 
 
 class FamilyMappingItemModel(BaseSettingsModel):
-    product_types: list[str] = SettingsField(
+    families: list[str] = SettingsField(
         default_factory=list,
-        title="Product Types"
+        title="Families"
     )
     plugins: list[str] = SettingsField(
         default_factory=list,