From 271d25a2abc5ecd89c73f3985e51e0fe72d9b8aa Mon Sep 17 00:00:00 2001
From: Stuart Taylor <staylor1012@gmail.com>
Date: Tue, 3 Sep 2019 08:38:19 +0100
Subject: [PATCH] fix: Render completed checkmark in ChallengeTitle (#36746)

* fix: Render completed checkmark in ChallengeTitle when user has passed the challenge

* fix: Update ChallengeTitle snapshot
---
 .../Challenges/components/Challenge-Title.js  | 14 ++---
 .../Challenges/components/Side-Panel.js       |  9 ++-
 .../__snapshots__/ChallengeTitle.test.js.snap | 62 +++++++++++++++++--
 .../src/templates/Challenges/redux/index.js   |  6 ++
 4 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/client/src/templates/Challenges/components/Challenge-Title.js b/client/src/templates/Challenges/components/Challenge-Title.js
index e036ee02934..3a8d91b46ec 100644
--- a/client/src/templates/Challenges/components/Challenge-Title.js
+++ b/client/src/templates/Challenges/components/Challenge-Title.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Link from '../../../components/helpers/Link';
 
 import './challenge-title.css';
+import GreenPass from '../../../assets/icons/GreenPass';
 
 const propTypes = {
   children: PropTypes.string,
@@ -21,13 +22,6 @@ function ChallengeTitle({
   prevChallengePath,
   showPrevNextBtns
 }) {
-  let icon = null;
-  if (isCompleted) {
-    icon = (
-      // TODO Use SVG here
-      <i className='ion-checkmark text-primary' title='Completed' />
-    );
-  }
   return (
     <div className='challenge-title-wrap'>
       {showPrevNextBtns ? (
@@ -41,7 +35,11 @@ function ChallengeTitle({
       ) : null}
       <h2 className='text-center challenge-title'>
         {children || 'Happy Coding!'}
-        {icon}
+        {isCompleted ? (
+          <GreenPass
+            style={{ height: '15px', width: '15px', marginLeft: '5px' }}
+          />
+        ) : null}
       </h2>
       {showPrevNextBtns ? (
         <Link
diff --git a/client/src/templates/Challenges/components/Side-Panel.js b/client/src/templates/Challenges/components/Side-Panel.js
index 7d33238028b..fd6072afd29 100644
--- a/client/src/templates/Challenges/components/Side-Panel.js
+++ b/client/src/templates/Challenges/components/Side-Panel.js
@@ -7,13 +7,15 @@ import ChallengeDescription from './Challenge-Description';
 import ToolPanel from './Tool-Panel';
 import TestSuite from './Test-Suite';
 
-import { challengeTestsSelector } from '../redux';
+import { challengeTestsSelector, isChallengeCompletedSelector } from '../redux';
 import { createSelector } from 'reselect';
 import './side-panel.css';
 
 const mapStateToProps = createSelector(
+  isChallengeCompletedSelector,
   challengeTestsSelector,
-  tests => ({
+  (isChallengeCompleted, tests) => ({
+    isChallengeCompleted,
     tests
   })
 );
@@ -25,6 +27,7 @@ const propTypes = {
   guideUrl: PropTypes.string,
   instructions: PropTypes.string,
   introPath: PropTypes.string,
+  isChallengeCompleted: PropTypes.bool,
   nextChallengePath: PropTypes.string,
   prevChallengePath: PropTypes.string,
   section: PropTypes.string,
@@ -59,6 +62,7 @@ export class SidePanel extends Component {
       description,
       instructions,
       introPath,
+      isChallengeCompleted,
       guideUrl,
       nextChallengePath,
       prevChallengePath,
@@ -73,6 +77,7 @@ export class SidePanel extends Component {
         <div>
           <ChallengeTitle
             introPath={introPath}
+            isCompleted={isChallengeCompleted}
             nextChallengePath={nextChallengePath}
             prevChallengePath={prevChallengePath}
             showPrevNextBtns={showPrevNextBtns}
diff --git a/client/src/templates/Challenges/components/__snapshots__/ChallengeTitle.test.js.snap b/client/src/templates/Challenges/components/__snapshots__/ChallengeTitle.test.js.snap
index 07a641b6963..8f0d75b18d1 100644
--- a/client/src/templates/Challenges/components/__snapshots__/ChallengeTitle.test.js.snap
+++ b/client/src/templates/Challenges/components/__snapshots__/ChallengeTitle.test.js.snap
@@ -15,10 +15,64 @@ exports[`<ChallengeTitle/> renders correctly 1`] = `
     className="text-center challenge-title"
   >
     title text
-    <i
-      className="ion-checkmark text-primary"
-      title="Completed"
-    />
+    <span
+      className="sr-only"
+    >
+      Passed
+    </span>
+    <svg
+      height="50"
+      style={
+        Object {
+          "height": "15px",
+          "marginLeft": "5px",
+          "width": "15px",
+        }
+      }
+      viewBox="0 0 200 200"
+      width="50"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g>
+        <title>
+          Passed
+        </title>
+        <circle
+          cx="100"
+          cy="99"
+          fill="#858591"
+          r="95"
+          stroke="#858591"
+          strokeDasharray="null"
+          strokeLinecap="null"
+          strokeLinejoin="null"
+        />
+        <rect
+          fill="#ffffff"
+          height="30"
+          stroke="#ffffff"
+          strokeDasharray="null"
+          strokeLinecap="null"
+          strokeLinejoin="null"
+          transform="rotate(-45, 120, 106.321)"
+          width="128.85878"
+          x="55.57059"
+          y="91.32089"
+        />
+        <rect
+          fill="#ffffff"
+          height="30"
+          stroke="#ffffff"
+          strokeDasharray="null"
+          strokeLinecap="null"
+          strokeLinejoin="null"
+          transform="rotate(45, 66.75, 123.75)"
+          width="80.66548"
+          x="26.41726"
+          y="108.75"
+        />
+      </g>
+    </svg>
   </h2>
   <a
     aria-label="Next lesson"
diff --git a/client/src/templates/Challenges/redux/index.js b/client/src/templates/Challenges/redux/index.js
index d7cb3c157c8..16e9e2cef2c 100644
--- a/client/src/templates/Challenges/redux/index.js
+++ b/client/src/templates/Challenges/redux/index.js
@@ -13,6 +13,7 @@ import codeStorageEpic from './code-storage-epic';
 import { createExecuteChallengeSaga } from './execute-challenge-saga';
 import { createCurrentChallengeSaga } from './current-challenge-saga';
 import { challengeTypes } from '../../../../utils/challengeTypes';
+import { completedChallengesSelector } from '../../../redux';
 
 export const ns = 'challenge';
 export const backendNS = 'backendChallenge';
@@ -153,6 +154,11 @@ export const challengeFilesSelector = state => state[ns].challengeFiles;
 export const challengeMetaSelector = state => state[ns].challengeMeta;
 export const challengeTestsSelector = state => state[ns].challengeTests;
 export const consoleOutputSelector = state => state[ns].consoleOut;
+export const isChallengeCompletedSelector = state => {
+  const completedChallenges = completedChallengesSelector(state);
+  const { id: currentChallengeId } = challengeMetaSelector(state);
+  return completedChallenges.some(({ id }) => id === currentChallengeId);
+};
 export const isCodeLockedSelector = state => state[ns].isCodeLocked;
 export const isCompletionModalOpenSelector = state =>
   state[ns].modal.completion;