From a048ab5ad3c1b5d9fe6f9c3950352f3735543817 Mon Sep 17 00:00:00 2001 From: Stuart Taylor Date: Fri, 23 Mar 2018 17:00:45 +0000 Subject: [PATCH] chore(simple): Remove simple project logic --- common/app/routes/Challenges/Show.jsx | 1 - .../Challenges/redux/completion-epic.js | 3 +-- .../Challenges/views/project/Tool-Panel.jsx | 22 +++---------------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/common/app/routes/Challenges/Show.jsx b/common/app/routes/Challenges/Show.jsx index 43f88f7be2..2d65d87adb 100644 --- a/common/app/routes/Challenges/Show.jsx +++ b/common/app/routes/Challenges/Show.jsx @@ -29,7 +29,6 @@ const views = { modern: Modern, project: Project, quiz: Quiz, - simple: Project, step: Step, invalid: NotFound }; diff --git a/common/app/routes/Challenges/redux/completion-epic.js b/common/app/routes/Challenges/redux/completion-epic.js index 6acc46950a..8c84d4467d 100644 --- a/common/app/routes/Challenges/redux/completion-epic.js +++ b/common/app/routes/Challenges/redux/completion-epic.js @@ -161,8 +161,7 @@ const submitters = { video: submitSimpleChallenge, quiz: submitSimpleChallenge, 'project.frontEnd': submitProject, - 'project.backEnd': submitProject, - 'project.simple': submitSimpleChallenge + 'project.backEnd': submitProject }; export default function completionEpic(actions, { getState }) { diff --git a/common/app/routes/Challenges/views/project/Tool-Panel.jsx b/common/app/routes/Challenges/views/project/Tool-Panel.jsx index a7c3e4ad1d..9a4b31bf3d 100644 --- a/common/app/routes/Challenges/views/project/Tool-Panel.jsx +++ b/common/app/routes/Challenges/views/project/Tool-Panel.jsx @@ -13,8 +13,6 @@ import { import { submittingSelector } from './redux'; import { - openChallengeModal, - openHelpModal, chatRoomSelector, guideURLSelector @@ -25,7 +23,6 @@ import { challengeSelector } from '../../../../redux'; import { - simpleProject, frontEndProject } from '../../../../utils/challengeTypes'; @@ -33,14 +30,10 @@ const propTypes = { guideUrl: PropTypes.string, helpChatRoom: PropTypes.string.isRequired, isFrontEnd: PropTypes.bool, - isSignedIn: PropTypes.bool, - isSimple: PropTypes.bool, isSubmitting: PropTypes.bool, - openChallengeModal: PropTypes.func.isRequired, openHelpModal: PropTypes.func.isRequired }; const mapDispatchToProps = { - openChallengeModal, openHelpModal }; const mapStateToProps = createSelector( @@ -50,7 +43,7 @@ const mapStateToProps = createSelector( chatRoomSelector, guideURLSelector, ( - { challengeType = simpleProject }, + { challengeType }, showLoading, isSubmitting, helpChatRoom, @@ -58,9 +51,7 @@ const mapStateToProps = createSelector( ) => ({ guideUrl, helpChatRoom, - isSignedIn: !showLoading, isSubmitting, - isSimple: challengeType === simpleProject, isFrontEnd: challengeType === frontEndProject }) ); @@ -87,21 +78,14 @@ export class ToolPanel extends PureComponent { guideUrl, helpChatRoom, isFrontEnd, - isSimple, - isSignedIn, isSubmitting, - openHelpModal, - openChallengeModal + openHelpModal } = this.props; const FormElement = isFrontEnd ? FrontEndForm : BackEndForm; return (
- { - isSimple ? - this.renderSubmitButton(isSignedIn, openChallengeModal) : - - } +