X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2Fui-services%2FAbstractUIService.ts;h=ab2c1167e934dc789537dfb679c4755eb2e0f975;hb=b2b606263e2676354259164d532ff9aa91ccdf87;hp=1ec6cf93b20e77363f08ecbb79cb9c10ed9cf656;hpb=1ca4a038d1b263b3b66a3c1872742bd98a696e75;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ui-server/ui-services/AbstractUIService.ts b/src/charging-station/ui-server/ui-services/AbstractUIService.ts index 1ec6cf93..ab2c1167 100644 --- a/src/charging-station/ui-server/ui-services/AbstractUIService.ts +++ b/src/charging-station/ui-server/ui-services/AbstractUIService.ts @@ -11,7 +11,7 @@ import { type ResponsePayload, ResponseStatus, } from '../../../types'; -import { Utils, logger } from '../../../utils'; +import { isNotEmptyArray, isNullOrUndefined, logger } from '../../../utils'; import { Bootstrap } from '../../Bootstrap'; import { UIServiceWorkerBroadcastChannel } from '../../broadcast-channel/UIServiceWorkerBroadcastChannel'; import type { AbstractUIServer } from '../AbstractUIServer'; @@ -19,7 +19,7 @@ import type { AbstractUIServer } from '../AbstractUIServer'; const moduleName = 'AbstractUIService'; export abstract class AbstractUIService { - protected static readonly ProcedureNameToBroadCastChannelProcedureNameMap: Omit< + protected static readonly ProcedureNameToBroadCastChannelProcedureNameMapping: Omit< Record, | ProcedureName.START_SIMULATOR | ProcedureName.STOP_SIMULATOR @@ -100,7 +100,7 @@ export abstract class AbstractUIService { errorDetails: (error as OCPPError).details, }; } - if (!Utils.isNullOrUndefined(responsePayload)) { + if (!isNullOrUndefined(responsePayload)) { return this.uiServer.buildProtocolResponse(messageId, responsePayload); } } @@ -140,7 +140,7 @@ export abstract class AbstractUIService { ): void { this.sendBroadcastChannelRequest( uuid, - AbstractUIService.ProcedureNameToBroadCastChannelProcedureNameMap[ + AbstractUIService.ProcedureNameToBroadCastChannelProcedureNameMapping[ procedureName ] as BroadcastChannelProcedureName, payload @@ -152,9 +152,9 @@ export abstract class AbstractUIService { procedureName: BroadcastChannelProcedureName, payload: BroadcastChannelRequestPayload ): void { - if (Utils.isNotEmptyArray(payload.hashIds)) { + if (isNotEmptyArray(payload.hashIds)) { payload.hashIds = payload.hashIds - .filter((hashId) => !Utils.isNullOrUndefined(hashId)) + .filter((hashId) => !isNullOrUndefined(hashId)) .map((hashId) => { if (this.uiServer.chargingStations.has(hashId) === true) { return hashId; @@ -167,7 +167,7 @@ export abstract class AbstractUIService { ); }); } - const expectedNumberOfResponses = Utils.isNotEmptyArray(payload.hashIds) + const expectedNumberOfResponses = isNotEmptyArray(payload.hashIds) ? payload.hashIds.length : this.uiServer.chargingStations.size; this.uiServiceWorkerBroadcastChannel.sendRequest([uuid, procedureName, payload]);