coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: Add support for "word" files exported from Confluence (#1600)

Browse Source 
* Display error message to end user

* fix: Improve conversion of tables

* fix: Characters at ends of lines in tables lost
This commit is contained in:
Tom Moor
2020-10-21 08:53:59 -07:00
committed by GitHub
parent b78e2f1e05
commit df7b9f3e88
9 changed files with 394 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/DropToImport.js
View File

@ -7,6 +7,7 @@ import Dropzone from "react-dropzone";
import { withRouter, type RouterHistory, type Match } from "react-router-dom";
import { createGlobalStyle } from "styled-components";
import DocumentsStore from "stores/DocumentsStore";
import UiStore from "stores/UiStore";
import LoadingIndicator from "components/LoadingIndicator";
const EMPTY_OBJECT = {};
@ -18,6 +19,7 @@ type Props = {
documentId?: string,
activeClassName?: string,
rejectClassName?: string,
ui: UiStore,
documents: DocumentsStore,
disabled: boolean,
location: Object,
@ -71,6 +73,8 @@ class DropToImport extends React.Component<Props> {
this.props.history.push(doc.url);
}
}
} catch (err) {
this.props.ui.showToast(`Could not import file. ${err.message}`);
} finally {
this.isImporting = false;
importingLock = false;
@ -109,4 +113,4 @@ class DropToImport extends React.Component<Props> {
}
}
export default inject("documents")(withRouter(DropToImport));
export default inject("documents", "ui")(withRouter(DropToImport));