Merge pull request #870 from mturley/859-869-wizard-button-issues

[#859][#869] On final step of wizards, disable Cancel button and remove ">" icon from Close button (cherry picked from commit adbe5cd) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1676555 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1676556
ManageIQ · Feb 12, 2019 · 692fa12 · 692fa12
1 parent d10ca74
commit 692fa12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/javascript/react/screens/App/Mappings/screens/MappingWizard/MappingWizard.js b/app/javascript/react/screens/App/Mappings/screens/MappingWizard/MappingWizard.js
@@ -198,7 +198,7 @@ class MappingWizard extends React.Component {
                   ? __('Save')
                   : __('Create')
                 : __('Next')}
-            <Icon type="fa" name="angle-right" />
+            {!onFinalStep && <Icon type="fa" name="angle-right" />}
           </Button>
         </Wizard.Footer>
         <WarningModal

diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/PlanWizard.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/PlanWizard.js
@@ -250,7 +250,7 @@ class PlanWizard extends React.Component {
         </Wizard.Body>
 
         <Wizard.Footer className="wizard-pf-footer">
-          <Button bsStyle="default" className="btn-cancel" onClick={hidePlanWizardAction}>
+          <Button bsStyle="default" className="btn-cancel" onClick={hidePlanWizardAction} disabled={onFinalStep}>
             {__('Cancel')}
           </Button>
           <Button bsStyle="default" onClick={this.prevStep} disabled={onFirstStep || onFinalStep}>
@@ -263,7 +263,7 @@ class PlanWizard extends React.Component {
             disabled={disableNextStep}
           >
             {onFinalStep ? __('Close') : currentStepProp === stepIDs.scheduleStep ? saveButtonLabel : __('Next')}
-            <Icon type="fa" name="angle-right" />
+            {!onFinalStep && <Icon type="fa" name="angle-right" />}
           </Button>
         </Wizard.Footer>
       </Wizard>