Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { bool, number, object, string } from 'yup';
import { VoltageLevelFormInfos } from '../../voltage-level/voltage-level.type';
import { FieldConstants } from '../../../../utils';
import { FieldConstants, YUP_NOT_TYPE_NUMBER } from '../../../../utils';

const getVoltageLevelAndBusOrBusBarSectionFieldsSchema = (
isEquipmentModification: boolean,
Expand Down Expand Up @@ -55,7 +55,7 @@ export const getConnectivityWithPositionSchema = (isEquipmentModification = fals
object().shape({
[FieldConstants.CONNECTION_DIRECTION]: string().nullable(),
[FieldConstants.CONNECTION_NAME]: string(),
[FieldConstants.CONNECTION_POSITION]: number().nullable(),
[FieldConstants.CONNECTION_POSITION]: number().typeError(YUP_NOT_TYPE_NUMBER).nullable(),
[FieldConstants.CONNECTED]: bool()
.nullable()
.when([], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { boolean, number, object } from 'yup';
import { MeasurementInfo } from './measurement.type';
import { FieldConstants } from '../../../../utils';
import { FieldConstants, YUP_NOT_TYPE_NUMBER } from '../../../../utils';

export function getPowerWithValidityEmptyFormData(id: string) {
return {
Expand All @@ -21,7 +21,7 @@ export function getPowerWithValidityEmptyFormData(id: string) {
export function getPowerWithValidityValidationSchema(id: string) {
return {
[id]: object().shape({
[FieldConstants.VALUE]: number().nullable(),
[FieldConstants.VALUE]: number().typeError(YUP_NOT_TYPE_NUMBER).nullable(),
[FieldConstants.VALIDITY]: boolean().nullable(),
}),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { number, TestContext } from 'yup';
import { FieldConstants } from '../../../../utils';
import { FieldConstants, YUP_NOT_TYPE_NUMBER } from '../../../../utils';

export const getSetPointsEmptyFormData = (_isEquipmentModification = false) => ({
[FieldConstants.ACTIVE_POWER_SET_POINT]: null,
Expand Down Expand Up @@ -34,6 +34,7 @@ const testValueWithinPowerIntervalOrEqualToZero = (value: number, context: TestC

export const getActivePowerSetPointSchema = (isEquipmentModification = false) => ({
[FieldConstants.ACTIVE_POWER_SET_POINT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.when([], {
is: () => isEquipmentModification,
then: (schema) => {
Expand All @@ -57,6 +58,7 @@ export const getActivePowerSetPointSchema = (isEquipmentModification = false) =>

export const getReactivePowerSetPointSchema = (isEquipmentModification = false) => ({
[FieldConstants.REACTIVE_POWER_SET_POINT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.when([FieldConstants.VOLTAGE_REGULATION], {
is: (value: string) => !isEquipmentModification && !value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
sanitizeString,
UNDEFINED_CONNECTION_DIRECTION,
UNDEFINED_LOAD_TYPE,
YUP_NOT_TYPE_NUMBER,
YUP_REQUIRED,
} from '../../../../utils';
import {
Expand All @@ -32,8 +33,14 @@ export const loadCreationFormSchema = object()
[FieldConstants.EQUIPMENT_ID]: string().required(YUP_REQUIRED),
[FieldConstants.EQUIPMENT_NAME]: string().nullable(),
[FieldConstants.LOAD_TYPE]: string().nullable(),
[FieldConstants.ACTIVE_POWER_SET_POINT]: number().nullable().required(YUP_REQUIRED),
[FieldConstants.REACTIVE_POWER_SET_POINT]: number().nullable().required(YUP_REQUIRED),
[FieldConstants.ACTIVE_POWER_SET_POINT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.required(YUP_REQUIRED),
[FieldConstants.REACTIVE_POWER_SET_POINT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.required(YUP_REQUIRED),
[FieldConstants.CONNECTIVITY]: getConnectivityWithPositionSchema(false),
})
.concat(creationPropertiesSchema)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
getPropertiesFromModification,
toModificationProperties,
} from '../../common/properties/propertyUtils';
import { FieldConstants, sanitizeString, YUP_REQUIRED } from '../../../../utils';
import { FieldConstants, sanitizeString, YUP_NOT_TYPE_NUMBER, YUP_REQUIRED } from '../../../../utils';
import { convertInputValue, convertOutputValue } from '../../../../utils/conversionUtils';
import { FieldType } from '../../../../utils/types/fieldType';
import { MODIFICATION_TYPES } from '../../../../utils/types/modificationType';
Expand Down Expand Up @@ -105,21 +105,28 @@ export const voltageLevelCreationFormSchema = object()
[FieldConstants.SUBSTATION_CREATION]: creationPropertiesSchema,
[FieldConstants.HIDE_NOMINAL_VOLTAGE]: boolean().required(YUP_REQUIRED),
[FieldConstants.NOMINAL_V]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.when([FieldConstants.HIDE_NOMINAL_VOLTAGE], {
is: (hideNominalVoltage: boolean) => !hideNominalVoltage,
then: (schema) => schema.min(0, 'mustBeGreaterOrEqualToZero').required(YUP_REQUIRED),
}),
[FieldConstants.LOW_VOLTAGE_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'mustBeGreaterOrEqualToZero')
.max(ref(FieldConstants.HIGH_VOLTAGE_LIMIT), 'voltageLevelNominalVoltageMaxValueError'),
[FieldConstants.HIGH_VOLTAGE_LIMIT]: number().nullable().min(0, 'mustBeGreaterOrEqualToZero'),
[FieldConstants.HIGH_VOLTAGE_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'mustBeGreaterOrEqualToZero'),
[FieldConstants.LOW_SHORT_CIRCUIT_CURRENT_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'ShortCircuitCurrentLimitMustBeGreaterOrEqualToZero')
.max(ref(FieldConstants.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT), 'ShortCircuitCurrentLimitMinMaxError'),
[FieldConstants.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'ShortCircuitCurrentLimitMustBeGreaterOrEqualToZero')
.when([FieldConstants.LOW_SHORT_CIRCUIT_CURRENT_LIMIT], {
Expand All @@ -128,12 +135,14 @@ export const voltageLevelCreationFormSchema = object()
}),
[FieldConstants.HIDE_BUS_BAR_SECTION]: boolean().required(YUP_REQUIRED),
[FieldConstants.BUS_BAR_COUNT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.when([FieldConstants.HIDE_BUS_BAR_SECTION], {
is: (hideBusBarSection: boolean) => !hideBusBarSection,
then: (schema) => schema.min(1, 'BusBarCountMustBeGreaterThanOrEqualToOne').required(YUP_REQUIRED),
}),
[FieldConstants.SECTION_COUNT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.when([FieldConstants.HIDE_BUS_BAR_SECTION], {
is: (hideBusBarSection: boolean) => !hideBusBarSection,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
ModificationType,
sanitizeString,
toModificationOperation,
YUP_NOT_TYPE_NUMBER,
YUP_REQUIRED,
} from '../../../../utils';
import { FieldType } from '../../../../utils/types/fieldType';
Expand All @@ -28,17 +29,25 @@ export const voltageLevelModificationFormSchema = object()
[FieldConstants.EQUIPMENT_NAME]: string().nullable(),
[FieldConstants.HIDE_SUBSTATION_FIELD]: boolean().required(YUP_REQUIRED),
[FieldConstants.SUBSTATION_ID]: string().nullable(),
[FieldConstants.NOMINAL_V]: number().nullable().min(0, 'mustBeGreaterOrEqualToZero'),
[FieldConstants.NOMINAL_V]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'mustBeGreaterOrEqualToZero'),
[FieldConstants.LOW_VOLTAGE_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'mustBeGreaterOrEqualToZero')
.when([FieldConstants.HIGH_VOLTAGE_LIMIT], {
is: (highVoltageLimit: number) => highVoltageLimit != null,
then: (schema) =>
schema.max(ref(FieldConstants.HIGH_VOLTAGE_LIMIT), 'voltageLevelNominalVoltageMaxValueError'),
}),
[FieldConstants.HIGH_VOLTAGE_LIMIT]: number().nullable().min(0, 'mustBeGreaterOrEqualToZero'),
[FieldConstants.HIGH_VOLTAGE_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'mustBeGreaterOrEqualToZero'),
[FieldConstants.LOW_SHORT_CIRCUIT_CURRENT_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'ShortCircuitCurrentLimitMustBeGreaterOrEqualToZero')
.when([FieldConstants.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT], {
Expand All @@ -50,6 +59,7 @@ export const voltageLevelModificationFormSchema = object()
),
}),
[FieldConstants.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT]: number()
.typeError(YUP_NOT_TYPE_NUMBER)
.nullable()
.min(0, 'ShortCircuitCurrentLimitMustBeGreaterOrEqualToZero'),
})
Expand Down
1 change: 1 addition & 0 deletions src/translations/en/networkModificationsEn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export const networkModificationsEn = {
ShortCircuitCurrentLimitMinMaxError: 'Low short-circuit current limit must be less than or equal to high limit',
[DUPLICATED_PROPS_ERROR]: 'Duplicated properties: each property must be unique',
[YUP_REQUIRED]: 'This field is required',
YupNotTypeNumber: 'This field only accepts numeric values',
CreateLoad: 'Create load',
loadType: 'Type',
ConnectivityTab: 'Connectivity',
Expand Down
1 change: 1 addition & 0 deletions src/translations/fr/networkModificationsFr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export const networkModificationsFr = {
ShortCircuitCurrentLimitMinMaxError: 'La limite ICC min doit être inférieure ou égale à la limite ICC max',
[DUPLICATED_PROPS_ERROR]: 'Propriétés dupliquées : chaque propriété doit être unique',
[YUP_REQUIRED]: 'Ce champ doit être renseigné',
YupNotTypeNumber: "Ce champ n'accepte que des valeurs numériques",
CreateLoad: 'Créer une consommation',
loadType: 'Type',
ConnectivityTab: 'Connectivité',
Expand Down
1 change: 1 addition & 0 deletions src/utils/constants/translationKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
*/

export const YUP_REQUIRED = 'YupRequired';
export const YUP_NOT_TYPE_NUMBER = 'YupNotTypeNumber';
export const DUPLICATED_PROPS_ERROR = 'DuplicatedPropsError';
Loading