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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to AYON Tray
       options:
+        - 1.5.3
         - 1.5.2
         - 1.5.1
         - 1.5.0

client/ayon_core/pipeline/load/plugins.py

@@ -373,7 +373,7 @@ def discover_loader_plugins(project_name=None):
     if not project_name:
         project_name = get_current_project_name()
     project_settings = get_project_settings(project_name)
-    plugins = discover(LoaderPlugin)
+    plugins = discover(LoaderPlugin, allow_duplicates=False)
     hooks = discover(LoaderHookPlugin)
     sorted_hooks = sorted(hooks, key=lambda hook: hook.order)
     for plugin in plugins:

client/ayon_core/pipeline/workfile/workfile_template_builder.py

@@ -16,6 +16,7 @@ import re
 import collections
 import copy
 from abc import ABC, abstractmethod
+from typing import Optional
 
 import ayon_api
 from ayon_api import (
@@ -201,12 +202,6 @@ class AbstractTemplateBuilder(ABC):
             )
         return self._current_folder_entity
 
-    @property
-    def linked_folder_entities(self):
-        if self._linked_folder_entities is _NOT_SET:
-            self._linked_folder_entities = self._get_linked_folder_entities()
-        return self._linked_folder_entities
-
     @property
     def current_task_entity(self):
         if self._current_task_entity is _NOT_SET:
@@ -307,13 +302,16 @@ class AbstractTemplateBuilder(ABC):
             self._loaders_by_name = get_loaders_by_name()
         return self._loaders_by_name
 
-    def _get_linked_folder_entities(self):
+    def get_linked_folder_entities(self, link_type: Optional[str]):
+        if not link_type:
+            return []
         project_name = self.project_name
         folder_entity = self.current_folder_entity
         if not folder_entity:
             return []
         links = get_folder_links(
-            project_name, folder_entity["id"], link_direction="in"
+            project_name,
+            folder_entity["id"], link_types=[link_type], link_direction="in"
         )
         linked_folder_ids = {
             link["entityId"]
@@ -1429,10 +1427,27 @@ class PlaceholderLoadMixin(object):
 
         builder_type_enum_items = [
             {"label": "Current folder", "value": "context_folder"},
-            # TODO implement linked folders
-            # {"label": "Linked folders", "value": "linked_folders"},
+            {"label": "Linked folders", "value": "linked_folders"},
             {"label": "All folders", "value": "all_folders"},
         ]
+
+        link_types = ayon_api.get_link_types(self.builder.project_name)
+
+        # Filter link types for folder to folder links
+        link_types_enum_items = [
+            {"label": link_type["name"], "value": link_type["linkType"]}
+            for link_type in link_types
+            if (
+                    link_type["inputType"] == "folder"
+                    and link_type["outputType"] == "folder"
+            )
+        ]
+
+        if not link_types_enum_items:
+            link_types_enum_items.append(
+                {"label": "<No link types>", "value": None}
+            )
+
         build_type_label = "Folder Builder Type"
         build_type_help = (
             "Folder Builder Type\n"
@@ -1461,6 +1476,16 @@ class PlaceholderLoadMixin(object):
                 items=builder_type_enum_items,
                 tooltip=build_type_help
             ),
+            attribute_definitions.EnumDef(
+                "link_type",
+                label="Link Type",
+                items=link_types_enum_items,
+                tooltip=(
+                    "Link Type\n"
+                    "\nDefines what type of link will be used to"
+                    " link the asset to the current folder."
+                )
+            ),
             attribute_definitions.EnumDef(
                 "product_type",
                 label="Product type",
@@ -1607,10 +1632,7 @@ class PlaceholderLoadMixin(object):
 
         builder_type = placeholder.data["builder_type"]
         folder_ids = []
-        if builder_type == "context_folder":
-            folder_ids = [current_folder_entity["id"]]
-
-        elif builder_type == "all_folders":
+        if builder_type == "all_folders":
             folder_ids = {
                 folder_entity["id"]
                 for folder_entity in get_folders(
@@ -1620,6 +1642,23 @@ class PlaceholderLoadMixin(object):
                 )
             }
 
+        elif builder_type == "context_folder":
+            folder_ids = [current_folder_entity["id"]]
+
+        elif builder_type == "linked_folders":
+            # link type from placeholder data or default to "template"
+            link_type = placeholder.data.get("link_type", "template")
+            # Get all linked folders for the current folder
+            if hasattr(self, "builder") and isinstance(
+                    self.builder, AbstractTemplateBuilder):
+                # self.builder: AbstractTemplateBuilder
+                folder_ids = [
+                    linked_folder_entity["id"]
+                    for linked_folder_entity in (
+                        self.builder.get_linked_folder_entities(
+                            link_type=link_type))
+                ]
+
         if not folder_ids:
             return []
 

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

@@ -287,10 +287,11 @@ class FilesWidget(QtWidgets.QWidget):
     def _update_published_btns_state(self):
         enabled = (
             self._valid_representation_id
-            and self._valid_selected_context
             and self._is_save_enabled
         )
-        self._published_btn_copy_n_open.setEnabled(enabled)
+        self._published_btn_copy_n_open.setEnabled(
+            enabled and self._valid_selected_context
+        )
         self._published_btn_change_context.setEnabled(enabled)
 
     def _update_workarea_btns_state(self):

client/ayon_core/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'core' version."""
-__version__ = "1.5.2+dev"
+__version__ = "1.5.3+dev"

package.py

@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "1.5.2+dev"
+version = "1.5.3+dev"
 
 client_dir = "ayon_core"
 

pyproject.toml

@@ -5,7 +5,7 @@
 
 [tool.poetry]
 name = "ayon-core"
-version = "1.5.2+dev"
+version = "1.5.3+dev"
 description = ""
 authors = ["Ynput Team <team@ynput.io>"]
 readme = "README.md"