show nested collections in groupings pages

This commit is contained in:
Kyle Spearrin 2019-06-17 10:21:05 -04:00
parent 5350e5385c
commit 0116572fec

View file

@ -328,7 +328,7 @@ namespace Bit.App.Pages
{ {
Folders = await _folderService.GetAllDecryptedAsync(); Folders = await _folderService.GetAllDecryptedAsync();
NestedFolders = await _folderService.GetAllNestedAsync(); NestedFolders = await _folderService.GetAllNestedAsync();
HasFolders = NestedFolders.Any(); HasFolders = NestedFolders.Any(f => f.Node?.Id != null);
Collections = await _collectionService.GetAllDecryptedAsync(); Collections = await _collectionService.GetAllDecryptedAsync();
NestedCollections = await _collectionService.GetAllNestedAsync(Collections); NestedCollections = await _collectionService.GetAllNestedAsync(Collections);
HasCollections = NestedCollections.Any(); HasCollections = NestedCollections.Any();
@ -366,6 +366,7 @@ namespace Bit.App.Pages
if(collectionNode?.Node != null) if(collectionNode?.Node != null)
{ {
PageTitle = collectionNode.Node.Name; PageTitle = collectionNode.Node.Name;
NestedCollections = (collectionNode.Children?.Count ?? 0) > 0 ? collectionNode.Children : null;
} }
Filter = c => c.CollectionIds?.Contains(CollectionId) ?? false; Filter = c => c.CollectionIds?.Contains(CollectionId) ?? false;
} }