From 856aa31231c364d1957e6e2e07e53cbc45532faf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:57:40 +0200
Subject: [PATCH] change order of arguments

---
 client/ayon_core/tools/loader/abstract.py          | 14 ++++++++------
 client/ayon_core/tools/loader/control.py           |  6 ++++--
 .../ayon_core/tools/loader/ui/products_widget.py   |  3 ++-
 client/ayon_core/tools/loader/ui/repres_widget.py  |  3 ++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/tools/loader/abstract.py b/client/ayon_core/tools/loader/abstract.py
index 9bff8dbb2d..a58ddf11d7 100644
--- a/client/ayon_core/tools/loader/abstract.py
+++ b/client/ayon_core/tools/loader/abstract.py
@@ -324,9 +324,9 @@ class ActionItem:
         label (str): Action label.
         icon (dict[str, Any]): Action icon definition.
         tooltip (str): Action tooltip.
+        order (int): Action order.
         options (Union[list[AbstractAttrDef], list[qargparse.QArgument]]):
             Action options. Note: 'qargparse' is considered as deprecated.
-        order (int): Action order.
 
     """
     def __init__(
@@ -338,8 +338,8 @@ class ActionItem:
         label,
         icon,
         tooltip,
-        options,
         order,
+        options,
     ):
         self.plugin_identifier = plugin_identifier
         self.identifier = identifier
@@ -348,8 +348,8 @@ class ActionItem:
         self.label = label
         self.icon = icon
         self.tooltip = tooltip
-        self.options = options
         self.order = order
+        self.options = options
 
     def _options_to_data(self):
         options = self.options
@@ -377,8 +377,8 @@ class ActionItem:
             "label": self.label,
             "icon": self.icon,
             "tooltip": self.tooltip,
-            "options": options,
             "order": self.order,
+            "options": options,
         }
 
     @classmethod
@@ -998,12 +998,13 @@ class FrontendLoaderController(_BaseLoaderController):
         self,
         plugin_identifier: str,
         identifier: str,
-        options: dict[str, Any],
         project_name: str,
         entity_ids: set[str],
         entity_type: str,
         selected_ids: set[str],
         selected_entity_type: str,
+        options: dict[str, Any],
+        form_values: dict[str, Any],
     ):
         """Trigger action item.
 
@@ -1023,12 +1024,13 @@ class FrontendLoaderController(_BaseLoaderController):
         Args:
             plugin_identifier (sttr): Plugin identifier.
             identifier (sttr): Action identifier.
-            options (dict[str, Any]): Action option values from UI.
             project_name (str): Project name.
             entity_ids (set[str]): Entity ids stored on action item.
             entity_type (str): Entity type stored on action item.
             selected_ids (set[str]): Selected entity ids.
             selected_entity_type (str): Selected entity type.
+            options (dict[str, Any]): Action option values from UI.
+            form_values (dict[str, Any]): Action form values from UI.
 
         """
         pass
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 900eaf7656..7ca25976b9 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -309,12 +309,13 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
         self,
         plugin_identifier: str,
         identifier: str,
-        options: dict[str, Any],
         project_name: str,
         entity_ids: set[str],
         entity_type: str,
         selected_ids: set[str],
         selected_entity_type: str,
+        options: dict[str, Any],
+        form_values: dict[str, Any],
     ):
         if self._sitesync_model.is_sitesync_action(plugin_identifier):
             self._sitesync_model.trigger_action_item(
@@ -327,12 +328,13 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
         self._loader_actions_model.trigger_action_item(
             plugin_identifier,
             identifier,
-            options,
             project_name,
             entity_ids,
             entity_type,
             selected_ids,
             selected_entity_type,
+            options,
+            form_values,
         )
 
     # Selection model wrappers
diff --git a/client/ayon_core/tools/loader/ui/products_widget.py b/client/ayon_core/tools/loader/ui/products_widget.py
index 29bab7d0c5..319108e8ea 100644
--- a/client/ayon_core/tools/loader/ui/products_widget.py
+++ b/client/ayon_core/tools/loader/ui/products_widget.py
@@ -440,12 +440,13 @@ class ProductsWidget(QtWidgets.QWidget):
         self._controller.trigger_action_item(
             action_item.plugin_identifier,
             action_item.identifier,
-            options,
             project_name,
             action_item.entity_ids,
             action_item.entity_type,
             version_ids,
             "version",
+            options,
+            {},
         )
 
     def _on_selection_change(self):
diff --git a/client/ayon_core/tools/loader/ui/repres_widget.py b/client/ayon_core/tools/loader/ui/repres_widget.py
index d1d9c73a2b..bfbcc73503 100644
--- a/client/ayon_core/tools/loader/ui/repres_widget.py
+++ b/client/ayon_core/tools/loader/ui/repres_widget.py
@@ -401,10 +401,11 @@ class RepresentationsWidget(QtWidgets.QWidget):
         self._controller.trigger_action_item(
             action_item.plugin_identifier,
             action_item.identifier,
-            options,
             self._selected_project_name,
             action_item.entity_ids,
             action_item.entity_type,
             repre_ids,
             "representation",
+            options,
+            {},
         )