From e83bb509957ab4932fc9424bd96db138dc76c399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20Mart=C3=ADnez?= <alfonsomthd@protonmail.com>
Date: Fri, 4 Oct 2024 10:46:42 +0200
Subject: [PATCH] Create S3 Bucket form cleanup

---
 .../create-bucket/CreateBucketForm.tsx        | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/odf/components/s3-browser/create-bucket/CreateBucketForm.tsx b/packages/odf/components/s3-browser/create-bucket/CreateBucketForm.tsx
index 325934aa5..4a8755b39 100644
--- a/packages/odf/components/s3-browser/create-bucket/CreateBucketForm.tsx
+++ b/packages/odf/components/s3-browser/create-bucket/CreateBucketForm.tsx
@@ -18,7 +18,10 @@ import { useNavigate } from 'react-router-dom-v5-compat';
 import {
   ActionGroup,
   Alert,
+  AlertVariant,
   Button,
+  ButtonType,
+  ButtonVariant,
   Form,
   FormGroup,
 } from '@patternfly/react-core';
@@ -51,18 +54,13 @@ const CreateBucketForm: React.FC<{}> = () => {
 
   const save = async (formData: FormData) => {
     setInProgress(true);
-    let bucketCreationError = '';
-    setErrorMessage(bucketCreationError);
+    setErrorMessage('');
     const { bucketName } = formData;
     try {
       await noobaaS3.createBucket({ Bucket: bucketName });
     } catch ({ name, message }) {
-      bucketCreationError = `Error while creating bucket: ${name}: ${message}`;
-    }
-
-    if (bucketCreationError) {
+      setErrorMessage(`Error while creating bucket: ${name}: ${message}`);
       setInProgress(false);
-      setErrorMessage(bucketCreationError);
       return;
     }
 
@@ -140,7 +138,7 @@ const CreateBucketForm: React.FC<{}> = () => {
       </FormGroup>
       {!isValid && isSubmitted && (
         <Alert
-          variant="danger"
+          variant={AlertVariant.danger}
           isInline
           title={t('Address form errors to proceed')}
         />
@@ -149,16 +147,16 @@ const CreateBucketForm: React.FC<{}> = () => {
         <ActionGroup className="pf-v5-c-form">
           <Button
             id="create-s3-bucket-btn"
-            type="submit"
-            variant="primary"
+            type={ButtonType.submit}
+            variant={ButtonVariant.primary}
             data-test="obc-create"
           >
             {t('Create')}
           </Button>
           <Button
             onClick={() => navigate(-1)}
-            type="button"
-            variant="secondary"
+            type={ButtonType.button}
+            variant={ButtonVariant.secondary}
           >
             {t('Cancel')}
           </Button>