fix restart action and toned down failed task message

patternfly · Mar 10, 2022 · ed56af6 · ed56af6
1 parent 69d65e4
commit ed56af6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/packages/dev/src/AppLocalized.tsx b/packages/dev/src/AppLocalized.tsx
@@ -76,7 +76,7 @@ const App3: React.FC<AppProps> = ({ children, showCardFooters }) => {
     language,
     loading,
     useQueryParams: withQueryParams,
-    alwaysShowTaskReview: false,
+    alwaysShowTaskReview: true,
   };
 
   return (

diff --git a/packages/dev/src/AppProps.tsx b/packages/dev/src/AppProps.tsx
@@ -61,7 +61,7 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
     language,
     loading,
     useQueryParams: withQueryParams,
-    alwaysShowTaskReview: false,
+    alwaysShowTaskReview: true,
   };
 
   const toggleQuickStart = (quickStartId: string) => {

diff --git a/packages/dev/src/quickstarts-data/yaml/template.yaml b/packages/dev/src/quickstarts-data/yaml/template.yaml
@@ -89,7 +89,7 @@ spec:
       review:
         instructions: |-
           - Did you complete the task successfully?
-        failedTaskHelp: This task isn’t verified yet. Try the task again.
+        failedTaskHelp: This task isn't verified yet. Try the task again.
       # optional - the task's success and failure messages
       summary:
         success: Shows a success message in the task header
@@ -105,7 +105,7 @@ spec:
       review:
         instructions: |-
           - Thanks for checking out this quick start!
-        failedTaskHelp: This task isn’t verified yet. Try the task again.
+        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/QuickStartDrawer.tsx b/packages/module/src/QuickStartDrawer.tsx
@@ -80,7 +80,7 @@ export const QuickStartContainer: React.FC<QuickStartContainerProps> = ({
   useQueryParams = true,
   markdown,
   contextProps,
-  alwaysShowTaskReview = false,
+  alwaysShowTaskReview = true,
   ...props
 }) => {
   const valuesForQuickstartContext: QuickStartContextValues = useValuesForQuickStartContext({

diff --git a/packages/module/src/controller/QuickStartTaskHeader.tsx b/packages/module/src/controller/QuickStartTaskHeader.tsx
@@ -68,11 +68,13 @@ const QuickStartTaskHeader: React.FC<QuickStartTaskHeaderProps> = ({
     'pfext-quick-start-task-header__title-failed':
       taskStatus === (QuickStartTaskStatus.FAILED || QuickStartTaskStatus.VISITED),
   });
-  const notCompleted = taskStatus === QuickStartTaskStatus.VISITED;
-  const skippedReviewOrFailed =
-    taskStatus === QuickStartTaskStatus.REVIEW || taskStatus === QuickStartTaskStatus.FAILED;
+  // const notCompleted = taskStatus === QuickStartTaskStatus.VISITED;
+  // const skippedReview = taskStatus === QuickStartTaskStatus.REVIEW;
+  const failedReview = taskStatus === QuickStartTaskStatus.FAILED;
 
-  const tryAgain = !isActiveTask && (skippedReviewOrFailed || notCompleted) && (
+  // TODO: toned down when this is shown, investigate further when we should display it
+  // related: https://github.com/patternfly/patternfly-quickstarts/issues/104
+  const tryAgain = failedReview && (
     <>
       <div />
       <div className="pfext-quick-start-task-header__tryagain">Try the steps again.</div>

diff --git a/packages/module/src/styles/_base.scss b/packages/module/src/styles/_base.scss
@@ -27,6 +27,10 @@
   input[type="radio"] {
     margin-right: 7px;
   }
+
+  .pf-c-list {
+    --pf-c-list--PaddingLeft: 20px;
+  }
 }
 
 // drawer

diff --git a/packages/module/src/utils/quick-start-context.tsx b/packages/module/src/utils/quick-start-context.tsx
@@ -279,7 +279,7 @@ export const useValuesForQuickStartContext = (
       });
       setAllQuickStartStates((qs) => ({
         ...qs,
-        [quickStartId]: getDefaultQuickStartState(totalTasks, QuickStartStatus.IN_PROGRESS),
+        [quickStartId]: getDefaultQuickStartState(totalTasks, QuickStartStatus.NOT_STARTED),
       }));
     },
     [setActiveQuickStartID, setAllQuickStartStates, useQueryParams],