From 6f68a7c38a8cca4fd6e81ab2e34a85e9f98c97f2 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 29 Mar 2021 14:25:21 +0200
Subject: [PATCH 1/2] removed usage of settings for ftrack mongo names

---
 pype/modules/ftrack/lib/settings.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pype/modules/ftrack/lib/settings.py b/pype/modules/ftrack/lib/settings.py
index 4afac9c29f..46854e8184 100644
--- a/pype/modules/ftrack/lib/settings.py
+++ b/pype/modules/ftrack/lib/settings.py
@@ -1,5 +1,7 @@
 from pype.api import get_system_settings
 
+PYPE_DATABASE_NAME = "pype"
+
 
 def get_ftrack_settings():
     return get_system_settings()["modules"]["ftrack"]
@@ -11,6 +13,6 @@ def get_ftrack_url_from_settings():
 
 def get_ftrack_event_mongo_info():
     ftrack_settings = get_ftrack_settings()
-    database_name = ftrack_settings["mongo_database_name"]
-    collection_name = ftrack_settings["mongo_collection_name"]
+    database_name = PYPE_DATABASE_NAME
+    collection_name = "ftrack_events"
     return database_name, collection_name

From b29dbc15b9a38550d2ef7b2b842da48648a170f8 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 29 Mar 2021 14:25:44 +0200
Subject: [PATCH 2/2] removed settings of ftrack mongo variables from settings

---
 .../defaults/system_settings/modules.json     |  2 --
 .../module_settings/schema_ftrack.json        | 25 ++++---------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json
index 8c4d7fe196..e285fce854 100644
--- a/pype/settings/defaults/system_settings/modules.json
+++ b/pype/settings/defaults/system_settings/modules.json
@@ -12,8 +12,6 @@
         "ftrack_server": "https://pype.ftrackapp.com",
         "ftrack_actions_path": [],
         "ftrack_events_path": [],
-        "mongo_database_name": "pype",
-        "mongo_collection_name": "ftrack_events",
         "intent": {
             "items": {
                 "-": "-",
diff --git a/pype/settings/entities/schemas/system_schema/module_settings/schema_ftrack.json b/pype/settings/entities/schemas/system_schema/module_settings/schema_ftrack.json
index 5647e14ebf..50ec330a11 100644
--- a/pype/settings/entities/schemas/system_schema/module_settings/schema_ftrack.json
+++ b/pype/settings/entities/schemas/system_schema/module_settings/schema_ftrack.json
@@ -35,24 +35,7 @@
             "object_type": "text"
         },
         {
-            "type": "splitter"
-        },
-        {
-            "type": "label",
-            "label": "Ftrack event server advanced settings"
-        },
-        {
-            "type": "text",
-            "key": "mongo_database_name",
-            "label": "Event Mongo DB"
-        },
-        {
-            "type": "text",
-            "key": "mongo_collection_name",
-            "label": "Events Mongo Collection"
-        },
-        {
-            "type": "splitter"
+            "type": "separator"
         },
         {
             "key": "intent",
@@ -71,13 +54,15 @@
                     "key": "items"
                 },
                 {
-                    "type": "label",
-                    "label": " "
+                    "type": "separator"
                 },
                 {
                     "key": "default",
                     "type": "text",
                     "label": "Default Intent"
+                },
+                {
+                    "type": "separator"
                 }
             ]
         },