From ac5b33c83f38f9b2799c0f2a871b86052121e8ac Mon Sep 17 00:00:00 2001 From: jc0b Date: Wed, 29 Jul 2020 17:42:27 +0200 Subject: yarn format on prefabs --- .../sidebars/topology/rack/RackSidebarComponent.js | 2 +- .../sidebars/topology/rack/AddPrefabContainer.js | 4 ++-- frontend/src/sagas/index.js | 4 ++-- frontend/src/sagas/objects.js | 21 ++++++++------------- frontend/src/sagas/prefabs.js | 9 ++++----- 5 files changed, 17 insertions(+), 23 deletions(-) (limited to 'frontend/src') diff --git a/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js b/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js index 78414736..d7127114 100644 --- a/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js +++ b/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js @@ -4,7 +4,7 @@ import DeleteRackContainer from '../../../../../containers/app/sidebars/topology import MachineListContainer from '../../../../../containers/app/sidebars/topology/rack/MachineListContainer' import RackNameContainer from '../../../../../containers/app/sidebars/topology/rack/RackNameContainer' import './RackSidebarComponent.css' -import AddPrefabContainer from "../../../../../containers/app/sidebars/topology/rack/AddPrefabContainer"; +import AddPrefabContainer from '../../../../../containers/app/sidebars/topology/rack/AddPrefabContainer' const RackSidebarComponent = () => { return ( diff --git a/frontend/src/containers/app/sidebars/topology/rack/AddPrefabContainer.js b/frontend/src/containers/app/sidebars/topology/rack/AddPrefabContainer.js index 9d0a2c74..c941e745 100644 --- a/frontend/src/containers/app/sidebars/topology/rack/AddPrefabContainer.js +++ b/frontend/src/containers/app/sidebars/topology/rack/AddPrefabContainer.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' -import {addPrefab} from "../../../../../actions/prefabs"; -import AddPrefabComponent from "../../../../../components/app/sidebars/topology/rack/AddPrefabComponent"; +import { addPrefab } from '../../../../../actions/prefabs' +import AddPrefabComponent from '../../../../../components/app/sidebars/topology/rack/AddPrefabComponent' const mapDispatchToProps = (dispatch) => { return { diff --git a/frontend/src/sagas/index.js b/frontend/src/sagas/index.js index 6a1f2af3..6332b2fb 100644 --- a/frontend/src/sagas/index.js +++ b/frontend/src/sagas/index.js @@ -36,8 +36,8 @@ import { onFetchAuthorizationsOfCurrentUser, onFetchLoggedInUser } from './users import { ADD_TOPOLOGY, DELETE_TOPOLOGY } from '../actions/topologies' import { ADD_SCENARIO, DELETE_SCENARIO, OPEN_SCENARIO_SUCCEEDED, UPDATE_SCENARIO } from '../actions/scenarios' import { onAddScenario, onDeleteScenario, onOpenScenarioSucceeded, onUpdateScenario } from './scenarios' -import {onAddPrefab} from "./prefabs"; -import {ADD_PREFAB} from "../actions/prefabs"; +import { onAddPrefab } from './prefabs' +import { ADD_PREFAB } from '../actions/prefabs' export default function* rootSaga() { yield takeEvery(LOG_IN, onFetchLoggedInUser) diff --git a/frontend/src/sagas/objects.js b/frontend/src/sagas/objects.js index b65df4cc..ebce1f0a 100644 --- a/frontend/src/sagas/objects.js +++ b/frontend/src/sagas/objects.js @@ -161,14 +161,13 @@ export const getAllRooms = function* (roomIds, keepIds) { let rooms = [] - for(let i in roomIds){ + for (let i in roomIds) { let tiles = yield getAllRoomTiles(roomStore[roomIds[i]], keepIds) rooms.push({ - _id: keepIds ? i : undefined, - name: roomStore[roomIds[i]].name, - tiles: tiles, - } - ) + _id: keepIds ? i : undefined, + name: roomStore[roomIds[i]].name, + tiles: tiles, + }) } return rooms } @@ -176,8 +175,8 @@ export const getAllRooms = function* (roomIds, keepIds) { export const getAllRoomTiles = function* (roomStore, keepIds) { let tiles = [] - for(let i in roomStore.tileIds){ - tiles.push(yield getTileById(roomStore.tileIds[i], keepIds)) + for (let i in roomStore.tileIds) { + tiles.push(yield getTileById(roomStore.tileIds[i], keepIds)) } return tiles } @@ -188,9 +187,7 @@ export const getTileById = function* (id, keepIds) { _id: keepIds ? id : undefined, positionX: tileStore[id].positionX, positionY: tileStore[id].positionY, - rack: !tileStore[id].rackId - ? undefined - : yield getRackById(tileStore[id].rackId, keepIds), + rack: !tileStore[id].rackId ? undefined : yield getRackById(tileStore[id].rackId, keepIds), } } @@ -220,8 +217,6 @@ export const getRackById = function* (id, keepIds) { } } - - export const fetchAndStoreAllTraces = () => fetchAndStoreObjects('trace', call(getAllTraces)) export const fetchAndStoreAllSchedulers = function* () { diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 287a3cf8..16cf3d62 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -1,7 +1,7 @@ -import {call, put, select} from "redux-saga/effects"; -import {addToStore} from "../actions/objects"; -import {addPrefab} from "../api/routes/prefabs"; -import {getRackById} from "./objects"; +import { call, put, select } from 'redux-saga/effects' +import { addToStore } from '../actions/objects' +import { addPrefab } from '../api/routes/prefabs' +import { getRackById } from './objects' export function* onAddPrefab(action) { try { @@ -9,7 +9,6 @@ export function* onAddPrefab(action) { const currentRackJson = yield getRackById(currentRackId, false) const prefab = yield call(addPrefab, { name: action.name, rack: currentRackJson }) yield put(addToStore('prefab', prefab)) - } catch (error) { console.error(error) } -- cgit v1.2.3