Merge branch 'develop' into enhancement/874-publisher-editorial-linked-instances-with-grouping-view

client/ayon_core/tools/workfiles/control.py

@@ -3,25 +3,26 @@ import os
 import ayon_api
 
 from ayon_core.host import IWorkfileHost
-from ayon_core.lib import Logger
+from ayon_core.lib import Logger, get_ayon_username
 from ayon_core.lib.events import QueuedEventSystem
-from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import Anatomy, registered_host
 from ayon_core.pipeline.context_tools import get_global_context
-
+from ayon_core.settings import get_project_settings
 from ayon_core.tools.common_models import (
-    HierarchyModel,
     HierarchyExpectedSelection,
+    HierarchyModel,
     ProjectsModel,
     UsersModel,
 )
 
 from .abstract import (
-    AbstractWorkfilesFrontend,
     AbstractWorkfilesBackend,
+    AbstractWorkfilesFrontend,
 )
 from .models import SelectionModel, WorkfilesModel
 
+NOT_SET = object()
+
 
 class WorkfilesToolExpectedSelection(HierarchyExpectedSelection):
     def __init__(self, controller):
@@ -143,6 +144,7 @@ class BaseWorkfileController(
         self._project_settings = None
         self._event_system = None
         self._log = None
+        self._username = NOT_SET
 
         self._current_project_name = None
         self._current_folder_path = None
@@ -588,6 +590,20 @@ class BaseWorkfileController(
             description,
         )
 
+    def get_my_tasks_entity_ids(self, project_name: str):
+        username = self._get_my_username()
+        assignees = []
+        if username:
+            assignees.append(username)
+        return self._hierarchy_model.get_entity_ids_for_assignees(
+            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")
 

client/ayon_core/tools/workfiles/widgets/window.py

@@ -1,21 +1,21 @@
-from qtpy import QtCore, QtWidgets, QtGui
 
-from ayon_core import style, resources
-from ayon_core.tools.utils import (
-    PlaceholderLineEdit,
-    MessageOverlayObject,
-)
+from qtpy import QtCore, QtGui, QtWidgets
 
-from ayon_core.tools.workfiles.control import BaseWorkfileController
+from ayon_core import resources, style
 from ayon_core.tools.utils import (
-    GoToCurrentButton,
-    RefreshButton,
     FoldersWidget,
+    GoToCurrentButton,
+    MessageOverlayObject,
+    NiceCheckbox,
+    PlaceholderLineEdit,
+    RefreshButton,
     TasksWidget,
 )
+from ayon_core.tools.utils.lib import checkstate_int_to_enum
+from ayon_core.tools.workfiles.control import BaseWorkfileController
 
-from .side_panel import SidePanelWidget
 from .files_widget import FilesWidget
+from .side_panel import SidePanelWidget
 from .utils import BaseOverlayFrame
 
 
@@ -107,7 +107,7 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
         split_widget.addWidget(tasks_widget)
         split_widget.addWidget(col_3_widget)
         split_widget.addWidget(side_panel)
-        split_widget.setSizes([255, 175, 550, 190])
+        split_widget.setSizes([350, 175, 550, 190])
 
         body_layout.addWidget(split_widget)
 
@@ -157,6 +157,8 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
         self._home_body_widget = home_body_widget
         self._split_widget = split_widget
 
+        self._project_name = self._controller.get_current_project_name()
+
         self._tasks_widget = tasks_widget
         self._side_panel = side_panel
 
@@ -186,11 +188,24 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
             controller, col_widget, handle_expected_selection=True
         )
 
+        my_tasks_tooltip = (
+            "Filter folders and task to only those you are assigned to."
+        )
+
+        my_tasks_label = QtWidgets.QLabel("My tasks")
+        my_tasks_label.setToolTip(my_tasks_tooltip)
+
+        my_tasks_checkbox = NiceCheckbox(folder_widget)
+        my_tasks_checkbox.setChecked(False)
+        my_tasks_checkbox.setToolTip(my_tasks_tooltip)
+
         header_layout = QtWidgets.QHBoxLayout(header_widget)
         header_layout.setContentsMargins(0, 0, 0, 0)
         header_layout.addWidget(folder_filter_input, 1)
         header_layout.addWidget(go_to_current_btn, 0)
         header_layout.addWidget(refresh_btn, 0)
+        header_layout.addWidget(my_tasks_label, 0)
+        header_layout.addWidget(my_tasks_checkbox, 0)
 
         col_layout = QtWidgets.QVBoxLayout(col_widget)
         col_layout.setContentsMargins(0, 0, 0, 0)
@@ -200,6 +215,9 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
         folder_filter_input.textChanged.connect(self._on_folder_filter_change)
         go_to_current_btn.clicked.connect(self._on_go_to_current_clicked)
         refresh_btn.clicked.connect(self._on_refresh_clicked)
+        my_tasks_checkbox.stateChanged.connect(
+            self._on_my_tasks_checkbox_state_changed
+        )
 
         self._folder_filter_input = folder_filter_input
         self._folders_widget = folder_widget
@@ -385,3 +403,16 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
             )
         else:
             self.close()
+
+    def _on_my_tasks_checkbox_state_changed(self, state):
+        folder_ids = None
+        task_ids = None
+        state = checkstate_int_to_enum(state)
+        if state == QtCore.Qt.Checked:
+            entity_ids = self._controller.get_my_tasks_entity_ids(
+                self._project_name
+            )
+            folder_ids = entity_ids["folder_ids"]
+            task_ids = entity_ids["task_ids"]
+        self._folders_widget.set_folder_ids_filter(folder_ids)
+        self._tasks_widget.set_task_ids_filter(task_ids)