From dc569c6d65e2a211681a4f0d17aea1874cef9268 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 19 Jul 2022 10:30:31 +0200
Subject: [PATCH] rename and move CollectSubsetGroup to IntegrateSubsetGroup in
 settings

---
 .../defaults/project_settings/global.json     |  22 ++--
 .../schemas/schema_global_publish.json        | 110 +++++++++---------
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index bdcf85d1b2..9247c6ceb6 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -20,17 +20,6 @@
             ],
             "skip_hosts_headless_publish": []
         },
-        "CollectSubsetGroup": {
-            "subset_grouping_profiles": [
-                {
-                    "families": [],
-                    "hosts": [],
-                    "task_types": [],
-                    "tasks": [],
-                    "template": ""
-                }
-            ]
-        },
         "ValidateEditorialAssetName": {
             "enabled": true,
             "optional": false
@@ -170,6 +159,17 @@
                 }
             ]
         },
+        "IntegrateSubsetGroup": {
+            "subset_grouping_profiles": [
+                {
+                    "families": [],
+                    "hosts": [],
+                    "task_types": [],
+                    "tasks": [],
+                    "template": ""
+                }
+            ]
+        },
         "IntegrateAssetNew": {
             "template_name_profiles": [
                 {
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index 41eb04be4e..af08bbec3c 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -39,61 +39,6 @@
                 }
             ]
         },
-        {
-            "type": "dict",
-            "collapsible": true,
-            "key": "CollectSubsetGroup",
-            "label": "Collect Subset Group",
-            "is_group": true,
-            "children": [
-                {
-                    "type": "list",
-                    "key": "subset_grouping_profiles",
-                    "label": "Subset grouping profiles",
-                    "use_label_wrap": true,
-                    "object_type": {
-                        "type": "dict",
-                        "children": [
-                            {
-                                "type": "label",
-                                "label": "Set all published instances as a part of specific group named according to 'Template'. <br>Implemented all variants of placeholders [{task},{family},{host},{subset},{renderlayer}]"
-                            },
-                            {
-                                "key": "families",
-                                "label": "Families",
-                                "type": "list",
-                                "object_type": "text"
-                            },
-                            {
-                                "type": "hosts-enum",
-                                "key": "hosts",
-                                "label": "Hosts",
-                                "multiselection": true
-                            },
-                            {
-                                "key": "task_types",
-                                "label": "Task types",
-                                "type": "task-types-enum"
-                            },
-                            {
-                                "key": "tasks",
-                                "label": "Task names",
-                                "type": "list",
-                                "object_type": "text"
-                            },
-                            {
-                                "type": "separator"
-                            },
-                            {
-                                "type": "text",
-                                "key": "template",
-                                "label": "Template"
-                            }
-                        ]
-                    }
-                }
-            ]
-        },
         {
             "type": "dict",
             "collapsible": true,
@@ -580,6 +525,61 @@
                 }
             ]
         },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "key": "IntegrateSubsetGroup",
+            "label": "Integrate Subset Group",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "list",
+                    "key": "subset_grouping_profiles",
+                    "label": "Subset grouping profiles",
+                    "use_label_wrap": true,
+                    "object_type": {
+                        "type": "dict",
+                        "children": [
+                            {
+                                "type": "label",
+                                "label": "Set all published instances as a part of specific group named according to 'Template'. <br>Implemented all variants of placeholders [{task},{family},{host},{subset},{renderlayer}]"
+                            },
+                            {
+                                "key": "families",
+                                "label": "Families",
+                                "type": "list",
+                                "object_type": "text"
+                            },
+                            {
+                                "type": "hosts-enum",
+                                "key": "hosts",
+                                "label": "Hosts",
+                                "multiselection": true
+                            },
+                            {
+                                "key": "task_types",
+                                "label": "Task types",
+                                "type": "task-types-enum"
+                            },
+                            {
+                                "key": "tasks",
+                                "label": "Task names",
+                                "type": "list",
+                                "object_type": "text"
+                            },
+                            {
+                                "type": "separator"
+                            },
+                            {
+                                "type": "text",
+                                "key": "template",
+                                "label": "Template"
+                            }
+                        ]
+                    }
+                }
+            ]
+        },
         {
             "type": "dict",
             "collapsible": true,