From c422176553ff27cff8d5113958fadf0dc4ddf12e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 17 Mar 2022 11:29:41 +0100
Subject: [PATCH] OP-2766 - removed hardcoded ftrack, CollectFtrackFamily
 should be used

Added defaults for Ftrack Settings.
---
 .../plugins/publish/collect_review.py         | 25 +++++++++++++------
 .../defaults/project_settings/ftrack.json     | 12 +++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/photoshop/plugins/publish/collect_review.py b/openpype/hosts/photoshop/plugins/publish/collect_review.py
index 5ab48b76da..4b6f855a6a 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_review.py
@@ -1,12 +1,24 @@
+"""
+Requires:
+    None
+
+Provides:
+    instance     -> family ("review")
+"""
+
 import os
 
 import pyblish.api
 
 
 class CollectReview(pyblish.api.ContextPlugin):
-    """Gather the active document as review instance."""
+    """Gather the active document as review instance.
 
-    label = "Review"
+    Triggers once even if no 'image' is published as by defaults it creates
+    flatten image from a workfile.
+    """
+
+    label = "Collect Review"
     order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
 
@@ -15,16 +27,13 @@ class CollectReview(pyblish.api.ContextPlugin):
         task = os.getenv("AVALON_TASK", None)
         subset = family + task.capitalize()
 
-        file_path = context.data["currentFile"]
-        base_name = os.path.basename(file_path)
-
         instance = context.create_instance(subset)
         instance.data.update({
             "subset": subset,
-            "label": base_name,
-            "name": base_name,
+            "label": subset,
+            "name": subset,
             "family": family,
-            "families": ["ftrack"],
+            "families": [],
             "representations": [],
             "asset": os.environ["AVALON_ASSET"]
         })
diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json
index 01831efad1..015413e64f 100644
--- a/openpype/settings/defaults/project_settings/ftrack.json
+++ b/openpype/settings/defaults/project_settings/ftrack.json
@@ -344,6 +344,18 @@
                     "tasks": [],
                     "add_ftrack_family": true,
                     "advanced_filtering": []
+                },
+                {
+                    "hosts": [
+                        "photoshop"
+                    ],
+                    "families": [
+                        "review"
+                    ],
+                    "task_types": [],
+                    "tasks": [],
+                    "add_ftrack_family": true,
+                    "advanced_filtering": []
                 }
             ]
         },