infra
/
etesync
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Import: hopefully fix infinite loading on import.

master
Tom Hacohen 2020-01-22 13:16:22 +02:00
parent d0ec686592
commit 4f3c8895f3
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Journals/ImportDialog.tsx
View File

@ -116,7 +116,7 @@ class ImportDialog extends React.Component<PropsType> {
console.error(e);
alert('file reading has failed');
};
reader.onload = () => {
reader.onload = async () => {
try {
const fileText = reader.result as string;
const items = itemsCreator(fileText);
@ -136,22 +136,18 @@ class ImportDialog extends React.Component<PropsType> {
return ret;
});
store.dispatch<any>(
await store.dispatch<any>(
addEntries(this.props.etesync, syncJournal.journal.uid, journalItems, lastUid)
).then(() => {
if (this.props.onClose) {
this.setState({ loading: false });
this.props.onClose();
}
});
);
} catch (e) {
console.error(e);
alert('An error has occurred, please contact developers.');
throw e;
} finally {
if (this.props.onClose) {
this.setState({ loading: false });
this.props.onClose();
}
throw e;
}
};