From cb3722552c4e2875365f237c36aee702af3bf39f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 7 Apr 2022 11:57:33 +0200
Subject: [PATCH] removed ftrackIntentLabel

---
 .../plugins/publish/collect_intent_label.py   | 78 -------------------
 .../publish/integrate_ftrack_description.py   | 12 ++-
 .../plugins/publish/integrate_ftrack_note.py  | 12 ++-
 3 files changed, 20 insertions(+), 82 deletions(-)
 delete mode 100644 openpype/modules/ftrack/plugins/publish/collect_intent_label.py

diff --git a/openpype/modules/ftrack/plugins/publish/collect_intent_label.py b/openpype/modules/ftrack/plugins/publish/collect_intent_label.py
deleted file mode 100644
index 8375fba15e..0000000000
--- a/openpype/modules/ftrack/plugins/publish/collect_intent_label.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""
-Requires:
-    context -> ftrackSession - connected ftrack.Session
-
-Provides:
-    context -> ftrackIntentLabel
-"""
-import json
-
-import six
-import pyblish.api
-
-
-class CollectFtrackIntentLabel(pyblish.api.ContextPlugin):
-    """ Collects an ftrack session and the current task id. """
-
-    order = pyblish.api.CollectorOrder + 0.49991
-    label = "Collect Ftrack Intent Label"
-
-    def process(self, context):
-        intent = context.data.get("intent")
-        if intent and isinstance(intent, dict):
-            intent_val = intent.get("value")
-            intent_label = intent.get("label")
-        else:
-            intent_val = intent_label = intent
-
-        session = context.data.get("ftrackSession")
-        if session is None:
-            context.data["ftrackIntentLabel"] = intent_label
-            self.log.info("Ftrack session is not available. Skipping.")
-            return
-
-        final_intent_label = None
-        if intent_val:
-            final_intent_label = self.get_intent_label(session, intent_val)
-
-        if final_intent_label is None:
-            final_intent_label = intent_label
-
-        context.data["ftrackIntentLabel"] = final_intent_label
-
-    def get_intent_label(self, session, intent_value):
-        if not intent_value:
-            return
-
-        intent_configurations = session.query(
-            "CustomAttributeConfiguration where key is intent"
-        ).all()
-        if not intent_configurations:
-            return
-
-        intent_configuration = intent_configurations[0]
-        if len(intent_configuration) > 1:
-            self.log.warning((
-                "Found more than one `intent` custom attribute."
-                " Using first found."
-            ))
-
-        config = intent_configuration.get("config")
-        if not config:
-            return
-
-        configuration = json.loads(config)
-        items = configuration.get("data")
-        if not items:
-            return
-
-        if isinstance(items, six.string_types):
-            items = json.loads(items)
-
-        intent_label = None
-        for item in items:
-            if item["value"] == intent_value:
-                intent_label = item["menu"]
-                break
-
-        return intent_label
diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_description.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_description.py
index 7e8371cd9d..c6a3d47f66 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_description.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_description.py
@@ -2,7 +2,6 @@
 Requires:
     context > comment
     context > ftrackSession
-    context > ftrackIntentLabel
     instance > ftrackIntegratedAssetVersionsData
 """
 
@@ -41,7 +40,16 @@ class IntegrateFtrackDescription(pyblish.api.InstancePlugin):
 
         session = instance.context.data["ftrackSession"]
 
-        intent_label = instance.context.data["ftrackIntentLabel"]
+        intent = instance.context.data.get("intent")
+        intent_label = None
+        if intent and isinstance(intent, dict):
+            intent_val = intent.get("value")
+            intent_label = intent.get("label")
+        else:
+            intent_val = intent
+
+        if not intent_label:
+            intent_label = intent_val or ""
 
         # if intent label is set then format comment
         # - it is possible that intent_label is equal to "" (empty string)
diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py
index 2fe97dc7ac..952b21546d 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py
@@ -5,7 +5,6 @@ Requires:
     context > appLabel
     context > comment
     context > ftrackSession
-    context > ftrackIntentLabel
     instance > ftrackIntegratedAssetVersionsData
 """
 
@@ -52,7 +51,16 @@ class IntegrateFtrackNote(pyblish.api.InstancePlugin):
 
         session = context.data["ftrackSession"]
 
-        intent_label = context.data["ftrackIntentLabel"]
+        intent = instance.context.data.get("intent")
+        intent_label = None
+        if intent and isinstance(intent, dict):
+            intent_val = intent.get("value")
+            intent_label = intent.get("label")
+        else:
+            intent_val = intent
+
+        if not intent_label:
+            intent_label = intent_val or ""
 
         # if intent label is set then format comment
         # - it is possible that intent_label is equal to "" (empty string)