diff --git a/app/src/components/Admin.js b/app/src/components/Admin.js
index 588a20ca..090f1fe9 100644
--- a/app/src/components/Admin.js
+++ b/app/src/components/Admin.js
@@ -3,7 +3,7 @@ import {
Button,
Checkbox,
Confirm,
- Container,
+ Container, Dimmer,
Divider,
Form,
Header,
@@ -44,6 +44,7 @@ class Settings extends React.Component {
this.state = {
disabled: false,
hotspot_encryption: 'WPA',
+ pending: false,
qrCodeValue: '',
qrOpen: false,
ready: false,
@@ -84,6 +85,7 @@ class Settings extends React.Component {
async handleSubmit(e) {
e.preventDefault();
+ this.setState({disabled: true, pending: true});
let settings = {
download_on_startup: this.state.download_on_startup,
hotspot_on_startup: this.state.hotspot_on_startup,
@@ -93,6 +95,7 @@ class Settings extends React.Component {
timezone: this.state.timezone.value,
}
await saveSettings(settings);
+ this.setState({disabled: false, pending: false});
}
handleInputChange = async (e, name, value) => {
@@ -120,6 +123,7 @@ class Settings extends React.Component {
hotspot_on_startup,
hotspot_password,
hotspot_ssid,
+ pending,
qrCodeValue,
throttle_on_startup,
timezone,
@@ -211,6 +215,10 @@ class Settings extends React.Component {
Save
+
+
+
+
)
diff --git a/app/src/components/Common.js b/app/src/components/Common.js
index af6d255a..bc227f3f 100644
--- a/app/src/components/Common.js
+++ b/app/src/components/Common.js
@@ -662,47 +662,6 @@ export function CardGroupCentered(props) {
)
}
-export function HotspotToggle(props) {
- let {on, setHotspot} = useHotspot();
- return setHotspot(data.checked)}
- />;
-}
-
-export function ThrottleToggle(props) {
- let {on, setThrottle} = useThrottle();
- return setThrottle(data.checked)}
- />;
-}
-
-export function DisableDownloadsToggle() {
- let {on, setDownloads} = useDownloaders();
- return setDownloads(data.checked)}
- />;
-}
-
-export function emptyToNull(obj) {
- const keys = Object.keys(obj);
- for (let i = 0; i < keys.length; i++) {
- const key = keys[i];
- if (obj[key] === '') {
- obj[key] = null;
- }
- }
- return obj;
-}
-
export function HelpPopup({icon, size, content, position}) {
return
+ setHotspot(data.checked)}
+ />
+ {disabled && }
+ >
+ );
+}
+
+export function ThrottleToggle(props) {
+ let {on, setThrottle} = useThrottle();
+ const disabled = on === null;
+ return (
+ <>
+ setThrottle(data.checked)}
+ />
+ {disabled && }
+ >
+ );
+}
+
+export function DisableDownloadsToggle() {
+ let {on, setDownloads} = useDownloaders();
+ return setDownloads(data.checked)}
+ />;
+}
+
+export function emptyToNull(obj) {
+ const keys = Object.keys(obj);
+ for (let i = 0; i < keys.length; i++) {
+ const key = keys[i];
+ if (obj[key] === '') {
+ obj[key] = null;
+ }
+ }
+ return obj;
+}
+
export function minutesToTimestamp(minutes) {
minutes = Math.round(minutes);
const hours = String(Math.floor(minutes / 60)).padStart(1, '0');