api refactoring

interface/src/app/main/Customizations.tsx

@@ -26,7 +26,7 @@ import {
   Typography
 } from '@mui/material';
 
-import * as SystemApi from 'api/system';
+import { restart } from 'api/system';
 
 import {
   Body,
@@ -50,7 +50,13 @@ import {
 } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 
-import * as EMSESP from './api';
+import {
+  readDeviceEntities,
+  readDevices,
+  resetCustomizations,
+  writeCustomizationEntities,
+  writeDeviceName
+} from '../../api/app';
 import SettingsCustomizationsDialog from './CustomizationsDialog';
 import EntityMaskToggle from './EntityMaskToggle';
 import OptionIcon from './OptionIcon';
@@ -77,7 +83,7 @@ const Customizations = () => {
   useLayoutTitle(LL.CUSTOMIZATIONS());
 
   // fetch devices first
-  const { data: devices, send: fetchDevices } = useRequest(EMSESP.readDevices);
+  const { data: devices, send: fetchDevices } = useRequest(readDevices);
 
   const [selectedDevice, setSelectedDevice] = useState<number>(
     Number(useLocation().state) || -1
@@ -86,27 +92,26 @@ const Customizations = () => {
     useState<string>(''); // needed for API URL
   const [selectedDeviceName, setSelectedDeviceName] = useState<string>('');
 
-  const { send: resetCustomizations } = useRequest(EMSESP.resetCustomizations(), {
+  const { send: sendResetCustomizations } = useRequest(resetCustomizations(), {
     immediate: false
   });
 
-  const { send: writeDeviceName } = useRequest(
-    (data: { id: number; name: string }) => EMSESP.writeDeviceName(data),
+  const { send: sendDeviceName } = useRequest(
+    (data: { id: number; name: string }) => writeDeviceName(data),
     {
       immediate: false
     }
   );
 
-  const { send: writeCustomizationEntities } = useRequest(
-    (data: { id: number; entity_ids: string[] }) =>
-      EMSESP.writeCustomizationEntities(data),
+  const { send: sendCustomizationEntities } = useRequest(
+    (data: { id: number; entity_ids: string[] }) => writeCustomizationEntities(data),
     {
       immediate: false
     }
   );
 
-  const { send: readDeviceEntities } = useRequest(
-    (data: number) => EMSESP.readDeviceEntities(data),
+  const { send: sendDeviceEntities } = useRequest(
+    (data: number) => readDeviceEntities(data),
     {
       initialData: [],
       immediate: false
@@ -127,7 +132,7 @@ const Customizations = () => {
     );
   };
 
-  const { send: restartCommand } = useRequest(SystemApi.restart(), {
+  const { send: sendRestart } = useRequest(restart(), {
     immediate: false
   });
 
@@ -228,7 +233,7 @@ const Customizations = () => {
 
   useEffect(() => {
     if (devices && selectedDevice !== -1) {
-      void readDeviceEntities(selectedDevice);
+      void sendDeviceEntities(selectedDevice);
       const id = devices.devices.findIndex((d) => d.i === selectedDevice);
       if (id === -1) {
         setSelectedDevice(-1);
@@ -242,8 +247,8 @@ const Customizations = () => {
     }
   }, [devices, selectedDevice]);
 
-  const restart = async () => {
-    await restartCommand().catch((error: Error) => {
+  const doRestart = async () => {
+    await sendRestart().catch((error: Error) => {
       toast.error(error.message);
     });
     setRestarting(true);
@@ -324,7 +329,7 @@ const Customizations = () => {
 
   const resetCustomization = async () => {
     try {
-      await resetCustomizations();
+      await sendResetCustomizations();
       toast.info(LL.CUSTOMIZATIONS_RESTART());
     } catch (error) {
       toast.error((error as Error).message);
@@ -384,7 +389,7 @@ const Customizations = () => {
         return;
       }
 
-      await writeCustomizationEntities({
+      await sendCustomizationEntities({
         id: selectedDevice,
         entity_ids: masked_entities
       }).catch((error: Error) => {
@@ -399,7 +404,7 @@ const Customizations = () => {
   };
 
   const renameDevice = async () => {
-    await writeDeviceName({ id: selectedDevice, name: selectedDeviceName })
+    await sendDeviceName({ id: selectedDevice, name: selectedDeviceName })
       .then(() => {
         toast.success(LL.UPDATED_OF(LL.NAME(1)));
       })
@@ -673,7 +678,7 @@ const Customizations = () => {
             startIcon={<PowerSettingsNewIcon />}
             variant="contained"
             color="error"
-            onClick={restart}
+            onClick={doRestart}
           >
             {LL.RESTART()}
           </Button>
@@ -688,7 +693,7 @@ const Customizations = () => {
                   startIcon={<CancelIcon />}
                   variant="outlined"
                   color="secondary"
-                  onClick={() => devices && readDeviceEntities(selectedDevice)}
+                  onClick={() => devices && sendDeviceEntities(selectedDevice)}
                 >
                   {LL.CANCEL()}
                 </Button>