Merge remote-tracking branch 'origin/dev'

2025-12-09 17:29:50 +03:00 · 2023-10-01 17:40:02 +02:00
parent 86919c1684 20d8b6400f
commit 32f2c6d341
87 changed files with 1816 additions and 963 deletions
--- a/interface/package.json
+++ b/interface/package.json
@@ -22,44 +22,42 @@
    "@alova/adapter-xhr": "^1.0.1",
    "@emotion/react": "^11.11.1",
    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.8",
-    "@mui/material": "^5.14.8",
-    "@preact/compat": "^17.1.2",
-    "@prefresh/vite": "^2.4.1",
+    "@mui/icons-material": "^5.14.11",
+    "@mui/material": "^5.14.11",
    "@table-library/react-table-library": "4.1.7",
    "@types/lodash-es": "^4.17.9",
-    "@types/node": "^20.6.0",
-    "@types/react": "^18.2.21",
-    "@types/react-dom": "^18.2.7",
+    "@types/node": "^20.8.0",
+    "@types/react": "^18.2.24",
+    "@types/react-dom": "^18.2.8",
    "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.11.1",
+    "alova": "^2.13.1",
    "async-validator": "^4.2.5",
    "history": "^5.3.0",
    "jwt-decode": "^3.1.2",
    "lodash-es": "^4.17.21",
    "mime-types": "^2.1.35",
-    "preact": "^10.17.1",
    "react": "latest",
    "react-dom": "latest",
    "react-dropzone": "^14.2.3",
    "react-icons": "^4.11.0",
-    "react-router-dom": "^6.15.0",
+    "react-router-dom": "^6.16.0",
    "react-toastify": "^9.1.3",
    "sockette": "^2.0.6",
    "typesafe-i18n": "^5.26.2",
    "typescript": "^5.2.2"
  },
  "devDependencies": {
-    "@babel/core": "^7.22.17",
+    "@babel/core": "^7.23.0",
+    "@preact/compat": "^17.1.2",
    "@preact/preset-vite": "^2.5.0",
    "@types/babel__core": "^7",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "eslint": "^8.49.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
+    "eslint": "^8.50.0",
    "eslint-config-airbnb": "^19.0.4",
    "eslint-config-airbnb-typescript": "^17.1.0",
    "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
    "eslint-plugin-autofix": "^1.1.0",
    "eslint-plugin-import": "^2.28.1",
    "eslint-plugin-jsx-a11y": "^6.7.1",
@@ -67,12 +65,13 @@
    "eslint-plugin-react": "^7.33.2",
    "eslint-plugin-react-hooks": "^4.6.0",
    "npm-run-all": "^4.1.5",
+    "preact": "^10.18.1",
    "prettier": "^3.0.3",
    "rollup-plugin-visualizer": "^5.9.2",
-    "terser": "^5.19.4",
+    "terser": "^5.20.0",
    "vite": "^4.4.9",
-    "vite-plugin-svgr": "^3.2.0",
-    "vite-tsconfig-paths": "^4.2.0"
+    "vite-plugin-svgr": "^4.1.0",
+    "vite-tsconfig-paths": "^4.2.1"
  },
  "packageManager": "yarn@3.4.1"
 }
--- a/interface/src/CustomTheme.tsx
+++ b/interface/src/CustomTheme.tsx
@@ -26,6 +26,9 @@ const theme = responsiveFontSizes(
      },
      info: {
        main: '#607d8b' // blueGrey[500]
+      },
+      text: {
+        disabled: '#eee' // white
      }
    }
  })
--- a/interface/src/SignIn.tsx
+++ b/interface/src/SignIn.tsx
@@ -15,15 +15,15 @@ import { PROJECT_NAME } from 'api/env';
 import { ValidatedPasswordField, ValidatedTextField } from 'components';
 import { AuthenticationContext } from 'contexts/authentication';

-import { ReactComponent as DEflag } from 'i18n/DE.svg';
-import { ReactComponent as FRflag } from 'i18n/FR.svg';
-import { ReactComponent as GBflag } from 'i18n/GB.svg';
-import { ReactComponent as ITflag } from 'i18n/IT.svg';
-import { ReactComponent as NLflag } from 'i18n/NL.svg';
-import { ReactComponent as NOflag } from 'i18n/NO.svg';
-import { ReactComponent as PLflag } from 'i18n/PL.svg';
-import { ReactComponent as SVflag } from 'i18n/SV.svg';
-import { ReactComponent as TRflag } from 'i18n/TR.svg';
+import DEflag from 'i18n/DE.svg';
+import FRflag from 'i18n/FR.svg';
+import GBflag from 'i18n/GB.svg';
+import ITflag from 'i18n/IT.svg';
+import NLflag from 'i18n/NL.svg';
+import NOflag from 'i18n/NO.svg';
+import PLflag from 'i18n/PL.svg';
+import SVflag from 'i18n/SV.svg';
+import TRflag from 'i18n/TR.svg';
 import { I18nContext } from 'i18n/i18n-react';
 import { loadLocaleAsync } from 'i18n/i18n-util.async';
 import { onEnterCallback, updateValue } from 'utils';
@@ -115,39 +115,39 @@ const SignIn: FC = () => {

        <TextField name="locale" variant="outlined" value={locale} onChange={onLocaleSelected} size="small" select>
          <MenuItem key="de" value="de">
-            <DEflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={DEflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;DE
          </MenuItem>
          <MenuItem key="en" value="en">
-            <GBflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={GBflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;EN
          </MenuItem>
          <MenuItem key="fr" value="fr">
-            <FRflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={FRflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;FR
          </MenuItem>
          <MenuItem key="it" value="it">
-            <ITflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={ITflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;IT
          </MenuItem>
          <MenuItem key="nl" value="nl">
-            <NLflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={NLflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;NL
          </MenuItem>
          <MenuItem key="no" value="no">
-            <NOflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={NOflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;NO
          </MenuItem>
          <MenuItem key="pl" value="pl">
-            <PLflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;PL
          </MenuItem>
          <MenuItem key="sv" value="sv">
-            <SVflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={SVflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;SV
          </MenuItem>
          <MenuItem key="tr" value="tr">
-            <TRflag style={{ width: 16, verticalAlign: 'middle' }} />
+            <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
            &nbsp;TR
          </MenuItem>
        </TextField>
--- a/interface/src/components/layout/LayoutAuthMenu.tsx
+++ b/interface/src/components/layout/LayoutAuthMenu.tsx
@@ -19,15 +19,15 @@ import type { Locales } from 'i18n/i18n-types';
 import type { FC, ChangeEventHandler } from 'react';
 import { AuthenticatedContext } from 'contexts/authentication';

-import { ReactComponent as DEflag } from 'i18n/DE.svg';
-import { ReactComponent as FRflag } from 'i18n/FR.svg';
-import { ReactComponent as GBflag } from 'i18n/GB.svg';
-import { ReactComponent as ITflag } from 'i18n/IT.svg';
-import { ReactComponent as NLflag } from 'i18n/NL.svg';
-import { ReactComponent as NOflag } from 'i18n/NO.svg';
-import { ReactComponent as PLflag } from 'i18n/PL.svg';
-import { ReactComponent as SVflag } from 'i18n/SV.svg';
-import { ReactComponent as TRflag } from 'i18n/TR.svg';
+import DEflag from 'i18n/DE.svg';
+import FRflag from 'i18n/FR.svg';
+import GBflag from 'i18n/GB.svg';
+import ITflag from 'i18n/IT.svg';
+import NLflag from 'i18n/NL.svg';
+import NOflag from 'i18n/NO.svg';
+import PLflag from 'i18n/PL.svg';
+import SVflag from 'i18n/SV.svg';
+import TRflag from 'i18n/TR.svg';
 import { I18nContext } from 'i18n/i18n-react';
 import { loadLocaleAsync } from 'i18n/i18n-util.async';

@@ -75,39 +75,39 @@ const LayoutAuthMenu: FC = () => {
        select
      >
        <MenuItem key="de" value="de">
-          <DEflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={DEflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;DE
        </MenuItem>
        <MenuItem key="en" value="en">
-          <GBflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={GBflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;EN
        </MenuItem>
        <MenuItem key="fr" value="fr">
-          <FRflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={FRflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;FR
        </MenuItem>
        <MenuItem key="it" value="it">
-          <ITflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={ITflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;IT
        </MenuItem>
        <MenuItem key="nl" value="nl">
-          <NLflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={NLflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;NL
        </MenuItem>
        <MenuItem key="no" value="no">
-          <NOflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={NOflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;NO
        </MenuItem>
        <MenuItem key="pl" value="pl">
-          <PLflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;PL
        </MenuItem>
        <MenuItem key="sv" value="sv">
-          <SVflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={SVflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;SV
        </MenuItem>
        <MenuItem key="tr" value="tr">
-          <TRflag style={{ width: 16, verticalAlign: 'middle' }} />
+          <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
          &nbsp;TR
        </MenuItem>
      </TextField>
--- a/interface/src/framework/network/NetworkSettingsForm.tsx
+++ b/interface/src/framework/network/NetworkSettingsForm.tsx
@@ -82,7 +82,8 @@ const WiFiSettingsForm: FC = () => {
      if (selectedNetwork) {
        updateState('networkSettings', (current_data) => ({
          ssid: selectedNetwork.ssid,
-          password: '',
+          bssid: selectedNetwork.bssid,
+          password: current_data ? current_data.password : '',
          hostname: current_data?.hostname,
          static_ip_config: false,
          enableIPv6: false,
@@ -117,6 +118,12 @@ const WiFiSettingsForm: FC = () => {
      } catch (errors: any) {
        setFieldErrors(errors);
      }
+      deselectNetwork();
+    };
+
+    const setCancel = async () => {
+      deselectNetwork();
+      await loadData();
    };

    const restart = async () => {
@@ -139,10 +146,17 @@ const WiFiSettingsForm: FC = () => {
              </ListItemAvatar>
              <ListItemText
                primary={selectedNetwork.ssid}
-                secondary={'Security: ' + networkSecurityMode(selectedNetwork) + ', Ch: ' + selectedNetwork.channel}
+                secondary={
+                  'Security: ' +
+                  networkSecurityMode(selectedNetwork) +
+                  ', Ch: ' +
+                  selectedNetwork.channel +
+                  ', bssid: ' +
+                  selectedNetwork.bssid
+                }
              />
              <ListItemSecondaryAction>
-                <IconButton onClick={deselectNetwork}>
+                <IconButton onClick={setCancel}>
                  <DeleteIcon />
                </IconButton>
              </ListItemSecondaryAction>
@@ -160,6 +174,16 @@ const WiFiSettingsForm: FC = () => {
            margin="normal"
          />
        )}
+        <ValidatedTextField
+          fieldErrors={fieldErrors}
+          name="bssid"
+          label={'BSSID (' + LL.NETWORK_BLANK_BSSID() + ')'}
+          fullWidth
+          variant="outlined"
+          value={data.bssid}
+          onChange={updateFormValue}
+          margin="normal"
+        />
        {(!selectedNetwork || !isNetworkOpen(selectedNetwork)) && (
          <ValidatedPasswordField
            fieldErrors={fieldErrors}
@@ -296,7 +320,7 @@ const WiFiSettingsForm: FC = () => {
          </MessageBox>
        )}

-        {!restartNeeded && dirtyFlags && dirtyFlags.length !== 0 && (
+        {!restartNeeded && (selectedNetwork || (dirtyFlags && dirtyFlags.length !== 0)) && (
          <ButtonRow>
            <Button
              startIcon={<CancelIcon />}
--- a/interface/src/framework/network/WiFiNetworkSelector.tsx
+++ b/interface/src/framework/network/WiFiNetworkSelector.tsx
@@ -65,7 +65,9 @@ const WiFiNetworkSelector: FC<WiFiNetworkSelectorProps> = ({ networkList }) => {
      </ListItemAvatar>
      <ListItemText
        primary={network.ssid}
-        secondary={'Security: ' + networkSecurityMode(network) + ', Ch: ' + network.channel}
+        secondary={
+          'Security: ' + networkSecurityMode(network) + ', Ch: ' + network.channel + ', bssid: ' + network.bssid
+        }
      />
      <ListItemIcon>
        <Badge badgeContent={network.rssi + 'dBm'}>
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -282,6 +282,7 @@ const de: Translation = {
  NETWORK_SCANNER: 'Netzwerk Suche',
  NETWORK_NO_WIFI: 'Keine WiFi Netzwerke gefunden',
  NETWORK_BLANK_SSID: 'Freilassen um WiFi zu deaktivieren und ETH zu aktivieren',
+  NETWORK_BLANK_BSSID: 'Freilassen um nur SSID für die Verbindung zu nutzen',
  TX_POWER: 'Tx Leistung',
  HOSTNAME: 'Hostname',
  NETWORK_DISABLE_SLEEP: 'Deaktiviere WiFi Schlafmodus',
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -282,6 +282,7 @@ const en: Translation = {
  NETWORK_SCANNER: 'Network Scanner',
  NETWORK_NO_WIFI: 'No WiFi networks found',
  NETWORK_BLANK_SSID: 'leave blank to disable WiFi and enable ETH',
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID',
  TX_POWER: 'Tx Power',
  HOSTNAME: 'Hostname',
  NETWORK_DISABLE_SLEEP: 'Disable WiFi Sleep Mode',
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -282,6 +282,7 @@ const fr: Translation = {
  NETWORK_SCANNER: 'Scan réseau',
  NETWORK_NO_WIFI: 'Pas de réseau WiFi trouvé',
  NETWORK_BLANK_SSID: 'laisser vide pour désactiver le WiFi', // and enable ETH // TODO translate
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Puissance Tx',
  HOSTNAME: 'Nom d\'hôte',
  NETWORK_DISABLE_SLEEP: 'Désactiver le mode veille du WiFi',
--- a/interface/src/i18n/it/index.ts
+++ b/interface/src/i18n/it/index.ts
@@ -284,6 +284,7 @@ const it: Translation = {
  NETWORK_SCANNER: 'Scansione Rete',
  NETWORK_NO_WIFI: 'Nessuana rete WiFi trovata',
  NETWORK_BLANK_SSID: 'lasciare vuoto per disattivare WiFi',
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Potenza Tx',
  HOSTNAME: 'Nome ospite',
  NETWORK_DISABLE_SLEEP: 'Disabilita la modalità sospensione Wi-Fi',
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -282,6 +282,7 @@ const nl: Translation = {
  NETWORK_SCANNER: 'Netwerk Scanner',
  NETWORK_NO_WIFI: 'Geen WiFi networken gevonden',
  NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen',
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Tx Vermogen',
  HOSTNAME: 'Hostname',
  NETWORK_DISABLE_SLEEP: 'WiFi Sleep Mode uitzetten',
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -282,6 +282,7 @@ const no: Translation = {
  NETWORK_SCANNER: 'Nettverk Scanner',
  NETWORK_NO_WIFI: 'Ingen trådløse nett funnet',
  NETWORK_BLANK_SSID: 'la feltet være blankt for å deaktivisere trådløst nettverk', // TODO translate
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Tx Effekt',
  HOSTNAME: 'Hostname',
  NETWORK_DISABLE_SLEEP: 'Hindre at trådløst nettverk går i Sleep Mode',
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -282,6 +282,7 @@ const pl: BaseTranslation = {
  NETWORK_SCANNER: 'Skaner sieci WiFi',
  NETWORK_NO_WIFI: 'Brak sieci WiFi w zasięgu',
  NETWORK_BLANK_SSID: 'pozostaw puste aby wyłączyć WiFi', // and enable ETH // TODO translate
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Moc nadawania',
  HOSTNAME: 'Nazwa w sieci',
  NETWORK_DISABLE_SLEEP: 'Wyłącz tryb uśpienia WiFi',
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -282,6 +282,7 @@ const sv: Translation = {
  NETWORK_SCANNER: 'Hittade nätverk',
  NETWORK_NO_WIFI: 'Inga WiFi-nätverk hittades',
  NETWORK_BLANK_SSID: 'lämna blankt för att inaktivera WiFi', // and enable ETH // TODO translate
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Tx Effekt',
  HOSTNAME: 'Värdnamn',
  NETWORK_DISABLE_SLEEP: 'Inaktivera sömnläge',
--- a/interface/src/i18n/tr/index.ts
+++ b/interface/src/i18n/tr/index.ts
@@ -282,6 +282,7 @@ const tr: Translation = {
  NETWORK_SCANNER: 'Ağ Tarayıcısı',
  NETWORK_NO_WIFI: 'Hiçbir Kablosuz Ağ bulunamadı',
  NETWORK_BLANK_SSID: 'Kablosuz ağı devre dışı bırakmak için boş bırakın', // TODO translate
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
  TX_POWER: 'Aktarım gücü',
  HOSTNAME: 'Ana Makine Adı',
  NETWORK_DISABLE_SLEEP: 'Kablosuz uyku modunu devre dışına al',
--- a/interface/src/project/DashboardDevicesDialog.tsx
+++ b/interface/src/project/DashboardDevicesDialog.tsx
@@ -30,16 +30,6 @@ import { updateValue } from 'utils';

 import { validate } from 'validators';

-// const dialogStyle = {
-//   '& .MuiDialog-paper': {
-//     borderRadius: '8px',
-//     borderColor: '#565656',
-//     borderStyle: 'solid',
-//     borderWidth: '1px'
-//   },
-//   backdropFilter: 'blur(1px)'
-// };
-
 type DashboardDevicesDialogProps = {
  open: boolean;
  onClose: () => void;
@@ -124,7 +114,7 @@ const DashboardDevicesDialog = ({
  return (
    <Dialog sx={dialogStyle} open={open} onClose={close}>
      <DialogTitle>
-        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(0)}
+        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(1)}
      </DialogTitle>
      <DialogContent dividers>
        <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
--- a/interface/src/project/SettingsCustomization.tsx
+++ b/interface/src/project/SettingsCustomization.tsx
@@ -65,7 +65,9 @@ const SettingsCustomization: FC = () => {

  const { data: devices } = useRequest(EMSESP.readDevices);

-  const { send: writeCustomEntities } = useRequest((data) => EMSESP.writeCustomEntities(data), { immediate: false });
+  const { send: writeCustomizationEntities } = useRequest((data) => EMSESP.writeCustomizationEntities(data), {
+    immediate: false
+  });

  const { send: readDeviceEntities, onSuccess: onSuccess } = useRequest((data) => EMSESP.readDeviceEntities(data), {
    initialData: [],
@@ -312,7 +314,7 @@ const SettingsCustomization: FC = () => {
        return;
      }

-      await writeCustomEntities({ id: devices?.devices[selectedDevice].i, entity_ids: masked_entities }).catch(
+      await writeCustomizationEntities({ id: devices?.devices[selectedDevice].i, entity_ids: masked_entities }).catch(
        (error) => {
          if (error.message === 'Reboot required') {
            setRestartNeeded(true);
--- a/interface/src/project/SettingsEntities.tsx
+++ b/interface/src/project/SettingsEntities.tsx
@@ -33,12 +33,12 @@ const SettingsEntities: FC = () => {
    data: entities,
    send: fetchEntities,
    error
-  } = useRequest(EMSESP.readEntities, {
+  } = useRequest(EMSESP.readCustomEntities, {
    initialData: [],
    force: true
  });

-  const { send: writeEntities } = useRequest((data) => EMSESP.writeEntities(data), { immediate: false });
+  const { send: writeEntities } = useRequest((data) => EMSESP.writeCustomEntities(data), { immediate: false });

  function hasEntityChanged(ei: EntityItem) {
    return (
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -62,7 +62,7 @@ export const readDeviceEntities = (id: number) =>
  });
 export const readDevices = () => alovaInstance.Get<Devices>('/rest/devices');
 export const resetCustomizations = () => alovaInstance.Post('/rest/resetCustomizations');
-export const writeCustomEntities = (data: any) => alovaInstance.Post('/rest/customEntities', data);
+export const writeCustomizationEntities = (data: any) => alovaInstance.Post('/rest/customizationEntities', data);

 // SettingsScheduler
 export const readSchedule = () =>
@@ -85,8 +85,8 @@ export const readSchedule = () =>
 export const writeSchedule = (data: any) => alovaInstance.Post('/rest/schedule', data);

 // SettingsEntities
-export const readEntities = () =>
-  alovaInstance.Get<EntityItem[]>('/rest/entities', {
+export const readCustomEntities = () =>
+  alovaInstance.Get<EntityItem[]>('/rest/customentities', {
    name: 'entities',
    transformData(data: any) {
      return data.entities.map((ei: EntityItem) => ({
@@ -104,4 +104,4 @@ export const readEntities = () =>
      }));
    }
  });
-export const writeEntities = (data: any) => alovaInstance.Post('/rest/entities', data);
+export const writeCustomEntities = (data: any) => alovaInstance.Post('/rest/customentities', data);
--- a/interface/src/types/network.ts
+++ b/interface/src/types/network.ts
@@ -37,6 +37,7 @@ export interface NetworkStatus {

 export interface NetworkSettings {
  ssid: string;
+  bssid: string;
  password: string;
  hostname: string;
  static_ip_config: boolean;
--- a/interface/src/validators/network.ts
+++ b/interface/src/validators/network.ts
@@ -5,6 +5,7 @@ import type { NetworkSettings } from 'types';
 export const createNetworkSettingsValidator = (networkSettings: NetworkSettings) =>
  new Schema({
    ssid: [{ type: 'string', max: 32, message: 'SSID must be 32 characters or less' }],
+    bssid: [{ type: 'string', max: 17, message: 'BSSID must be 17 characters or empty' }],
    password: { type: 'string', max: 64, message: 'Password must be 64 characters or less' },
    hostname: [{ required: true, message: 'Hostname is required' }, HOSTNAME_VALIDATOR],
    ...(networkSettings.static_ip_config && {
--- a/interface/yarn.lock
+++ b/interface/yarn.lock