Fix [Wizard] remove hasSteps logic (#18)

iguazio · Jun 15, 2022 · 6a970a3 · 6a970a3
1 parent ffe1628
commit 6a970a3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 55 deletions.
diff --git a/src/lib/components/Wizard/Wizard.js b/src/lib/components/Wizard/Wizard.js
@@ -36,10 +36,6 @@ const Wizard = ({
     return React.Children.count(children) - 1 || 0
   }, [children])
 
-  const hasSteps = useMemo(() => {
-    return stepsConfig.some((step) => step.id)
-  }, [stepsConfig])
-
   const isLastStep = useMemo(() => {
     return activeStepNumber === totalSteps
   }, [activeStepNumber, totalSteps])
@@ -48,7 +44,7 @@ const Wizard = ({
     return stepsConfig?.map((step) => ({ id: step.id, label: step.label })) || []
   }, [stepsConfig])
 
-  const wizardClasses = classNames('wizard-form', className, hasSteps && 'wizard-form__with-steps')
+  const wizardClasses = classNames('wizard-form', className)
 
   const goToNextStep = () => {
     setActiveStepNumber((prevStep) => Math.min(++prevStep, totalSteps))
@@ -91,36 +87,21 @@ const Wizard = ({
     }
   }
 
-  const getDefaultActions = () => {
-    if (hasSteps) {
-      return [
-        <Button
-          onClick={goToPreviousStep}
-          disabled={activeStepNumber === 0}
-          label="Back"
-          type="button"
-        />,
-        <Button
-          onClick={handleSubmit}
-          disabled={FormState.submitting || (FormState.invalid && FormState.submitFailed)}
-          label={isLastStep ? submitButtonLabel : 'Next'}
-          type="button"
-          variant={SECONDARY_BUTTON}
-        />
-      ]
-    } else {
-      return [
-        <Button onClick={handleOnClose} label="Cancel" type="button" />,
-        <Button
-          onClick={handleSubmit}
-          disabled={FormState.submitting || (FormState.invalid && FormState.submitFailed)}
-          label={submitButtonLabel}
-          type="button"
-          variant={SECONDARY_BUTTON}
-        />
-      ]
-    }
-  }
+  const getDefaultActions = () => [
+    <Button
+      onClick={goToPreviousStep}
+      disabled={activeStepNumber === 0}
+      label="Back"
+      type="button"
+    />,
+    <Button
+      onClick={handleSubmit}
+      disabled={FormState.submitting || (FormState.invalid && FormState.submitFailed)}
+      label={isLastStep ? submitButtonLabel : 'Next'}
+      type="button"
+      variant={SECONDARY_BUTTON}
+    />
+  ]
 
   const renderModalActions = () => {
     if (stepsConfig[activeStepNumber]?.getActions) {
@@ -147,13 +128,7 @@ const Wizard = ({
       size={size}
       title={title}
     >
-      {hasSteps && (
-        <WizardSteps
-          activeStepNumber={activeStepNumber}
-          jumpToStep={jumpToStep}
-          steps={stepsMenu}
-        />
-      )}
+      <WizardSteps activeStepNumber={activeStepNumber} jumpToStep={jumpToStep} steps={stepsMenu} />
       <div className="wizard-form__content">{activeStepTemplate}</div>
     </Modal>
   )

diff --git a/src/lib/components/Wizard/Wizard.scss b/src/lib/components/Wizard/Wizard.scss
@@ -1,17 +1,15 @@
 .wizard-form {
-  &__with-steps {
-    .modal__body {
-      display: flex;
-      flex-flow: row nowrap;
-      overflow: hidden;
-      padding-right: 0;
-    }
+  .modal__body {
+    display: flex;
+    flex-flow: row nowrap;
+    overflow: hidden;
+    padding-right: 0;
+  }
 
-    .wizard-form__content {
-      overflow-y: auto;
-      height: 100%;
-      width: 100%;
-      padding-right: 2rem;
-    }
+  .wizard-form__content {
+    overflow-y: auto;
+    height: 100%;
+    width: 100%;
+    padding-right: 2rem;
   }
 }