Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add loading indicator #2398

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
8 changes: 8 additions & 0 deletions src/public/app/services/note_context.js
Original file line number Diff line number Diff line change
@@ -32,6 +32,14 @@ class NoteContext extends Component {
});
}

setLoading() {
this.notePath = null;
this.noteId = null;
this.parentNoteId = null;

this.triggerEvent('noteLoading');
}

async setNote(inputNotePath, triggerSwitchEvent = true) {
const resolvedNotePath = await this.getResolvedNotePath(inputNotePath);

19 changes: 18 additions & 1 deletion src/public/app/widgets/note_detail.js
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ import ReadOnlyCodeTypeWidget from "./type_widgets/read_only_code.js";
import NoneTypeWidget from "./type_widgets/none.js";
import attributeService from "../services/attributes.js";
import NoteMapTypeWidget from "./type_widgets/note_map.js";
import LoadingTypeWidget from "./type_widgets/loading.js";

const TPL = `
<div class="note-detail">
@@ -47,7 +48,8 @@ const typeWidgetClasses = {
'relation-map': RelationMapTypeWidget,
'protected-session': ProtectedSessionTypeWidget,
'book': BookTypeWidget,
'note-map': NoteMapTypeWidget
'note-map': NoteMapTypeWidget,
'loading': LoadingTypeWidget,
};

export default class NoteDetailWidget extends NoteContextAwareWidget {
@@ -196,6 +198,21 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
}
}

async noteLoadingEvent() {
const widget = new LoadingTypeWidget();
widget.spacedUpdate = this.spacedUpdate;
widget.setParent(this);

const $renderedWidget = widget.render();
this.$widget.empty();
this.$widget.append($renderedWidget);

console.log(this, this.$widget);
this.$widget.append($renderedWidget);

this.child(widget);
}

async beforeTabRemoveEvent({ntxIds}) {
if (this.isNoteContext(ntxIds)) {
await this.spacedUpdate.updateNowIfNecessary();
10 changes: 1 addition & 9 deletions src/public/app/widgets/note_tree.js
Original file line number Diff line number Diff line change
@@ -328,19 +328,11 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
}
},
activate: async (event, data) => {
// click event won't propagate so let's close context menu manually
contextMenu.hide();

this.clearSelectedNodes();

const notePath = treeService.getNotePath(data.node);

const activeNoteContext = appContext.tabManager.getActiveContext();
activeNoteContext.setLoading();
await activeNoteContext.setNote(notePath);

if (utils.isMobile()) {
this.triggerCommand('setActiveScreen', {screen: 'detail'});
}
},
expand: (event, data) => this.setExpanded(data.node.data.branchId, true),
collapse: (event, data) => this.setExpanded(data.node.data.branchId, false),
17 changes: 17 additions & 0 deletions src/public/app/widgets/type_widgets/loading.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import TypeWidget from "./type_widget.js";

const TPL = `
<div class="note-loading note-detail-printable">
<h1>Note is loading...</h1>
</div>`;


export default class LoadingTypeWidget extends TypeWidget {
static getType() { return "loading"; }

doRender() {
this.$widget = $(TPL);

super.doRender();
}
}