beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix children not properly refreshing across different categories for #207

Browse source
This commit is contained in:
crschnick 2024-03-12 13:08:54 +00:00
parent c2ac2481e4
commit a4faa7c04c
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/io/xpipe/app/comp/store/StoreSection.java
View file

@ -101,7 +101,7 @@ public class StoreSection {
var matchesSelector = section.anyMatches(entryFilter); var matchesSelector = section.anyMatches(entryFilter);
var sameCategory = category == null var sameCategory = category == null
|| category.getValue() == null || category.getValue() == null
|| category.getValue().contains(section.getWrapper()); || inCategory(category.getValue(),section.getWrapper());
return showFilter && matchesSelector && sameCategory; return showFilter && matchesSelector && sameCategory;
}, },
category, category,
@ -140,7 +140,7 @@ public class StoreSection {
var matchesSelector = section.anyMatches(entryFilter); var matchesSelector = section.anyMatches(entryFilter);
var sameCategory = category == null var sameCategory = category == null
|| category.getValue() == null || category.getValue() == null
|| category.getValue().contains(section.getWrapper()); || inCategory(category.getValue(),section.getWrapper());
// If this entry is already shown as root due to a different category than parent, don't show it // If this entry is already shown as root due to a different category than parent, don't show it
// again here // again here
var notRoot = var notRoot =
@ -161,4 +161,16 @@ public class StoreSection {
|| c.test(wrapper) || c.test(wrapper)
|| allChildren.stream().anyMatch(storeEntrySection -> storeEntrySection.anyMatches(c)); || allChildren.stream().anyMatch(storeEntrySection -> storeEntrySection.anyMatches(c));
} }
private static boolean inCategory(StoreCategoryWrapper categoryWrapper, StoreEntryWrapper entryWrapper) {
var current = entryWrapper.getCategory().getValue();
while (current != null) {
if (categoryWrapper.getCategory().getUuid().equals(current.getCategory().getUuid())) {
return true;
}
current = current.getParent();
}
return false;
}
} }