Merge pull request #1665 from TimothyAsirJeyasing/fix-dr-button-issue

Update Footer Button Order based on PF guidelines
red-hat-storage · Nov 10, 2024 · b8eda07 · b8eda07
2 parents fd1ddd4 + 90ed755
commit b8eda07
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/locales/en/plugin__odf-console.json b/locales/en/plugin__odf-console.json
@@ -84,9 +84,9 @@
   "Enroll discovered application nav": "Enroll discovered application nav",
   "Enroll discovered application steps": "Enroll discovered application steps",
   "1 or more mandatory fields are empty. To proceed, fill in the required information.": "1 or more mandatory fields are empty. To proceed, fill in the required information.",
+  "Back": "Back",
   "Save": "Save",
   "Next": "Next",
-  "Back": "Back",
   "Configure definition": "Configure definition",
   "Choose your configuration preference to protect resources (application volumes/PVCs, or Kubernetes objects).": "Choose your configuration preference to protect resources (application volumes/PVCs, or Kubernetes objects).",
   "You have selected {{count}} namespaces, to view or change your selection go back to the previous step._one": "You have selected {{count}} namespaces, to view or change your selection go back to the previous step.",

diff --git a/packages/mco/components/discovered-application-wizard/footer.tsx b/packages/mco/components/discovered-application-wizard/footer.tsx
@@ -137,6 +137,14 @@ export const EnrollDiscoveredApplicationFooter: React.FC<EnrollDiscoveredApplica
           <Alert title={onSaveError} variant={AlertVariant.danger} isInline />
         )}
         <WizardFooter>
+          {/* Disabling the back button for the first step in wizard */}
+          <Button
+            variant={ButtonVariant.secondary}
+            onClick={onBack}
+            isDisabled={stepId === 1 || requestInProgress}
+          >
+            {t('Back')}
+          </Button>
           <Button
             isLoading={requestInProgress}
             isDisabled={requestInProgress}
@@ -151,14 +159,6 @@ export const EnrollDiscoveredApplicationFooter: React.FC<EnrollDiscoveredApplica
               ? t('Save')
               : t('Next')}
           </Button>
-          {/* Disabling the back button for the first step in wizard */}
-          <Button
-            variant={ButtonVariant.secondary}
-            onClick={onBack}
-            isDisabled={stepId === 1 || requestInProgress}
-          >
-            {t('Back')}
-          </Button>
           <Button
             variant={ButtonVariant.link}
             onClick={onCancel}

diff --git a/packages/mco/components/modals/app-manage-policies/helper/assign-policy-view-footer.tsx b/packages/mco/components/modals/app-manage-policies/helper/assign-policy-view-footer.tsx
@@ -171,18 +171,6 @@ export const AssignPolicyViewFooter: React.FC<AssignPolicyViewFooterProps> = ({
         </Alert>
       )}
       <WizardFooter>
-        <Button
-          isLoading={requestInProgress}
-          isDisabled={requestInProgress || validationError}
-          variant="primary"
-          type="submit"
-          onClick={handleNext}
-        >
-          {stepName ===
-          AssignPolicyStepsNames(t)[AssignPolicySteps.ReviewAndAssign]
-            ? t('Assign')
-            : t('Next')}
-        </Button>
         {/* Disabling the back button for the first step (Policy) in wizard */}
         <Button
           variant="secondary"
@@ -199,6 +187,18 @@ export const AssignPolicyViewFooter: React.FC<AssignPolicyViewFooterProps> = ({
         >
           {t('Back')}
         </Button>
+        <Button
+          isLoading={requestInProgress}
+          isDisabled={requestInProgress || validationError}
+          variant="primary"
+          type="submit"
+          onClick={handleNext}
+        >
+          {stepName ===
+          AssignPolicyStepsNames(t)[AssignPolicySteps.ReviewAndAssign]
+            ? t('Assign')
+            : t('Next')}
+        </Button>
         <Button
           variant="link"
           onClick={onCancel}