me/parandum
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable buttons during processing

Browse Source
This commit is contained in:
Matthew Grove
2021-09-12 22:55:34 +01:00
parent f596a7a8aa
commit d15be15a81
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ClassicTestStart.js
View File

@@ -65,6 +65,7 @@ export default function ClassicTestStart(props) {
icon={<ArrowForwardRoundedIcon />} icon={<ArrowForwardRoundedIcon />}
className="button--round continue-button" className="button--round continue-button"
loading={props.loading} loading={props.loading}
disabled={props.disabled}
></Button> ></Button>
<Button <Button

1
src/LivesTestStart.js
View File

@@ -65,6 +65,7 @@ export default function LivesTestStart(props) {
icon={<ArrowForwardRoundedIcon />} icon={<ArrowForwardRoundedIcon />}
className="button--round continue-button" className="button--round continue-button"
loading={props.loading} loading={props.loading}
disabled={props.disabled}
></Button> ></Button>
<Button <Button

22
src/LoggedInHome.js
View File

@@ -67,6 +67,7 @@ export default withRouter(class LoggedInHome extends React.Component {
sliderValue: 1, sliderValue: 1,
switchLanguage: false, switchLanguage: false,
totalTestQuestions: 1, totalTestQuestions: 1,
pendingDeletions: {},
}; };
let isMounted = true; let isMounted = true;
@@ -231,6 +232,14 @@ export default withRouter(class LoggedInHome extends React.Component {
} }
deleteProgress = (progressId) => { deleteProgress = (progressId) => {
if (this.state.pendingDeletions[progressId] !== true) {
let pendingDeletions = this.state.pendingDeletions;
pendingDeletions[progressId] = true;
this.setState({
pendingDeletions: pendingDeletions,
});
this.state.db.collection("progress") this.state.db.collection("progress")
.doc(progressId) .doc(progressId)
.delete() .delete()
@@ -240,8 +249,19 @@ export default withRouter(class LoggedInHome extends React.Component {
progressHistoryIncomplete: this.state.progressHistoryIncomplete, progressHistoryIncomplete: this.state.progressHistoryIncomplete,
}; };
newState.progressHistoryIncomplete.splice(progressIndex, 1); newState.progressHistoryIncomplete.splice(progressIndex, 1);
newState.pendingDeletions = this.state.pendingDeletions;
delete pendingDeletions[progressId];
this.setState(newState); this.setState(newState);
})
.catch((error) => {
console.log(`Couldn't delete progress: ${error}`);
let pendingDeletions = this.state.pendingDeletions;
delete pendingDeletions[progressId];
this.setState({
pendingDeletions: pendingDeletions,
}); });
});
}
} }
showTestStart = () => { showTestStart = () => {
@@ -427,6 +447,8 @@ export default withRouter(class LoggedInHome extends React.Component {
className="button--no-background" className="button--no-background"
onClick={() => this.deleteProgress(progressItem.id)} onClick={() => this.deleteProgress(progressItem.id)}
icon={<DeleteRoundedIcon />} icon={<DeleteRoundedIcon />}
disabled={this.state.pendingDeletions[progressItem.id] === true}
loading={this.state.pendingDeletions[progressItem.id] === true}
></Button> ></Button>
</p> </p>
</div> </div>

2
src/SetPage.js
View File

@@ -485,6 +485,7 @@ export default withRouter(class SetPage extends React.Component {
switchLanguage={this.state.switchLanguage} switchLanguage={this.state.switchLanguage}
handleSwitchLanguageChange={this.handleSwitchLanguageChange} handleSwitchLanguageChange={this.handleSwitchLanguageChange}
loading={this.state.loading} loading={this.state.loading}
disabled={!this.state.canStartTest}
/> />
} }
{ {
@@ -498,6 +499,7 @@ export default withRouter(class SetPage extends React.Component {
switchLanguage={this.state.switchLanguage} switchLanguage={this.state.switchLanguage}
handleSwitchLanguageChange={this.handleSwitchLanguageChange} handleSwitchLanguageChange={this.handleSwitchLanguageChange}
loading={this.state.loading} loading={this.state.loading}
disabled={!this.state.canStartTest}
/> />
} }
{ {