-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from carapai/master
Some bug fixes and performance improvements
- Loading branch information
Showing
30 changed files
with
1,206 additions
and
633 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
|
|
||
| import React from 'react'; | ||
| import { Spin } from 'antd'; | ||
| const Loading = () => <div style={{ | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| flexDirection: 'column', | ||
| width: '100vw', | ||
| height: '100vh' | ||
| }}> | ||
| <Spin size="large" /> | ||
| </div>; | ||
|
|
||
| export default Loading; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| import { inject, observer } from "mobx-react"; | ||
| import React from "react"; | ||
| import { withStyles } from "@material-ui/core/styles"; | ||
| import TableHead from "@material-ui/core/TableHead/TableHead"; | ||
| import TableRow from "@material-ui/core/TableRow/TableRow"; | ||
| import TableCell from "@material-ui/core/TableCell/TableCell"; | ||
| import TableBody from "@material-ui/core/TableBody/TableBody"; | ||
| import * as PropTypes from "prop-types"; | ||
| import Typography from "@material-ui/core/Typography"; | ||
| import MUITable from "@material-ui/core/Table"; | ||
| import { Table } from 'antd'; | ||
|
|
||
|
|
||
| const columns = [ | ||
| { title: 'Affected', dataIndex: 'object', key: 'object' }, | ||
| { title: 'Message', dataIndex: 'value', key: 'value' } | ||
| ]; | ||
|
|
||
|
|
||
| const styles = theme => ({ | ||
| margin: { | ||
| margin: theme.spacing.unit * 2, | ||
| }, | ||
| padding: { | ||
| padding: `0 ${theme.spacing.unit * 2}px`, | ||
| }, | ||
| root: { | ||
| flexGrow: 1, | ||
| width: '100%', | ||
| backgroundColor: theme.palette.background.paper, | ||
| } | ||
| }); | ||
|
|
||
| function TabContainer(props) { | ||
| return ( | ||
| <Typography component="div" style={{ padding: 8 * 3 }}> | ||
| {props.children} | ||
| </Typography> | ||
| ); | ||
| } | ||
|
|
||
| TabContainer.propTypes = { | ||
| children: PropTypes.node.isRequired, | ||
| }; | ||
|
|
||
|
|
||
| @inject('IntegrationStore') | ||
| @observer | ||
| class ImportSummary extends React.Component { | ||
| integrationStore = null; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
| const { IntegrationStore } = props; | ||
| this.integrationStore = IntegrationStore; | ||
| this.state = { | ||
| value: this.integrationStore.dataSet.isDhis2 ? 1 : 0, | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| handleChange = (event, value) => { | ||
| this.setState({ value }); | ||
| }; | ||
|
|
||
| render() { | ||
| const { classes } = this.props; | ||
| const { importCount, conflicts } = this.integrationStore.dataSet.processedResponses; | ||
| return <div className={classes.root}> | ||
| <MUITable> | ||
| <TableHead> | ||
| <TableRow> | ||
| <TableCell>Message</TableCell> | ||
| <TableCell>Value</TableCell> | ||
| </TableRow> | ||
| </TableHead> | ||
| <TableBody> | ||
| <TableRow> | ||
| <TableCell> | ||
| Imported | ||
| </TableCell> | ||
| <TableCell> | ||
| {importCount.imported} | ||
| </TableCell> | ||
| </TableRow> | ||
| <TableRow> | ||
| <TableCell> | ||
| Updated | ||
| </TableCell> | ||
| <TableCell> | ||
| {importCount.updated} | ||
| </TableCell> | ||
| </TableRow> | ||
| <TableRow> | ||
| <TableCell> | ||
| Ignored | ||
| </TableCell> | ||
| <TableCell> | ||
| {importCount.ignored} | ||
| </TableCell> | ||
| </TableRow> | ||
| <TableRow> | ||
| <TableCell> | ||
| Deleted | ||
| </TableCell> | ||
| <TableCell> | ||
| {importCount.deleted} | ||
| </TableCell> | ||
| </TableRow> | ||
| </TableBody> | ||
| </MUITable> | ||
| <h4>Conflicts</h4> | ||
|
|
||
| <Table | ||
| columns={columns} | ||
| size="small" | ||
| rowKey="id" | ||
| pagination={{ defaultPageSize: 5 }} | ||
| dataSource={conflicts} | ||
| /> | ||
| </div> | ||
| } | ||
|
|
||
| } | ||
|
|
||
| export default withStyles(styles)(ImportSummary); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import { inject, observer } from "mobx-react"; | ||
| import React from "react"; | ||
| import { withStyles } from "@material-ui/core/styles"; | ||
| import * as PropTypes from "prop-types"; | ||
| import Typography from "@material-ui/core/Typography"; | ||
| import D4 from "./d4"; | ||
| import ImportSummary from './ImportSummary'; | ||
|
|
||
| const styles = theme => ({ | ||
| margin: { | ||
| margin: theme.spacing.unit * 2, | ||
| }, | ||
| padding: { | ||
| padding: `0 ${theme.spacing.unit * 2}px`, | ||
| }, | ||
| root: { | ||
| flexGrow: 1, | ||
| width: '100%', | ||
| backgroundColor: theme.palette.background.paper, | ||
| } | ||
| }); | ||
|
|
||
| function TabContainer(props) { | ||
| return ( | ||
| <Typography component="div" style={{ padding: 8 * 3 }}> | ||
| {props.children} | ||
| </Typography> | ||
| ); | ||
| } | ||
|
|
||
| TabContainer.propTypes = { | ||
| children: PropTypes.node.isRequired, | ||
| }; | ||
|
|
||
|
|
||
| @inject('IntegrationStore') | ||
| @observer | ||
| class SummaryPage extends React.Component { | ||
| integrationStore = null; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
| const { IntegrationStore } = props; | ||
| this.integrationStore = IntegrationStore; | ||
| this.state = { | ||
| value: this.integrationStore.dataSet.isDhis2 ? 1 : 0, | ||
| }; | ||
| } | ||
|
|
||
| render() { | ||
| const { classes } = this.props; | ||
| return <div className={classes.root}> | ||
| {this.integrationStore.dataSet.isDhis2 ? <ImportSummary /> : this.integrationStore.dataSet.processed ? <D4 /> : <div></div>} | ||
| </div> | ||
| } | ||
|
|
||
| } | ||
|
|
||
| export default withStyles(styles)(SummaryPage); |
Oops, something went wrong.