From 09effd30fb2d22c519cd16b61b82dd46413454b4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 5 Mar 2024 16:16:52 +0100
Subject: [PATCH] Update column names and add new fields for better data
 representation in CSV ingest and creator plugins.

---
 .../plugins/create/create_csv_ingest.py       |  5 +-
 .../server/settings/creator_plugins.py        | 66 +++++++++----------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
index dd2339392f..00ff7e00ed 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
@@ -545,9 +545,9 @@ configuration in project settings.
 
         # Get optional columns
         thumbnail_path = self._get_row_value_with_validation(
-            "Thumbnail", row_data)
+            "Version Thumbnail", row_data)
         colorspace = self._get_row_value_with_validation(
-            "Colorspace", row_data)
+            "Representation Colorspace", row_data)
         comment = self._get_row_value_with_validation(
             "Version Comment", row_data)
         repre = self._get_row_value_with_validation(
@@ -583,7 +583,6 @@ configuration in project settings.
             "handleEnd": int(handle_end),
             "fps": float(fps),
         }
-
         return file_path, representation_data
 
     def _get_row_value_with_validation(
diff --git a/server_addon/traypublisher/server/settings/creator_plugins.py b/server_addon/traypublisher/server/settings/creator_plugins.py
index 82c4d37739..3a07a76e6f 100644
--- a/server_addon/traypublisher/server/settings/creator_plugins.py
+++ b/server_addon/traypublisher/server/settings/creator_plugins.py
@@ -198,6 +198,20 @@ DEFAULT_CREATORS = {
                     "required_column": True,
                     "validation_pattern": "^(.*)$"
                 },
+                {
+                    "name": "Product Type",
+                    "type": "text",
+                    "default": "",
+                    "required_column": False,
+                    "validation_pattern": "^(.*)$"
+                },
+                {
+                    "name": "Variant",
+                    "type": "text",
+                    "default": "",
+                    "required_column": False,
+                    "validation_pattern": "^(.*)$"
+                },
                 {
                     "name": "Version",
                     "type": "number",
@@ -205,6 +219,20 @@ DEFAULT_CREATORS = {
                     "required_column": True,
                     "validation_pattern": "^(\\d{1,3})$"
                 },
+                {
+                    "name": "Version Comment",
+                    "type": "text",
+                    "default": "",
+                    "required_column": False,
+                    "validation_pattern": "^(.*)$"
+                },
+                {
+                    "name": "Version Thumbnail",
+                    "type": "text",
+                    "default": "",
+                    "required_column": False,
+                    "validation_pattern": "^([a-zA-Z0-9#._\\/]*)$"
+                },
                 {
                     "name": "Frame Start",
                     "type": "number",
@@ -241,25 +269,11 @@ DEFAULT_CREATORS = {
                     "validation_pattern": "^[0-9]*\\.[0-9]+$|^[0-9]+$"
                 },
                 {
-                    "name": "Thumbnail",
-                    "type": "text",
-                    "default": "",
+                    "name": "Slate Exists",
+                    "type": "bool",
+                    "default": True,
                     "required_column": False,
-                    "validation_pattern": "^([a-z0-9#._\\/]*)$"
-                },
-                {
-                    "name": "Colorspace",
-                    "type": "text",
-                    "default": "",
-                    "required_column": False,
-                    "validation_pattern": "^(.*)$"
-                },
-                {
-                    "name": "Version Comment",
-                    "type": "text",
-                    "default": "",
-                    "required_column": False,
-                    "validation_pattern": "^(.*)$"
+                    "validation_pattern": "(True|False)"
                 },
                 {
                     "name": "Representation",
@@ -269,26 +283,12 @@ DEFAULT_CREATORS = {
                     "validation_pattern": "^(.*)$"
                 },
                 {
-                    "name": "Product Type",
+                    "name": "Representation Colorspace",
                     "type": "text",
                     "default": "",
                     "required_column": False,
                     "validation_pattern": "^(.*)$"
                 },
-                {
-                    "name": "Variant",
-                    "type": "text",
-                    "default": "",
-                    "required_column": False,
-                    "validation_pattern": "^(.*)$"
-                },
-                {
-                    "name": "Slate Exists",
-                    "type": "bool",
-                    "default": True,
-                    "required_column": False,
-                    "validation_pattern": "(True|False)"
-                },
                 {
                     "name": "Representation Tags",
                     "type": "text",