chore(Map): Remove isHidden selectors/state

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

View File

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

View File

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