From 9c3dec09c9382aa210f59583081e7224b0e8ec22 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:53:36 +0100
Subject: [PATCH] small cleanup

---
 client/ayon_core/tools/launcher/control.py | 23 +++++++++++-----------
 client/ayon_core/tools/loader/control.py   |  4 +++-
 client/ayon_core/tools/loader/ui/window.py |  2 --
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/client/ayon_core/tools/launcher/control.py b/client/ayon_core/tools/launcher/control.py
index 85b362f9d7..f4656de787 100644
--- a/client/ayon_core/tools/launcher/control.py
+++ b/client/ayon_core/tools/launcher/control.py
@@ -1,10 +1,14 @@
 from typing import Optional
 
-from ayon_core.lib import Logger, get_ayon_username
+from ayon_core.lib import Logger
 from ayon_core.lib.events import QueuedEventSystem
 from ayon_core.addon import AddonsManager
 from ayon_core.settings import get_project_settings, get_studio_settings
-from ayon_core.tools.common_models import ProjectsModel, HierarchyModel
+from ayon_core.tools.common_models import (
+    ProjectsModel,
+    HierarchyModel,
+    UsersModel,
+)
 
 from .abstract import (
     AbstractLauncherFrontEnd,
@@ -30,13 +34,12 @@ class BaseLauncherController(
 
         self._addons_manager = None
 
-        self._username = NOT_SET
-
         self._selection_model = LauncherSelectionModel(self)
         self._projects_model = ProjectsModel(self)
         self._hierarchy_model = HierarchyModel(self)
         self._actions_model = ActionsModel(self)
         self._workfiles_model = WorkfilesModel(self)
+        self._users_model = UsersModel(self)
 
     @property
     def log(self):
@@ -209,6 +212,7 @@ class BaseLauncherController(
 
         self._projects_model.reset()
         self._hierarchy_model.reset()
+        self._users_model.reset()
 
         self._actions_model.refresh()
         self._projects_model.refresh()
@@ -229,8 +233,10 @@ class BaseLauncherController(
 
         self._emit_event("controller.refresh.actions.finished")
 
-    def get_my_tasks_entity_ids(self, project_name: str):
-        username = self._get_my_username()
+    def get_my_tasks_entity_ids(
+        self, project_name: str
+    ) -> dict[str, list[str]]:
+        username = self._users_model.get_current_username()
         assignees = []
         if username:
             assignees.append(username)
@@ -238,10 +244,5 @@ class BaseLauncherController(
             project_name, assignees
         )
 
-    def _get_my_username(self):
-        if self._username is NOT_SET:
-            self._username = get_ayon_username()
-        return self._username
-
     def _emit_event(self, topic, data=None):
         self.emit_event(topic, data, "controller")
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 2a86a50b6d..d0cc9db2f5 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -244,7 +244,9 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
             output[folder_id] = label
         return output
 
-    def get_my_tasks_entity_ids(self, project_name: str):
+    def get_my_tasks_entity_ids(
+        self, project_name: str
+    ) -> dict[str, list[str]]:
         username = self._users_model.get_current_username()
         assignees = []
         if username:
diff --git a/client/ayon_core/tools/loader/ui/window.py b/client/ayon_core/tools/loader/ui/window.py
index d1d1222f51..48704e7481 100644
--- a/client/ayon_core/tools/loader/ui/window.py
+++ b/client/ayon_core/tools/loader/ui/window.py
@@ -427,7 +427,6 @@ class LoaderWindow(QtWidgets.QWidget):
         self._folders_widget.set_name_filter(text)
 
     def _on_my_tasks_checkbox_state_changed(self, enabled: bool) -> None:
-        # self._folders_widget
         folder_ids = None
         task_ids = None
         if enabled:
@@ -439,7 +438,6 @@ class LoaderWindow(QtWidgets.QWidget):
         self._folders_widget.set_folder_ids_filter(folder_ids)
         self._tasks_widget.set_task_ids_filter(task_ids)
 
-
     def _on_product_group_change(self):
         self._products_widget.set_enable_grouping(
             self._product_group_checkbox.isChecked()