From d8deb18b52558a7678596ab9e3c6dbb19fbd6514 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Wed, 30 Sep 2020 18:41:07 +0200
Subject: [PATCH] fix(SP): not correct filtering of activated assets in
 hierarchy

---
 .../publish/extract_hierarchy_avalon.py       | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pype/plugins/global/publish/extract_hierarchy_avalon.py b/pype/plugins/global/publish/extract_hierarchy_avalon.py
index 4253c35929..eb791184ed 100644
--- a/pype/plugins/global/publish/extract_hierarchy_avalon.py
+++ b/pype/plugins/global/publish/extract_hierarchy_avalon.py
@@ -1,6 +1,6 @@
 import pyblish.api
 from avalon import io
-
+from copy import deepcopy
 
 class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
     """Create entities in Avalon based on collected data."""
@@ -14,14 +14,12 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
         if "hierarchyContext" not in context.data:
             self.log.info("skipping IntegrateHierarchyToAvalon")
             return
+        hierarchy_context = deepcopy(context.data["hierarchyContext"])
 
         if not io.Session:
             io.install()
 
         active_assets = []
-        hierarchy_context = context.data["hierarchyContext"]
-        hierarchy_assets = self._get_assets(hierarchy_context)
-
         # filter only the active publishing insatnces
         for instance in context:
             if instance.data.get("publish") is False:
@@ -32,13 +30,13 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
 
             active_assets.append(instance.data["asset"])
 
-        # filter out only assets which are activated as isntances
-        new_hierarchy_assets = {k: v for k, v in hierarchy_assets.items()
-                                if k in active_assets}
+        # remove duplicity in list
+        self.active_assets = list(set(active_assets))
+        self.log.debug("__ self.active_assets: {}".format(self.active_assets))
 
-        # modify the hierarchy context so there are only fitred assets
-        self._set_assets(hierarchy_context, new_hierarchy_assets)
+        hierarchy_context = self._get_assets(hierarchy_context)
 
+        self.log.debug("__ hierarchy_context: {}".format(hierarchy_context))
         input_data = context.data["hierarchyContext"] = hierarchy_context
 
         self.project = None
@@ -178,14 +176,21 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
             Usually the last part of deep dictionary which
             is not having any children
         """
+        input_dict_copy = deepcopy(input_dict)
+
         for key in input_dict.keys():
+            self.log.debug("__ key: {}".format(key))
             # check if child key is available
             if input_dict[key].get("childs"):
                 # loop deeper
-                return self._get_assets(input_dict[key]["childs"])
+                input_dict_copy[key]["childs"] = self._get_assets(
+                    input_dict[key]["childs"])
             else:
-                # give the dictionary with assets
-                return input_dict
+                # filter out unwanted assets
+                if key not in self.active_assets:
+                    input_dict_copy.pop(key, None)
+
+        return input_dict_copy
 
     def _set_assets(self, input_dict, new_assets=None):
         """ Modify the hierarchy context dictionary.