fix: wait for CompletedFullSync before showing "No Notes."

This commit is contained in:
Baptiste Grob
2020-09-23 13:41:26 +02:00
parent f819513e97
commit 5c986338a8
2 changed files with 10 additions and 6 deletions

View File

@@ -95,8 +95,11 @@
label="'Date'" label="'Date'"
) )
p.empty-notes-list.faded( p.empty-notes-list.faded(
ng-if="self.state.localDataLoaded && !self.state.renderedNotes.length" ng-if="self.state.completedFullSync && !self.state.renderedNotes.length"
) No notes. ) No notes.
p.empty-notes-list.faded(
ng-if="!self.state.completedFullSync && !self.state.renderedNotes.length"
) Loading notes…
.scrollable(ng-if="self.state.renderedNotes.length") .scrollable(ng-if="self.state.renderedNotes.length")
#notes-scrollable.infinite-scroll( #notes-scrollable.infinite-scroll(
can-load='true', can-load='true',

View File

@@ -34,7 +34,7 @@ type NotesState = {
hideDate?: boolean hideDate?: boolean
noteFilter: { text: string } noteFilter: { text: string }
mutable: { showMenu: boolean } mutable: { showMenu: boolean }
localDataLoaded: boolean completedFullSync: boolean
[WebPrefKey.TagsPanelWidth]?: number [WebPrefKey.TagsPanelWidth]?: number
[WebPrefKey.NotesPanelWidth]?: number [WebPrefKey.NotesPanelWidth]?: number
[WebPrefKey.EditorWidth]?: number [WebPrefKey.EditorWidth]?: number
@@ -127,7 +127,7 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
mutable: { showMenu: false }, mutable: { showMenu: false },
noteFilter: { text: '' }, noteFilter: { text: '' },
panelTitle: '', panelTitle: '',
localDataLoaded: false, completedFullSync: false,
}; };
} }
@@ -167,6 +167,9 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
case ApplicationEvent.SignedIn: case ApplicationEvent.SignedIn:
this.appState.closeAllEditors(); this.appState.closeAllEditors();
this.selectFirstNote(); this.selectFirstNote();
this.setState({
completedFullSync: false,
});
break; break;
case ApplicationEvent.CompletedFullSync: case ApplicationEvent.CompletedFullSync:
this.getMostValidNotes().then((notes) => { this.getMostValidNotes().then((notes) => {
@@ -174,10 +177,8 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
this.createPlaceholderNote(); this.createPlaceholderNote();
} }
}); });
break;
case ApplicationEvent.LocalDataLoaded:
this.setState({ this.setState({
localDataLoaded: true, completedFullSync: true,
}); });
break; break;
} }