chore(Map): Remove isHidden selectors/state

This logic is no longer used
This commit is contained in:
Berkeley Martinez
2018-01-02 17:11:27 -08:00
committed by mrugesh mohapatra
parent 52529a99b1
commit 1e491d82d3
4 changed files with 8 additions and 45 deletions

View File

@ -10,8 +10,7 @@ import Challenge from './Challenge.jsx';
import { import {
toggleThisPanel, toggleThisPanel,
makePanelOpenSelector, makePanelOpenSelector
makePanelHiddenSelector
} from './redux'; } from './redux';
import { makeBlockSelector } from '../entities'; import { makeBlockSelector } from '../entities';
@ -21,11 +20,9 @@ function makeMapStateToProps(_, { dashedName }) {
return createSelector( return createSelector(
makeBlockSelector(dashedName), makeBlockSelector(dashedName),
makePanelOpenSelector(dashedName), makePanelOpenSelector(dashedName),
makePanelHiddenSelector(dashedName), (block, isOpen) => {
(block, isOpen, isHidden) => {
return { return {
isOpen, isOpen,
isHidden,
dashedName, dashedName,
title: block.title, title: block.title,
time: block.time, time: block.time,
@ -37,7 +34,6 @@ function makeMapStateToProps(_, { dashedName }) {
const propTypes = { const propTypes = {
challenges: PropTypes.array, challenges: PropTypes.array,
dashedName: PropTypes.string, dashedName: PropTypes.string,
isHidden: PropTypes.bool,
isOpen: PropTypes.bool, isOpen: PropTypes.bool,
time: PropTypes.string, time: PropTypes.string,
title: PropTypes.string, title: PropTypes.string,
@ -88,12 +84,8 @@ export class Block extends PureComponent {
time, time,
dashedName, dashedName,
isOpen, isOpen,
isHidden,
challenges challenges
} = this.props; } = this.props;
if (isHidden) {
return null;
}
return ( return (
<Panel <Panel
bsClass={ `${ns}-accordion-panel` } bsClass={ `${ns}-accordion-panel` }

View File

@ -5,11 +5,7 @@ import { createSelector } from 'reselect';
import classnames from 'classnames'; import classnames from 'classnames';
import debug from 'debug'; import debug from 'debug';
import { import { clickOnChallenge } from './redux';
clickOnChallenge,
makePanelHiddenSelector
} from './redux';
import { userSelector } from '../redux'; import { userSelector } from '../redux';
import { challengeMapSelector } from '../entities'; import { challengeMapSelector } from '../entities';
import { Link } from '../Router'; import { Link } from '../Router';
@ -23,7 +19,6 @@ const propTypes = {
isComingSoon: PropTypes.bool, isComingSoon: PropTypes.bool,
isCompleted: PropTypes.bool, isCompleted: PropTypes.bool,
isDev: PropTypes.bool, isDev: PropTypes.bool,
isHidden: PropTypes.bool,
isLocked: PropTypes.bool, isLocked: PropTypes.bool,
isRequired: PropTypes.bool, isRequired: PropTypes.bool,
title: PropTypes.string title: PropTypes.string
@ -34,11 +29,9 @@ function makeMapStateToProps(_, { dashedName }) {
return createSelector( return createSelector(
userSelector, userSelector,
challengeMapSelector, challengeMapSelector,
makePanelHiddenSelector(dashedName),
( (
{ challengeMap: userChallengeMap }, { challengeMap: userChallengeMap },
challengeMap, challengeMap
isHidden
) => { ) => {
const { const {
id, id,
@ -51,7 +44,6 @@ function makeMapStateToProps(_, { dashedName }) {
const isCompleted = userChallengeMap ? !!userChallengeMap[id] : false; const isCompleted = userChallengeMap ? !!userChallengeMap[id] : false;
return { return {
dashedName, dashedName,
isHidden,
isCompleted, isCompleted,
title, title,
block, block,
@ -115,12 +107,11 @@ export class Challenge extends PureComponent {
isComingSoon, isComingSoon,
isCompleted, isCompleted,
isDev, isDev,
isHidden,
isLocked, isLocked,
isRequired, isRequired,
title title
} = this.props; } = this.props;
if (isHidden || !title) { if (!title) {
return null; return null;
} }
const challengeClassName = classnames({ const challengeClassName = classnames({

View File

@ -10,8 +10,7 @@ import Block from './Block.jsx';
import { import {
toggleThisPanel, toggleThisPanel,
makePanelOpenSelector, makePanelOpenSelector
makePanelHiddenSelector
} from './redux'; } from './redux';
import { makeSuperBlockSelector } from '../entities'; import { makeSuperBlockSelector } from '../entities';
@ -24,10 +23,8 @@ function makeMapStateToProps(_, { dashedName }) {
return createSelector( return createSelector(
makeSuperBlockSelector(dashedName), makeSuperBlockSelector(dashedName),
makePanelOpenSelector(dashedName), makePanelOpenSelector(dashedName),
makePanelHiddenSelector(dashedName), (superBlock, isOpen) => ({
(superBlock, isOpen, isHidden) => ({
isOpen, isOpen,
isHidden,
dashedName, dashedName,
title: superBlock.title || dashedName, title: superBlock.title || dashedName,
blocks: superBlock.blocks || [], blocks: superBlock.blocks || [],
@ -39,7 +36,6 @@ function makeMapStateToProps(_, { dashedName }) {
const propTypes = { const propTypes = {
blocks: PropTypes.array, blocks: PropTypes.array,
dashedName: PropTypes.string, dashedName: PropTypes.string,
isHidden: PropTypes.bool,
isOpen: PropTypes.bool, isOpen: PropTypes.bool,
message: PropTypes.string, message: PropTypes.string,
title: PropTypes.string, title: PropTypes.string,
@ -98,12 +94,8 @@ export class SuperBlock extends PureComponent {
dashedName, dashedName,
blocks, blocks,
message, message,
isOpen, isOpen
isHidden
} = this.props; } = this.props;
if (isHidden) {
return null;
}
return ( return (
<Panel <Panel
bsClass={ `${ns}-accordion-panel` } bsClass={ `${ns}-accordion-panel` }

View File

@ -63,27 +63,15 @@ export function makePanelOpenSelector(name) {
); );
} }
export function makePanelHiddenSelector(name) {
return createSelector(
mapSelector,
mapUi => {
const node = utils.getNode(mapUi, name);
return node ? node.isHidden : false;
}
);
}
// interface Map{ // interface Map{
// children: [...{ // children: [...{
// name: (superBlock: String), // name: (superBlock: String),
// isOpen: Boolean, // isOpen: Boolean,
// isHidden: Boolean,
// children: [...{ // children: [...{
// name: (blockName: String), // name: (blockName: String),
// isOpen: Boolean, // isOpen: Boolean,
// isHidden: Boolean,
// children: [...{ // children: [...{
// name: (challengeName: String), // name: (challengeName: String),
// isHidden: Boolean
// }] // }]
// }] // }]
// } // }