Skip review task status if review undefined on qs

patternfly · Feb 4, 2022 · b120e66 · b120e66
1 parent 6c57fd7
commit b120e66
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/packages/dev/src/quickstarts-data/yaml/template.yaml b/packages/dev/src/quickstarts-data/yaml/template.yaml
@@ -7,7 +7,7 @@ spec:
   displayName: Getting started with quick starts
   durationMinutes: 10
   # Optional type section, will display as a tile on the card
-  type: 
+  type:
     text: Type
     # 'blue' | 'cyan' | 'green' | 'orange' | 'purple' | 'red' | 'grey'
     color: grey
@@ -88,10 +88,11 @@ spec:
         Also, don't forget to [check out the source](https://github.com/patternfly/patternfly-quickstarts/blob/main/packages/dev/src/quickstarts-data/yaml/template.yaml) for this quick start for more information!
 
         Happy writing!
-      review:
-        instructions: |-
-          - Thanks for checking out this quick start!
-        failedTaskHelp: This task isn’t verified yet. Try the task again.
+      # review commented out here to show interaction when review is not defined
+      # review:
+      #   instructions: |-
+      #     - Thanks for checking out this quick start!
+      #   failedTaskHelp: This task isn’t verified yet. Try the task again.
   conclusion: |-
     The conclusion appears in the last section of the quick start.
   # you can link to the next quick start(s) here

diff --git a/packages/module/src/utils/quick-start-context.tsx b/packages/module/src/utils/quick-start-context.tsx
@@ -296,16 +296,22 @@ export const useValuesForQuickStartContext = (
         return;
       }
 
-      setAllQuickStartStates((qs) => {
-        const quickStart = qs[activeQuickStartID];
-        const status = quickStart?.status;
-        const taskNumber = quickStart?.taskNumber as number;
-        const taskStatus = quickStart[getTaskStatusKey(taskNumber)];
+      setAllQuickStartStates((quickStartStates) => {
+        const quickStartState: QuickStartState = quickStartStates[activeQuickStartID];
+        const status = quickStartState?.status;
+        const taskNumber = quickStartState?.taskNumber as number;
+        const taskStatus = quickStartState[getTaskStatusKey(taskNumber)];
 
         let updatedStatus;
         let updatedTaskNumber;
         let updatedTaskStatus;
 
+        const quickStart: QuickStart = allQuickStarts.find((qs) => {
+          return qs.metadata.name === activeQuickStartID;
+        });
+
+        const task = quickStart.spec.tasks[taskNumber];
+
         if (status === QuickStartStatus.NOT_STARTED) {
           updatedStatus = QuickStartStatus.IN_PROGRESS;
         } else if (
@@ -317,7 +323,14 @@ export const useValuesForQuickStartContext = (
         }
 
         if (taskStatus === QuickStartTaskStatus.VISITED) {
-          updatedTaskStatus = QuickStartTaskStatus.REVIEW;
+          if (task.review) {
+            updatedTaskStatus = QuickStartTaskStatus.REVIEW;
+          } else {
+            updatedTaskStatus = QuickStartTaskStatus.SUCCESS;
+            if (taskNumber < totalTasks) {
+              updatedTaskNumber = taskNumber + 1;
+            }
+          }
         }
 
         if (taskNumber < totalTasks && !updatedTaskStatus) {
@@ -326,13 +339,13 @@ export const useValuesForQuickStartContext = (
 
         const markInitialStepVisitedOrReview =
           updatedTaskNumber > -1 &&
-          quickStart[getTaskStatusKey(updatedTaskNumber)] === QuickStartTaskStatus.INIT
+          quickStartState[getTaskStatusKey(updatedTaskNumber)] === QuickStartTaskStatus.INIT
             ? stepAfterInitial
-            : quickStart[getTaskStatusKey(updatedTaskNumber)];
+            : quickStartState[getTaskStatusKey(updatedTaskNumber)];
         const newState = {
-          ...qs,
+          ...quickStartStates,
           [activeQuickStartID]: {
-            ...quickStart,
+            ...quickStartState,
             ...(updatedStatus ? { status: updatedStatus } : {}),
             ...(updatedTaskNumber > -1
               ? {
@@ -346,7 +359,7 @@ export const useValuesForQuickStartContext = (
         return newState;
       });
     },
-    [activeQuickStartID, setAllQuickStartStates, stepAfterInitial],
+    [activeQuickStartID, allQuickStarts, setAllQuickStartStates, stepAfterInitial],
   );
 
   const previousStep = useCallback(() => {