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

add check for min/max when sending device values

Browse Source
This commit is contained in:
proddy
2023-04-30 09:53:10 +02:00
parent ceb63fa09f
commit 8a02f2a27a
5 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
interface/src/project/validators.ts
View File

@@ -1,5 +1,6 @@
import Schema from 'async-validator';
import type { AnalogSensor, Settings } from './types';
import { DeviceValueUOM } from './types';
import type { AnalogSensor, DeviceValue, Settings } from './types';
import type { InternalRuleItem } from 'async-validator';
import { IP_OR_HOSTNAME_VALIDATOR } from 'validators/shared';
@@ -162,16 +163,20 @@ export const analogSensorItemValidation = (sensors: AnalogSensor[], creating: bo
]
});
export const deviceValueItemValidation = (isNumber: boolean) =>
export const deviceValueItemValidation = (dv: DeviceValue) =>
new Schema({
v: [
{ required: true, message: 'Value is required' },
{
validator(rule: InternalRuleItem, value: string, callback: (error?: string) => void) {
if (isNumber && isNaN(+value)) {
callback('Not a valid number');
if (dv.u !== DeviceValueUOM.NONE && isNaN(+value)) {
// not a number
dv.m && dv.x ? callback('Must be a number between ' + dv.m + ' and ' + dv.x) : callback('Must be a number');
}
callback();
// is a number
(dv.m && Number(value) < dv.m) || (dv.x && Number(value) > dv.x)
? callback('Must be between ' + dv.m + ' and ' + dv.x)
: callback();
}
}
]