Skip to content
Snippets Groups Projects
Commit 2aeb9a73 authored by vkovtun's avatar vkovtun
Browse files

BIS-753: Added simple waiting dialog for upload.

parent 0349d476
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -34,6 +34,7 @@ import UploadButton from '@src/js/components/database/data-browser/UploadButton. ...@@ -34,6 +34,7 @@ import UploadButton from '@src/js/components/database/data-browser/UploadButton.
import FileIcon from '@material-ui/icons/InsertDriveFileOutlined' import FileIcon from '@material-ui/icons/InsertDriveFileOutlined'
import FolderIcon from '@material-ui/icons/FolderOpen' import FolderIcon from '@material-ui/icons/FolderOpen'
import logger from '@src/js/common/logger.js' import logger from '@src/js/common/logger.js'
import LoadingDialog from "@src/js/components/common/loading/LoadingDialog.jsx";
const color = 'default' const color = 'default'
const uploadButtonsColor = 'secondary' const uploadButtonsColor = 'secondary'
...@@ -81,12 +82,18 @@ class RightToolbar extends React.Component { ...@@ -81,12 +82,18 @@ class RightToolbar extends React.Component {
this.controller = this.props.controller this.controller = this.props.controller
this.state = { this.state = {
uploadButtonsPopup: null uploadButtonsPopup: null,
loading: false
} }
} }
handleUploadFiles(event) { async handleUploadFiles(event) {
this.controller.upload(event.target.files[0]) try {
this.setState({ loading: true })
await this.controller.upload(event.target.files[0])
} finally {
this.setState({ loading: false })
}
} }
handleUploadFolders(event) {} handleUploadFolders(event) {}
...@@ -137,8 +144,8 @@ class RightToolbar extends React.Component { ...@@ -137,8 +144,8 @@ class RightToolbar extends React.Component {
logger.log(logger.DEBUG, 'RightToolbar.render') logger.log(logger.DEBUG, 'RightToolbar.render')
const { classes, onViewTypeChange, buttonSize } = this.props const { classes, onViewTypeChange, buttonSize } = this.props
const { uploadButtonsPopup } = this.state const { uploadButtonsPopup, loading } = this.state
return ( return ([
<div className={[classes.buttons, classes.rightSection].join(' ')}> <div className={[classes.buttons, classes.rightSection].join(' ')}>
<ToggleButton <ToggleButton
classes={{ root: classes.toggleButton }} classes={{ root: classes.toggleButton }}
...@@ -215,8 +222,9 @@ class RightToolbar extends React.Component { ...@@ -215,8 +222,9 @@ class RightToolbar extends React.Component {
> >
<Container square={true}>{this.renderUploadButtons()}</Container> <Container square={true}>{this.renderUploadButtons()}</Container>
</Popover> </Popover>
</div> </div>,
) <LoadingDialog key='loaging-dialog' loading={loading} />
])
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment