@@ -29,7 +29,6 @@ public class PullRequestListViewModel : BaseViewModel, IPullRequestListViewModel
29
29
readonly TrackingCollection < IAccount > trackingAssignees ;
30
30
readonly IPackageSettings settings ;
31
31
readonly PullRequestListUIState listSettings ;
32
- bool pullRequestsLoaded ;
33
32
34
33
[ ImportingConstructor ]
35
34
PullRequestListViewModel (
@@ -84,11 +83,11 @@ public PullRequestListViewModel(
84
83
. Subscribe ( s => UpdateFilter ( s , SelectedAssignee , SelectedAuthor ) ) ;
85
84
86
85
this . WhenAny ( x => x . SelectedAssignee , x => x . Value )
87
- . Where ( x => PullRequests != null && x != EmptyUser && pullRequestsLoaded )
86
+ . Where ( x => PullRequests != null && x != EmptyUser && IsLoaded )
88
87
. Subscribe ( a => UpdateFilter ( SelectedState , a , SelectedAuthor ) ) ;
89
88
90
89
this . WhenAny ( x => x . SelectedAuthor , x => x . Value )
91
- . Where ( x => PullRequests != null && x != EmptyUser && pullRequestsLoaded )
90
+ . Where ( x => PullRequests != null && x != EmptyUser && IsLoaded )
92
91
. Subscribe ( a => UpdateFilter ( SelectedState , SelectedAssignee , a ) ) ;
93
92
94
93
SelectedState = States . FirstOrDefault ( x => x . Name == listSettings . SelectedState ) ?? States [ 0 ] ;
@@ -98,7 +97,7 @@ public override void Initialize([AllowNull] ViewWithData data)
98
97
{
99
98
base . Initialize ( data ) ;
100
99
101
- pullRequestsLoaded = false ;
100
+ IsLoaded = false ;
102
101
103
102
PullRequests = repositoryHost . ModelService . GetPullRequests ( repository , pullRequests ) ;
104
103
pullRequests . Subscribe ( pr =>
@@ -121,7 +120,7 @@ public override void Initialize([AllowNull] ViewWithData data)
121
120
SelectedAssignee = Assignees . FirstOrDefault ( x => x . Login == listSettings . SelectedAssignee ) ;
122
121
}
123
122
124
- pullRequestsLoaded = true ;
123
+ IsLoaded = true ;
125
124
UpdateFilter ( SelectedState , SelectedAssignee , SelectedAuthor ) ;
126
125
} ) ;
127
126
}
@@ -136,6 +135,13 @@ void UpdateFilter(PullRequestState state, [AllowNull]IAccount ass, [AllowNull]IA
136
135
( aut == null || aut . Equals ( pr . Author ) ) ;
137
136
}
138
137
138
+ bool isLoaded ;
139
+ public bool IsLoaded
140
+ {
141
+ get { return isLoaded ; }
142
+ private set { this . RaiseAndSetIfChanged ( ref isLoaded , value ) ; }
143
+ }
144
+
139
145
ITrackingCollection < IPullRequestModel > pullRequests ;
140
146
public ITrackingCollection < IPullRequestModel > PullRequests
141
147
{
0 commit comments