From 0404e27e8eeb5eb598852d946c9d80bb36892dbf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 16:07:37 +0100
Subject: [PATCH] added product key to template formatting data

---
 client/ayon_core/hosts/maya/api/plugin.py  | 31 +++++++++++++---------
 client/ayon_core/settings/ayon_settings.py | 13 ---------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py
index e0ff900c01..01ca4f7875 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -611,33 +611,38 @@ class Loader(LoaderPlugin):
         options["attach_to_root"] = True
         custom_naming = self.load_settings[loader_key]
 
-        if not custom_naming['namespace']:
+        if not custom_naming["namespace"]:
             raise LoadError("No namespace specified in "
                             "Maya ReferenceLoader settings")
-        elif not custom_naming['group_name']:
+        elif not custom_naming["group_name"]:
             self.log.debug("No custom group_name, no group will be created.")
             options["attach_to_root"] = False
 
-        asset = context['asset']
-        subset = context['subset']
+        asset = context["asset"]
+        subset = context["subset"]
+        family = (
+            subset["data"].get("family")
+            or subset["data"]["families"][0]
+        )
         formatting_data = {
-            "asset_name": asset['name'],
-            "asset_type": asset['type'],
+            "asset_name": asset["name"],
+            "asset_type": asset["type"],
             "folder": {
                 "name": asset["name"],
             },
-            "subset": subset['name'],
-            "family": (
-                subset['data'].get('family') or
-                subset['data']['families'][0]
-            )
+            "subset": subset["name"],
+            "product": {
+                "name": subset["name"],
+                "type": family,
+            },
+            "family": family
         }
 
-        custom_namespace = custom_naming['namespace'].format(
+        custom_namespace = custom_naming["namespace"].format(
             **formatting_data
         )
 
-        custom_group_name = custom_naming['group_name'].format(
+        custom_group_name = custom_naming["group_name"].format(
             **formatting_data
         )
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 5d7a9e0356..1a353a5a64 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -351,19 +351,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     for key, color in tuple(load_colors.items()):
         load_colors[key] = _convert_color(color)
 
-    reference_loader = ayon_maya_load["reference_loader"]
-    reference_loader["namespace"] = (
-        reference_loader["namespace"]
-        .replace("{product[name]}", "{subset}")
-    )
-
-    if ayon_maya_load.get("import_loader"):
-        import_loader = ayon_maya_load["import_loader"]
-        import_loader["namespace"] = (
-            import_loader["namespace"]
-            .replace("{product[name]}", "{subset}")
-        )
-
     output["maya"] = ayon_maya