Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix outdated highlighting and filtering state for non-hero and hero version

Browse source 
- Also optimize the query of highest version by doing one query per product id instead of one per representation id
This commit is contained in:
Roy Nieterau 2024-03-19 23:44:44 +01:00
parent 11e89c100e
commit 5ee980041a
1 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

56
client/ayon_core/tools/sceneinventory/model.py
View file

@ -68,13 +68,7 @@ class InventoryModel(TreeModel):
}
def outdated(self, item):
value = item.get("version")
if isinstance(value, HeroVersionType):
return False
if item.get("version") == item.get("highest_version"):
return False
return True
return item.get("isOutdated", True)
def data(self, index, role):
if not index.isValid():
@ -297,6 +291,23 @@ class InventoryModel(TreeModel):
)
sites_info = self._controller.get_sites_information()
# Query the highest available version so the model can know
# whether current version is currently up-to-date.
highest_versions = ayon_api.get_versions(
project_name,
product_ids={
group["version"]["productId"] for group in grouped.values()
},
latest=True,
standard=True,
hero=False,
fields=["productId", "version"]
)
highest_version_by_product_id = {
version["productId"]: version["version"]
for version in highest_versions
}
for repre_id, group_dict in sorted(grouped.items()):
group_containers = group_dict["containers"]
repre_entity = group_dict["representation"]
@ -306,12 +317,6 @@ class InventoryModel(TreeModel):
product_type = product_entity["productType"]
# Store the highest available version so the model can know
# whether current version is currently up-to-date.
highest_version = ayon_api.get_last_version_by_product_id(
project_name, version_entity["productId"]
)
# create the group header
group_node = Item()
group_node["Name"] = "{}_{}: ({})".format(
@ -321,7 +326,17 @@ class InventoryModel(TreeModel):
)
group_node["representation"] = repre_id
group_node["version"] = version_entity["version"]
group_node["highest_version"] = highest_version["version"]
# We check against `abs(version)` because we allow a hero version
# which is represented by a negative number to also count as
# latest version
# If a hero version for whatever reason does not match the latest
# positive version number, we also consider it outdated
group_node["isOutdated"] = (
abs(version_entity["version"]) !=
highest_version_by_product_id.get(version_entity["productId"])
)
group_node["productType"] = product_type or ""
group_node["productTypeIcon"] = product_type_icon
group_node["count"] = len(group_containers)
@ -490,17 +505,15 @@ class FilterProxyModel(QtCore.QSortFilterProxyModel):
def _is_outdated(self, row, parent):
"""Return whether row is outdated.
A row is considered outdated if it has "version" and "highest_version"
data and in the internal data structure, and they are not of an
equal value.
A row is considered outdated if it has no "version" or the "isOutdated"
value is True.
"""
def outdated(node):
version = node.get("version", None)
highest = node.get("highest_version", None)
# Always allow indices that have no version data at all
if version is None and highest is None:
if version is None:
return True
# If either a version or highest is present but not the other
@ -508,9 +521,10 @@ class FilterProxyModel(QtCore.QSortFilterProxyModel):
if not self._hierarchy_view:
# Skip this check if in hierarchy view, or the child item
# node will be hidden even it's actually outdated.
if version is None or highest is None:
if version is None:
return False
return version != highest
return node.get("isOutdated", True)
index = self.sourceModel().index(row, self.filterKeyColumn(), parent)