Merge remote-tracking branch 'origin/v3.4' into dev

2025-12-06 15:59:52 +03:00 · 2022-01-23 17:56:52 +01:00
parent 02e2b51814
commit 77e1898512
538 changed files with 32282 additions and 38655 deletions
--- a/interface/src/framework/ap/APSettingsForm.tsx
+++ b/interface/src/framework/ap/APSettingsForm.tsx
@@ -0,0 +1,184 @@
+import { FC, useState } from 'react';
+import { ValidateFieldsError } from 'async-validator';
+import { range } from 'lodash';
+
+import { Button, Checkbox, MenuItem } from '@mui/material';
+import SaveIcon from '@mui/icons-material/Save';
+
+import { createAPSettingsValidator, validate } from '../../validators';
+import {
+  BlockFormControlLabel,
+  ButtonRow,
+  FormLoader,
+  SectionContent,
+  ValidatedPasswordField,
+  ValidatedTextField
+} from '../../components';
+import { APProvisionMode, APSettings } from '../../types';
+import { numberValue, updateValue, useRest } from '../../utils';
+import * as APApi from '../../api/ap';
+
+export const isAPEnabled = ({ provision_mode }: APSettings) => {
+  return provision_mode === APProvisionMode.AP_MODE_ALWAYS || provision_mode === APProvisionMode.AP_MODE_DISCONNECTED;
+};
+
+const APSettingsForm: FC = () => {
+  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<APSettings>({
+    read: APApi.readAPSettings,
+    update: APApi.updateAPSettings
+  });
+
+  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
+
+  const updateFormValue = updateValue(setData);
+
+  const content = () => {
+    if (!data) {
+      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
+    }
+
+    const validateAndSubmit = async () => {
+      try {
+        setFieldErrors(undefined);
+        await validate(createAPSettingsValidator(data), data);
+        saveData();
+      } catch (errors: any) {
+        setFieldErrors(errors);
+      }
+    };
+
+    return (
+      <>
+        <ValidatedTextField
+          fieldErrors={fieldErrors}
+          name="provision_mode"
+          label="Provide Access Point&hellip;"
+          value={data.provision_mode}
+          fullWidth
+          select
+          variant="outlined"
+          onChange={updateFormValue}
+          margin="normal"
+        >
+          <MenuItem value={APProvisionMode.AP_MODE_ALWAYS}>Always</MenuItem>
+          <MenuItem value={APProvisionMode.AP_MODE_DISCONNECTED}>When WiFi Disconnected</MenuItem>
+          <MenuItem value={APProvisionMode.AP_NEVER}>Never</MenuItem>
+        </ValidatedTextField>
+        {isAPEnabled(data) && (
+          <>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="ssid"
+              label="Access Point SSID"
+              fullWidth
+              variant="outlined"
+              value={data.ssid}
+              onChange={updateFormValue}
+              margin="normal"
+            />
+            <ValidatedPasswordField
+              fieldErrors={fieldErrors}
+              name="password"
+              label="Access Point Password"
+              fullWidth
+              variant="outlined"
+              value={data.password}
+              onChange={updateFormValue}
+              margin="normal"
+            />
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="channel"
+              label="Preferred Channel"
+              value={numberValue(data.channel)}
+              fullWidth
+              select
+              type="number"
+              variant="outlined"
+              onChange={updateFormValue}
+              margin="normal"
+            >
+              {range(1, 14).map((i) => (
+                <MenuItem key={i} value={i}>
+                  {i}
+                </MenuItem>
+              ))}
+            </ValidatedTextField>
+            <BlockFormControlLabel
+              control={<Checkbox name="ssid_hidden" checked={data.ssid_hidden} onChange={updateFormValue} />}
+              label="Hide SSID"
+            />
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="max_clients"
+              label="Max Clients"
+              value={numberValue(data.max_clients)}
+              fullWidth
+              select
+              type="number"
+              variant="outlined"
+              onChange={updateFormValue}
+              margin="normal"
+            >
+              {range(1, 9).map((i) => (
+                <MenuItem key={i} value={i}>
+                  {i}
+                </MenuItem>
+              ))}
+            </ValidatedTextField>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="local_ip"
+              label="Local IP"
+              fullWidth
+              variant="outlined"
+              value={data.local_ip}
+              onChange={updateFormValue}
+              margin="normal"
+            />
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="gateway_ip"
+              label="Gateway"
+              fullWidth
+              variant="outlined"
+              value={data.gateway_ip}
+              onChange={updateFormValue}
+              margin="normal"
+            />
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="subnet_mask"
+              label="Subnet"
+              fullWidth
+              variant="outlined"
+              value={data.subnet_mask}
+              onChange={updateFormValue}
+              margin="normal"
+            />
+          </>
+        )}
+        <ButtonRow>
+          <Button
+            startIcon={<SaveIcon />}
+            disabled={saving}
+            variant="outlined"
+            color="primary"
+            type="submit"
+            onClick={validateAndSubmit}
+          >
+            Save
+          </Button>
+        </ButtonRow>
+      </>
+    );
+  };
+
+  return (
+    <SectionContent title="Access Point Settings" titleGutter>
+      {content()}
+    </SectionContent>
+  );
+};
+
+export default APSettingsForm;