INTLY-473: Walkthrough progress can be more than 100 percent (#519)

* force progress to 100 if steps completed * fix merge conflicts * fix merge issues * bump version
integr8ly · Oct 14, 2019 · badeea6 · badeea6
1 parent c1e889a
commit badeea6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integreatly-web-app",
-  "version": "2.18.9",
+  "version": "2.18.10",
   "private": true,
   "proxy": "http://localhost:5001/",
   "dependencies": {

diff --git a/src/components/tutorialDashboard/tutorialDashboard.js b/src/components/tutorialDashboard/tutorialDashboard.js
@@ -76,8 +76,10 @@ const TutorialDashboard = props => {
         const currentProgress = userProgress[walkthrough.id];
         let startedText;
         if (currentProgress === undefined) startedText = 'Get Started';
-        else if (currentProgress.progress === 100) startedText = 'Completed';
-        else startedText = 'Resume';
+        else if (currentProgress.progress >= 100) {
+          currentProgress.progress = 100;
+          startedText = 'Completed';
+        } else startedText = 'Resume';
 
         return (
           <GalleryItem id={walkthrough.id} key={walkthrough.id}>

diff --git a/src/pages/tutorial/task/task.js b/src/pages/tutorial/task/task.js
@@ -140,7 +140,7 @@ class TaskPage extends React.Component {
     const totalSteps = this.getTotalSteps(data);
     if (totalSteps > 0) {
       const completedSteps = this.getCompletedSteps(oldProgress[id]);
-      oldProgress[id].progress = Math.floor((completedSteps / totalSteps) * 100);
+      oldProgress[id].progress = Math.min(Math.floor((completedSteps / totalSteps) * 100), 100);
       oldProgress[id].task = task;
     }