modified product types widget to work as expected

client/ayon_core/tools/loader/ui/product_types_widget.py

@@ -13,10 +13,17 @@ class ProductTypesQtModel(QtGui.QStandardItemModel):
         super(ProductTypesQtModel, self).__init__()
         self._controller = controller
 
+        self._reset_filters_on_refresh = True
         self._refreshing = False
         self._bulk_change = False
+        self._last_project = None
         self._items_by_name = {}
 
+        controller.register_event_callback(
+            "controller.reset.finished",
+            self._on_controller_reset_finish,
+        )
+
     def is_refreshing(self):
         return self._refreshing
 
@@ -37,14 +44,19 @@ class ProductTypesQtModel(QtGui.QStandardItemModel):
         self._refreshing = True
         product_type_items = self._controller.get_product_type_items(
             project_name)
+        self._last_project = project_name
 
         items_to_remove = set(self._items_by_name.keys())
         new_items = []
+        items_filter_required = {}
         for product_type_item in product_type_items:
             name = product_type_item.name
             items_to_remove.discard(name)
-            item = self._items_by_name.get(product_type_item.name)
+            item = self._items_by_name.get(name)
+            # Apply filter to new items or if filters reset is requested
+            filter_required = self._reset_filters_on_refresh
             if item is None:
+                filter_required = True
                 item = QtGui.QStandardItem(name)
                 item.setData(name, PRODUCT_TYPE_ROLE)
                 item.setEditable(False)
@@ -52,9 +64,26 @@ class ProductTypesQtModel(QtGui.QStandardItemModel):
                 new_items.append(item)
                 self._items_by_name[name] = item
 
+            if filter_required:
+                items_filter_required[name] = item
+
             icon = get_qt_icon(product_type_item.icon)
             item.setData(icon, QtCore.Qt.DecorationRole)
 
+        if items_filter_required:
+            product_types_filter = self._controller.get_product_types_filter()
+            for product_type, item in items_filter_required.items():
+                matching = (
+                    int(product_type in product_types_filter.product_types)
+                    + int(product_types_filter.is_allow_list)
+                )
+                state = (
+                    QtCore.Qt.Checked
+                    if matching % 2 == 0
+                    else QtCore.Qt.Unchecked
+                )
+                item.setCheckState(state)
+
         root_item = self.invisibleRootItem()
         if new_items:
             root_item.appendRows(new_items)
@@ -63,22 +92,12 @@ class ProductTypesQtModel(QtGui.QStandardItemModel):
             item = self._items_by_name.pop(name)
             root_item.removeRow(item.row())
 
+        self._reset_filters_on_refresh = False
         self._refreshing = False
         self.refreshed.emit()
 
-    def reset_product_types_filter(self):
-        project_name = self._controller.get_selected_project_name()
-        product_types_filter = (
-            self._controller.get_product_types_filter(project_name)
-        )
-        if product_types_filter.is_include:
-            self.change_state_for_all(False)
-        else:
-            self.change_state_for_all(True)
-        self.change_states(
-            product_types_filter.is_include,
-            product_types_filter.product_types
-        )
+    def reset_product_types_filter_on_refresh(self):
+        self._reset_filters_on_refresh = True
 
     def setData(self, index, value, role=None):
         checkstate_changed = False
@@ -131,6 +150,9 @@ class ProductTypesQtModel(QtGui.QStandardItemModel):
         if changed:
             self.filter_changed.emit()
 
+    def _on_controller_reset_finish(self):
+        self.refresh(self._last_project)
+
 
 class ProductTypesView(QtWidgets.QListView):
     filter_changed = QtCore.Signal()
@@ -168,19 +190,15 @@ class ProductTypesView(QtWidgets.QListView):
     def get_filter_info(self):
         return self._product_types_model.get_filter_info()
 
+    def reset_product_types_filter_on_refresh(self):
+        self._product_types_model.reset_product_types_filter_on_refresh()
+
     def _on_project_change(self, event):
         project_name = event["project_name"]
         self._product_types_model.refresh(project_name)
 
-    def showEvent(self, event):
-        self._refresh_product_types_filter = True
-        super().showEvent(event)
-
     def _on_refresh_finished(self):
         # Apply product types filter on first show
-        if self._refresh_product_types_filter:
-            self._product_types_model.reset_product_types_filter()
-
         self.filter_changed.emit()
 
     def _on_filter_change(self):

client/ayon_core/tools/loader/ui/window.py

@@ -345,6 +345,8 @@ class LoaderWindow(QtWidgets.QWidget):
     def closeEvent(self, event):
         super(LoaderWindow, self).closeEvent(event)
 
+        self._product_types_widget.reset_product_types_filter_on_refresh()
+
         self._reset_on_show = True
 
     def keyPressEvent(self, event):