From 2dba044e48c5670fffe0562754dc108212d2e193 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 19 Sep 2022 13:49:01 +0200
Subject: [PATCH 1/4] OP-3943 - added publish field to Settings for PS
 CollectReview

Customer wants to configure if review should be published by default for Photoshop.
---
 .../defaults/project_settings/photoshop.json        |  3 +++
 .../projects_schema/schema_project_photoshop.json   | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/photoshop.json b/openpype/settings/defaults/project_settings/photoshop.json
index 552c2c9cad..3477d185a6 100644
--- a/openpype/settings/defaults/project_settings/photoshop.json
+++ b/openpype/settings/defaults/project_settings/photoshop.json
@@ -15,6 +15,9 @@
         "CollectInstances": {
             "flatten_subset_template": ""
         },
+        "CollectReview": {
+            "publish": true
+        },
         "ValidateContainers": {
             "enabled": true,
             "optional": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
index 7aa49c99a4..7294ba8608 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
@@ -131,6 +131,19 @@
                         }
                     ]
                 },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "CollectReview",
+                    "label": "Collect Review",
+                    "children": [
+                        {
+                            "type": "boolean",
+                            "key": "publish",
+                            "label": "Publish review"
+                        }
+                    ]
+                },
                 {
                     "type": "schema_template",
                     "name": "template_publish_plugin",

From 0d4549f7bf5af630eb1a6072471f0cd543e52ddb Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 19 Sep 2022 13:50:07 +0200
Subject: [PATCH 2/4] OP-3943 - added publish field to PS CollectReview

Customer wants to configure if review should be published by default for Photoshop.
Default could be set in Settings, artist might decide to override it for particular publish.
---
 openpype/hosts/photoshop/plugins/publish/collect_review.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/photoshop/plugins/publish/collect_review.py b/openpype/hosts/photoshop/plugins/publish/collect_review.py
index 7f395b46d7..7e598a8250 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_review.py
@@ -25,6 +25,8 @@ class CollectReview(pyblish.api.ContextPlugin):
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.1
 
+    publish = True
+
     def process(self, context):
         family = "review"
         subset = get_subset_name(
@@ -45,5 +47,6 @@ class CollectReview(pyblish.api.ContextPlugin):
             "family": family,
             "families": [],
             "representations": [],
-            "asset": os.environ["AVALON_ASSET"]
+            "asset": os.environ["AVALON_ASSET"],
+            "publish": self.publish
         })

From cefe853cc6c932771ffd9f2325c783942fbff3da Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 20 Sep 2022 11:29:23 +0200
Subject: [PATCH 3/4] OP-3943 - changed label to Active

Active label matches configuration for optional plugins. Collector cannot be optional, but Active matches to "Instance is collected but won't get published by default."
---
 .../schemas/projects_schema/schema_project_photoshop.json       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
index 7294ba8608..26b38fa2c6 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
@@ -140,7 +140,7 @@
                         {
                             "type": "boolean",
                             "key": "publish",
-                            "label": "Publish review"
+                            "label": "Active"
                         }
                     ]
                 },

From a317c8f5fd3766eddf11cc414643eff5fc975def Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 21 Sep 2022 15:21:10 +0200
Subject: [PATCH 4/4] OP-3943 - fix broken Settins schema

---
 .../schemas/projects_schema/schema_project_photoshop.json        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
index 6668406336..b768db30ee 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
@@ -145,6 +145,7 @@
                      ]
                  },
                  {
+                    "type": "dict",
                     "key": "CollectVersion",
                     "label": "Collect Version",
                     "children": [