Skip to content

fix(admin-ui): correct Cancel button behavior in Logging page under A… #2376

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
moabu merged 2 commits into from
Oct 22, 2025
Merged

fix(admin-ui): correct Cancel button behavior in Logging page under A… #2376

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5c06f1
fix(admin-ui): correct Cancel button behavior in Logging page under A…
faisalsiddique4400 Oct 20, 2025
6331280
Merge branch 'main' into admin-ui-issue-2375
moabu Oct 22, 2025
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
23 changes: 14 additions & 9 deletions admin-ui/plugins/auth-server/components/Configuration/Defaults/LoggingPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useEffect, useContext, useState, useMemo, useCallback } from 'react'
import { Form, Button, FormGroup, Card, CardBody, Col, CustomInput } from 'Components'
import React, { useEffect, useState, useMemo, useCallback } from 'react'
import { Form, FormGroup, Card, CardBody, Col, CustomInput, Row } from 'Components'
import GluuLabel from 'Routes/Apps/Gluu/GluuLabel'
import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
import GluuCommitDialog from 'Routes/Apps/Gluu/GluuCommitDialog'
import GluuCommitFooter from 'Routes/Apps/Gluu/GluuCommitFooter'
import { JSON_CONFIG } from 'Utils/ApiResources'
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
import { useDispatch, useSelector } from 'react-redux'
Expand All @@ -16,20 +17,17 @@ import { LOGGING_READ, LOGGING_WRITE } from 'Utils/PermChecker'
import { useCedarling } from '@/cedarling'
import { useTranslation } from 'react-i18next'
import SetTitle from 'Utils/SetTitle'
import { ThemeContext } from 'Context/theme/themeContext'
import GluuToogleRow from 'Routes/Apps/Gluu/GluuToogleRow'
import { getChangedFields, getMergedValues } from '@/helpers'

function LoggingPage() {
const { t } = useTranslation()
const { hasCedarPermission, authorize } = useCedarling()
const theme = useContext(ThemeContext)
const logging = useSelector((state) => state.loggingReducer.logging)
const loading = useSelector((state) => state.loggingReducer.loading)
const { permissions: cedarPermissions } = useSelector((state) => state.cedarPermissions)

const dispatch = useDispatch()
const selectedTheme = theme.state.theme

const [showCommitDialog, setShowCommitDialog] = useState(false)
const [pendingValues, setPendingValues] = useState(null)
Expand Down Expand Up @@ -192,10 +190,17 @@ function LoggingPage() {
/>

{hasCedarPermission(LOGGING_WRITE) && (
<Button color={`primary-${selectedTheme}`} type="submit">
<i className="fa fa-check-circle me-2"></i>
{t('actions.save')}
</Button>
<Row>
<Col>
<GluuCommitFooter
saveHandler={formik.handleSubmit}
extraLabel={t('actions.cancel')}
extraOnClick={() => formik.resetForm()}
hideButtons={{ save: true, back: true }}
type="submit"
/>
</Col>
</Row>
)}
</Form>
)}
Expand Down
Loading