From b27036a261880af0b88b8bc160214666eeff5726 Mon Sep 17 00:00:00 2001 From: Stuart Taylor Date: Fri, 23 Feb 2018 18:44:40 +0000 Subject: [PATCH] fix(format): Formatting fix --- common/app/Map/redux/index.js | 6 +-- server/utils/map.js | 74 +++++++++++++++++------------------ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/common/app/Map/redux/index.js b/common/app/Map/redux/index.js index 342c53bcad..49d48752ee 100644 --- a/common/app/Map/redux/index.js +++ b/common/app/Map/redux/index.js @@ -5,7 +5,7 @@ import { handleActions } from 'berkeleys-redux-utils'; import { createSelector } from 'reselect'; -import { capitalize, noop} from 'lodash'; +import { capitalize, noop } from 'lodash'; import * as utils from './utils.js'; import ns from '../ns.json'; @@ -13,9 +13,9 @@ import { createEventMetaCreator } from '../../redux'; -import fewtchMapUiEpic from './fetch-map-ui-epic'; +import fetchMapUiEpic from './fetch-map-ui-epic'; -export const epics = [ fewtchMapUiEpic ]; +export const epics = [ fetchMapUiEpic ]; export const types = createTypes([ 'onRouteMap', diff --git a/server/utils/map.js b/server/utils/map.js index b7483ee961..99b67d159a 100644 --- a/server/utils/map.js +++ b/server/utils/map.js @@ -74,43 +74,43 @@ export function _cachedMap({ Block, Challenge }) { }, blocksMap); }); const superBlockMap = blocks.map(blocks => blocks.reduce((map, block) => { - if ( - map[block.superBlock] && - map[block.superBlock].blocks - ) { - map[block.superBlock].blocks.push(block.dashedName); - } else { - map[block.superBlock] = { - title: _.startCase(block.superBlock), - order: block.superOrder, - name: nameify(_.startCase(block.superBlock)), - dashedName: block.superBlock, - blocks: [block.dashedName], - message: block.superBlockMessage - }; - } - return map; - }, {})); - const superBlocks = superBlockMap.map(superBlockMap => { - return Object.keys(superBlockMap) - .map(key => superBlockMap[key]) - .map(({ dashedName }) => dashedName); - }); - return Observable.combineLatest( - superBlockMap, - blockMap, - challengeMap, - superBlocks, - (superBlock, block, challenge, superBlocks) => ({ - entities: { - superBlock, - block, - challenge - }, - result: { - superBlocks - } - }) + if ( + map[block.superBlock] && + map[block.superBlock].blocks + ) { + map[block.superBlock].blocks.push(block.dashedName); + } else { + map[block.superBlock] = { + title: _.startCase(block.superBlock), + order: block.superOrder, + name: nameify(_.startCase(block.superBlock)), + dashedName: block.superBlock, + blocks: [block.dashedName], + message: block.superBlockMessage + }; + } + return map; + }, {})); + const superBlocks = superBlockMap.map(superBlockMap => { + return Object.keys(superBlockMap) + .map(key => superBlockMap[key]) + .map(({ dashedName }) => dashedName); + }); + return Observable.combineLatest( + superBlockMap, + blockMap, + challengeMap, + superBlocks, + (superBlock, block, challenge, superBlocks) => ({ + entities: { + superBlock, + block, + challenge + }, + result: { + superBlocks + } + }) ) .do(checkMapData) .shareReplay();