Revert "display warning state when status check has no data (#22178) (#…

…22321)" (#22709) This reverts commit 711671c.
elastic · Sep 5, 2018 · a73eb66 · a73eb66
1 parent 63355cb
commit a73eb66
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 39 deletions.
diff --git a/...plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap b/...plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap
@@ -169,9 +169,13 @@ exports[`statusCheckState checking status 1`] = `
                 component="div"
                 grow={true}
               >
-                <Content
-                  text="custom status check description"
-                />
+                <EuiText
+                  grow={true}
+                >
+                  <p>
+                    custom status check description
+                  </p>
+                </EuiText>
               </EuiFlexItem>
               <EuiFlexItem
                 component="div"
@@ -292,9 +296,13 @@ exports[`statusCheckState failed status check - error 1`] = `
                 component="div"
                 grow={true}
               >
-                <Content
-                  text="custom status check description"
-                />
+                <EuiText
+                  grow={true}
+                >
+                  <p>
+                    custom status check description
+                  </p>
+                </EuiText>
               </EuiFlexItem>
               <EuiFlexItem
                 component="div"
@@ -322,7 +330,7 @@ exports[`statusCheckState failed status check - error 1`] = `
             />
           </UNDEFINED>,
           "key": "checkStatusStep",
-          "status": "danger",
+          "status": "complete",
           "title": "custom title",
         },
       ]
@@ -420,9 +428,13 @@ exports[`statusCheckState failed status check - no data 1`] = `
                 component="div"
                 grow={true}
               >
-                <Content
-                  text="custom status check description"
-                />
+                <EuiText
+                  grow={true}
+                >
+                  <p>
+                    custom status check description
+                  </p>
+                </EuiText>
               </EuiFlexItem>
               <EuiFlexItem
                 component="div"
@@ -450,7 +462,7 @@ exports[`statusCheckState failed status check - no data 1`] = `
             />
           </UNDEFINED>,
           "key": "checkStatusStep",
-          "status": "warning",
+          "status": "complete",
           "title": "custom title",
         },
       ]
@@ -548,9 +560,13 @@ exports[`statusCheckState initial state - no check has been attempted 1`] = `
                 component="div"
                 grow={true}
               >
-                <Content
-                  text="custom status check description"
-                />
+                <EuiText
+                  grow={true}
+                >
+                  <p>
+                    custom status check description
+                  </p>
+                </EuiText>
               </EuiFlexItem>
               <EuiFlexItem
                 component="div"
@@ -671,9 +687,13 @@ exports[`statusCheckState successful status check 1`] = `
                 component="div"
                 grow={true}
               >
-                <Content
-                  text="custom status check description"
-                />
+                <EuiText
+                  grow={true}
+                >
+                  <p>
+                    custom status check description
+                  </p>
+                </EuiText>
               </EuiFlexItem>
               <EuiFlexItem
                 component="div"

diff --git a/src/core_plugins/kibana/public/home/components/tutorial/instruction_set.js b/src/core_plugins/kibana/public/home/components/tutorial/instruction_set.js
@@ -26,7 +26,6 @@ import {
 } from '@kbn/ui-framework/components';
 import { Instruction } from './instruction';
 import { ParameterForm } from './parameter_form';
-import { Content } from './content';
 import { getDisplayText } from '../../../../common/tutorials/instruction_variant';
 import {
   EuiTabs,
@@ -35,6 +34,7 @@ import {
   EuiSteps,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiText,
   EuiButton,
   EuiCallOut,
 } from '@elastic/eui';
@@ -110,32 +110,17 @@ export class InstructionSet extends React.Component {
     );
   }
 
-  getStepStatus(statusCheckState) {
-    switch (statusCheckState) {
-      case undefined:
-      case StatusCheckStates.NOT_CHECKED:
-      case StatusCheckStates.FETCHING:
-        return 'incomplete';
-      case StatusCheckStates.HAS_DATA:
-        return 'complete';
-      case StatusCheckStates.NO_DATA:
-        return 'warning';
-      case StatusCheckStates.ERROR:
-        return 'danger';
-      default:
-        throw new Error(`Unexpected status check state ${statusCheckState}`);
-    }
-  }
-
   renderStatusCheck() {
     const { statusCheckState, statusCheckConfig, onStatusCheck } = this.props;
     const checkStatusStep = (
       <Fragment>
         <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
           <EuiFlexItem>
-            <Content
-              text={statusCheckConfig.text}
-            />
+            <EuiText>
+              <p>
+                {statusCheckConfig.text}
+              </p>
+            </EuiText>
           </EuiFlexItem>
 
           <EuiFlexItem
@@ -156,9 +141,11 @@ export class InstructionSet extends React.Component {
       </Fragment>
     );
 
+    const stepStatus = statusCheckState === StatusCheckStates.NOT_CHECKED ||
+      statusCheckState === StatusCheckStates.FETCHING ? 'incomplete' : 'complete';
     return {
       title: statusCheckConfig.title || 'Status Check',
-      status: this.getStepStatus(statusCheckState),
+      status: stepStatus,
       children: checkStatusStep,
       key: 'checkStatusStep'
     };