andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2023-09-19 14:31:25 +02:00
parent 8b136ddefe ca9ac86fde
commit e6bcdede73
43 changed files with 320 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/src/project/SettingsCustomization.tsx
View File

@@ -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);

4
interface/src/project/SettingsEntities.tsx
View File

@@ -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 (

8
interface/src/project/api.ts
View File

@@ -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);