Skip to content

feat(admin): adding uniformity in cancel and back buttons present in SMTP #2410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
faisalsiddique4400 merged 1 commit into from
Nov 3, 2025
Merged

feat(admin): adding uniformity in cancel and back buttons present in SMTP #2410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin-ui/app/routes/Apps/Gluu/GluuFormFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const GluuFormFooter = ({
showBack,
backButtonLabel,
onBack,
disableBack,
disableBack = false,
showCancel,
cancelButtonLabel,
onCancel,
Expand Down
43 changes: 33 additions & 10 deletions admin-ui/plugins/smtp-management/components/SmtpManagement/SmtpForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import GluuSelectRow from 'Routes/Apps/Gluu/GluuSelectRow'
import { SelectChangeEvent } from '@mui/material'
import { useFormik } from 'formik'
import GluuCommitDialog from 'Routes/Apps/Gluu/GluuCommitDialog'
import GluuCommitFooter from 'Routes/Apps/Gluu/GluuCommitFooter'
import GluuFormFooter from 'Routes/Apps/Gluu/GluuFormFooter'
import { useTranslation } from 'react-i18next'
import {
enableTestButton,
Expand Down Expand Up @@ -55,6 +55,7 @@ function SmtpForm(props: Readonly<SmtpFormProps>) {
toggle()
},
validationSchema,
validateOnMount: true,
})

useEffect(() => {
Expand All @@ -67,7 +68,17 @@ function SmtpForm(props: Readonly<SmtpFormProps>) {
formik.resetForm()
}

const submitForm = (userMessage: string) => {
const submitForm = async (userMessage: string) => {
const errors = await formik.validateForm()
if (Object.keys(errors).length > 0) {
// mark all fields as touched to reveal validation messages
const touched: Record<string, boolean> = {}
Object.keys(errors).forEach((k) => (touched[k] = true))
formik.setTouched(touched)
toast.error(t('messages.mandatory_fields_required'))
return
}

toggle()
const trimmedValues = trimObjectStrings(
formik.values as unknown as Record<string, unknown>,
Expand Down Expand Up @@ -328,16 +339,28 @@ function SmtpForm(props: Readonly<SmtpFormProps>) {
/>
</Col>
</FormGroup>
{testButtonEnabled && (
<Row className="mb-2">
<Col>
<button type="button" className="btn btn-secondary" onClick={testSmtpConfig}>
{t('actions.test')}
</button>
</Col>
</Row>
)}

<Row>
<Col>
<GluuCommitFooter
saveHandler={toggle}
hideButtons={{ save: true, back: false }}
extraLabel={testButtonEnabled ? t('actions.test') : ''}
extraOnClick={testButtonEnabled ? testSmtpConfig : undefined}
disableBackButton={true}
cancelHandler={handleCancel}
type="submit"
<GluuFormFooter
showBack={true}
showCancel={true}
showApply={true}
onApply={toggle}
onCancel={handleCancel}
disableCancel={!formik.dirty}
disableApply={!formik.isValid || !formik.dirty}
applyButtonType="button"
isLoading={false}
/>
</Col>
</Row>
Expand Down