From 45a1bdae27115974568fe8cfaff7c190d1963e28 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 26 Jan 2017 22:59:47 +0100 Subject: Refactor api.ts to use 'const' wherever possible --- src/scripts/controllers/connection/api.ts | 52 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/src/scripts/controllers/connection/api.ts b/src/scripts/controllers/connection/api.ts index c4eebf64..d3278561 100644 --- a/src/scripts/controllers/connection/api.ts +++ b/src/scripts/controllers/connection/api.ts @@ -121,7 +121,7 @@ export class APIController { authorizations = data; return this.getUser(userId); }).then((userData: any) => { - let promises = []; + const promises = []; authorizations.forEach((authorization: IAuthorization) => { authorization.user = userData; promises.push(this.getSimulation(authorization.simulationId).then((simulationData: any) => { @@ -234,7 +234,7 @@ export class APIController { authorizations = data; return this.getSimulation(simulationId); }).then((simulationData: any) => { - let promises = []; + const promises = []; authorizations.forEach((authorization: IAuthorization) => { authorization.simulation = simulationData; promises.push(this.getUser(authorization.userId).then((userData: any) => { @@ -362,7 +362,7 @@ export class APIController { }).then((data: any) => { rooms = data; - let promises = []; + const promises = []; rooms.forEach((room: IRoom) => { promises.push(this.loadRoomTiles(simulationId, datacenterId, room)); }); @@ -412,7 +412,7 @@ export class APIController { query: {} } }).then((data: any) => { - let result = []; + const result = []; data.forEach((roomType: any) => { result.push(roomType.name); }); @@ -519,7 +519,7 @@ export class APIController { query: {} } }).then((data: any) => { - let promises = data.map((item) => { + const promises = data.map((item) => { return this.loadTileObject(simulationId, datacenterId, roomId, item); }); @@ -740,7 +740,7 @@ export class APIController { rack = data; return this.getMachinesByRack(simulationId, datacenterId, roomId, tileId); }).then((machines: any) => { - let promises = machines.map((machine) => { + const promises = machines.map((machine) => { return this.loadMachineUnits(machine); }); @@ -857,7 +857,7 @@ export class APIController { query: {} } }).then((data: any) => { - let promises = data.map((machine) => { + const promises = data.map((machine) => { return this.loadMachineUnits(machine); }); @@ -959,7 +959,7 @@ export class APIController { query: {} } }).then((data: any) => { - let promises = data.map((item: any) => { + const promises = data.map((item: any) => { return this.getTrace(item.traceId).then((traceData: any) => { item.trace = traceData; }); @@ -1122,13 +1122,11 @@ export class APIController { query: query } }).then((data: any) => { - let promises = data.map((item: any) => { + data.forEach((item: any) => { item.rack = racks[item.rackId]; }); - return Promise.all(promises).then(() => { - return data; - }); + return data; }); } @@ -1158,13 +1156,11 @@ export class APIController { query } }).then((data: any) => { - let promises = data.map((item: any) => { + data.forEach((item: any) => { item.room = rooms[item.roomId]; }); - return Promise.all(promises).then(() => { - return data; - }); + return data; }); } @@ -1194,13 +1190,11 @@ export class APIController { query } }).then((data: any) => { - let promises = data.map((item: any) => { + data.forEach((item: any) => { item.task = tasks[item.taskId]; }); - return Promise.all(promises).then(() => { - return data; - }); + return data; }); } @@ -1221,7 +1215,7 @@ export class APIController { query: {} } }).then((data: any) => { - let promises = data.map((item: any) => { + const promises = data.map((item: any) => { return this.getSectionsByPath(simulationId, item.id).then((sectionsData: any) => { item.sections = sectionsData; }); @@ -1275,7 +1269,7 @@ export class APIController { query: {} } }).then((data: any) => { - let promises = data.map((item: any) => { + const promises = data.map((item: any) => { return this.getSectionsByPath(simulationId, item.id).then((sectionsData: any) => { item.sections = sectionsData; }); @@ -1329,7 +1323,7 @@ export class APIController { query: {} } }).then((data: any) => { - let promises = data.map((path: ISection) => { + const promises = data.map((path: ISection) => { return this.getDatacenter(simulationId, path.datacenterId).then((datacenter: any) => { path.datacenter = datacenter; }); @@ -1384,7 +1378,7 @@ export class APIController { }).then((data: any) => { psus = data; - let promises = []; + const promises = []; data.forEach((psu: IPSU) => { promises.push(this.getFailureModel(psu.failureModelId)); }); @@ -1440,7 +1434,7 @@ export class APIController { }).then((data: any) => { coolingItems = data; - let promises = []; + const promises = []; data.forEach((item: ICoolingItem) => { promises.push(this.getFailureModel(item.failureModelId)); }); @@ -1611,7 +1605,7 @@ export class APIController { }).then((data: any) => { specs = data; - let promises = []; + const promises = []; data.forEach((unit: INodeUnit) => { promises.push(this.getFailureModel(unit.failureModelId)); }); @@ -1705,7 +1699,7 @@ export class APIController { private loadUnitsOfType(idListName: string, objectListName: string, machine: IMachine): Promise { machine[objectListName] = []; - let promises = machine[idListName].map((item) => { + const promises = machine[idListName].map((item) => { return this.getSpecificationOfType(objectListName, item).then((data) => { machine[objectListName].push(data); }); @@ -1717,7 +1711,7 @@ export class APIController { } private loadMachineUnits(machine: IMachine): Promise { - let listNames = [ + const listNames = [ { idListName: "cpuIds", objectListName: "cpus" @@ -1733,7 +1727,7 @@ export class APIController { } ]; - let promises = listNames.map((item: any) => { + const promises = listNames.map((item: any) => { return this.loadUnitsOfType(item.idListName, item.objectListName, machine); }); -- cgit v1.2.3