andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-31 11:09:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

experiment with path args (for future change)

Browse Source
This commit is contained in:
Proddy
2023-12-10 14:58:33 +01:00
parent 513d0e982e
commit 0b481a44a1
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,8 @@ import { alovaInstance } from 'api/endpoints';
export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`); export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`);
export const readDeviceData = (id: number) => export const readDeviceData = (id: number) =>
alovaInstance.Get<DeviceData>('/rest/deviceData', { alovaInstance.Get<DeviceData>('/rest/deviceData', {
params: { id }, // alovaInstance.Get<DeviceData>(`/rest/deviceData/${id}`, {
params: { id }, // TODO remove later
responseType: 'arraybuffer' // uses msgpack responseType: 'arraybuffer' // uses msgpack
}); });
export const writeDeviceValue = (data: any) => alovaInstance.Post('/rest/writeDeviceValue', data); export const writeDeviceValue = (data: any) => alovaInstance.Post('/rest/writeDeviceValue', data);
@@ -53,8 +54,9 @@ export const getSchedule = () => alovaInstance.Get('/rest/getSchedule');
// SettingsCustomization // SettingsCustomization
export const readDeviceEntities = (id: number) => export const readDeviceEntities = (id: number) =>
alovaInstance.Get<DeviceEntity[]>('/rest/deviceEntities', { // alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities/${id}`, {
params: { id }, alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
params: { id }, // TODO remove later
responseType: 'arraybuffer', responseType: 'arraybuffer',
transformData(data: any) { transformData(data: any) {
return data.map((de: DeviceEntity) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma })); return data.map((de: DeviceEntity) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma }));

17
mock-api/Handler.ts
View File

@@ -419,8 +419,13 @@ const EMSESP_CORE_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'coreData';
const EMSESP_SENSOR_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'sensorData'; const EMSESP_SENSOR_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'sensorData';
const EMSESP_DEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'devices'; const EMSESP_DEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'devices';
const EMSESP_SCANDEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'scanDevices'; const EMSESP_SCANDEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'scanDevices';
const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData/:id';
const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities/:id'; // const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData/:id';
// const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities/:id';
const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData';
const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities';
const EMSESP_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'status'; const EMSESP_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'status';
const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile'; const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile';
const EMSESP_WRITE_VALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceValue'; const EMSESP_WRITE_VALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceValue';
@@ -2466,7 +2471,9 @@ router
.post(EMSESP_SCANDEVICES_ENDPOINT, () => new Response('OK', { status: 200 })) .post(EMSESP_SCANDEVICES_ENDPOINT, () => new Response('OK', { status: 200 }))
.get(EMSESP_STATUS_ENDPOINT, () => new Response(JSON.stringify(status), { headers })) .get(EMSESP_STATUS_ENDPOINT, () => new Response(JSON.stringify(status), { headers }))
.get(EMSESP_DEVICEDATA_ENDPOINT, (request) => { .get(EMSESP_DEVICEDATA_ENDPOINT, (request) => {
const id = Number(request.params.id); // const id = Number(request.params.id); // TODO when using :id
const id = Number(request.query.id);
if (id == 1) { if (id == 1) {
return new Response(encoder.encode(emsesp_devicedata_1), { headers }); return new Response(encoder.encode(emsesp_devicedata_1), { headers });
} }
@@ -2493,7 +2500,9 @@ router
} }
}) })
.get(EMSESP_DEVICEENTITIES_ENDPOINT, (request) => { .get(EMSESP_DEVICEENTITIES_ENDPOINT, (request) => {
const id = Number(request.params.id); // const id = Number(request.params.id); // TODO when using :id
const id = Number(request.query.id);
if (id == 1) { if (id == 1) {
return new Response(encoder.encode(emsesp_deviceentities_1), { headers }); return new Response(encoder.encode(emsesp_deviceentities_1), { headers });
} }