Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/GitHub.App/Services/RepositoryCloneService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad

var affiliation = new RepositoryAffiliation?[]
{
RepositoryAffiliation.Owner
RepositoryAffiliation.Owner, RepositoryAffiliation.Collaborator
};

var repositorySelection = new Fragment<Repository, RepositoryListItemModel>(
Expand All @@ -84,6 +84,7 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
.Viewer
.Select(viewer => new ViewerRepositoriesModel
{
Owner = viewer.Login,
Repositories = viewer.Repositories(null, null, null, null, null, order, affiliation, null, null)
.AllPages()
.Select(repositorySelection).ToList(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,16 @@ public async Task Activate()
var results = await service.ReadViewerRepositories(connection.HostAddress).ConfigureAwait(true);

var yourRepositories = results.Repositories
.Where(r => r.Owner == results.Owner)
.Select(x => new RepositoryItemViewModel(x, "Your repositories"));
var collaboratorRepositories = results.Repositories
.Where(r => r.Owner != results.Owner)
.OrderBy(r => r.Owner)
.Select(x => new RepositoryItemViewModel(x, "Collaborator repositories"));
var orgRepositories = results.OrganizationRepositories
.OrderBy(x => x.Key)
.SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, x.Key)));
Items = yourRepositories.Concat(orgRepositories).ToList();
Items = yourRepositories.Concat(collaboratorRepositories).Concat(orgRepositories).ToList();
ItemsView = CollectionViewSource.GetDefaultView(Items);
ItemsView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(RepositoryItemViewModel.Group)));
ItemsView.Filter = FilterItem;
Expand Down Expand Up @@ -149,7 +154,7 @@ bool FilterItem(object obj)

IRepositoryModel CreateRepository(IRepositoryItemViewModel item)
{
return item != null ?
return item != null ?
new RepositoryModel(item.Name, UriString.ToUriString(item.Url)) :
null;
}
Expand Down
1 change: 1 addition & 0 deletions src/GitHub.Exports/Models/ViewerRepositoriesModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace GitHub.Models
{
public class ViewerRepositoriesModel
{
public string Owner { get; set; }
public IReadOnlyList<RepositoryListItemModel> Repositories { get; set; }
public IDictionary<string, IReadOnlyList<RepositoryListItemModel>> OrganizationRepositories { get; set; }
}
Expand Down