Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set this.changingState back to false in ExtensionPage if an error occurs #2558

Merged
merged 2 commits into from
Jan 30, 2021
Merged

Set this.changingState back to false in ExtensionPage if an error occurs #2558

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba5415f
Set this.changingState back to false in ExtensionPage if an error occurs
dsevillamartin Jan 20, 2021
cf9a10c
Remove 'changingState' from isEnabled logic, use it in Switch only
dsevillamartin Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions js/src/admin/components/ExtensionPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ export default class ExtensionPage extends Page {
}

header() {
const isEnabled = this.isEnabled();

return [
<div className="ExtensionPage-header">
<div className="container">
Expand All @@ -75,10 +77,12 @@ export default class ExtensionPage extends Page {
</div>
<div className="helpText">{this.extension.description}</div>
<div className="ExtensionPage-headerItems">
<Switch state={this.isEnabled()} onchange={this.toggle.bind(this, this.extension.id)}>
{this.isEnabled(this.extension.id)
? app.translator.trans('core.admin.extension.enabled')
: app.translator.trans('core.admin.extension.disabled')}
<Switch
state={this.changingState ? !isEnabled : isEnabled}
loading={this.changingState}
onchange={this.toggle.bind(this, this.extension.id)}
>
{isEnabled ? app.translator.trans('core.admin.extension.enabled') : app.translator.trans('core.admin.extension.disabled')}
dsevillamartin marked this conversation as resolved.
Show resolved Hide resolved
</Switch>
<aside className="ExtensionInfo">
<ul>{listItems(this.infoItems().toArray())}</ul>
Expand Down Expand Up @@ -333,9 +337,7 @@ export default class ExtensionPage extends Page {
}

isEnabled() {
let isEnabled = isExtensionEnabled(this.extension.id);

return this.changingState ? !isEnabled : isEnabled;
return isExtensionEnabled(this.extension.id);
}

onerror(e) {
Expand All @@ -346,6 +348,8 @@ export default class ExtensionPage extends Page {
app.modal.close();
}, 300); // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.

this.changingState = false;

if (e.status !== 409) {
throw e;
}
Expand Down