Skip to content

feat(admin): adding uniformity in cancel and back buttons present in User claims #2485

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 7 commits into from
Dec 1, 2025
Merged

feat(admin): adding uniformity in cancel and back buttons present in User claims #2485

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
521a11d
back button uniform implementation in User claims
faisalsiddique4400 Nov 28, 2025
3b3f3a5
Code rabbit enhancements in User claims
faisalsiddique4400 Nov 28, 2025
d3d2a38
Code rabbit enhancements in User claims
faisalsiddique4400 Nov 28, 2025
85aabca
Code rabbit enhancements in User claims
faisalsiddique4400 Nov 28, 2025
f60fa0f
Code rabbit enhancements in User claims
faisalsiddique4400 Nov 28, 2025
6da256c
Merge branch 'main' into admin-ui-issue-2361-user-claims
faisalsiddique4400 Dec 1, 2025
7e95b1e
made user types optional as it was previously
faisalsiddique4400 Dec 1, 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
3 changes: 2 additions & 1 deletion admin-ui/plugins/schema/components/Person/AttributeAddPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { useSchemaWebhook } from '../../hooks/useSchemaWebhook'
import { API_ATTRIBUTE } from '../../constants'
import { useTranslation } from 'react-i18next'
import { getErrorMessage } from '../../utils/errorHandler'
import type { ApiError } from '../../utils/errorHandler'
import { useAppNavigation, ROUTES } from '@/helpers/navigation'

function AttributeAddPage(): JSX.Element {
Expand All @@ -30,7 +31,7 @@ function AttributeAddPage(): JSX.Element {
queryClient.invalidateQueries({ queryKey: getGetAttributesQueryKey() })
navigateBack(ROUTES.ATTRIBUTES_LIST)
},
onError: (error: unknown) => {
onError: (error: Error | ApiError | Record<string, never>) => {
const errorMessage = getErrorMessage(error, 'errors.attribute_create_failed', t)
dispatch(updateToast(true, 'error', errorMessage))
},
Expand Down
21 changes: 7 additions & 14 deletions admin-ui/plugins/schema/components/Person/AttributeEditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import type {
AttributeItem,
SubmitData,
} from 'Plugins/schema/components/types/AttributeListPage.types'
import { getDefaultAttributeItem } from '../../utils/formHelpers'
import {
JansAttribute,
useGetAttributesByInum,
Expand Down Expand Up @@ -55,15 +56,17 @@ function AttributeEditPage(): JSX.Element {
queryClient.invalidateQueries({ queryKey: getGetAttributesQueryKey() })
queryClient.invalidateQueries({ queryKey: getGetAttributesByInumQueryKey(inum) })
},
onError: (error: unknown) => {
onError: (error: Error | Record<string, never>) => {
const errorMessage = getErrorMessage(error, 'errors.attribute_update_failed', t)
dispatch(updateToast(true, 'error', errorMessage))
},
},
})

const defaultAttribute = useMemo(() => getDefaultAttributeItem(), [])

const extensibleItems = useMemo(() => {
if (!attribute) return null
if (!attribute) return defaultAttribute
const cloned = cloneDeep(attribute) as JansAttribute

if (!cloned.attributeValidation) {
Expand All @@ -75,10 +78,10 @@ function AttributeEditPage(): JSX.Element {
}

return cloned
}, [attribute])
}, [attribute, defaultAttribute])

const customHandleSubmit = useCallback(
({ data, userMessage, modifiedFields, performedOn }: SubmitData): void => {
({ data, userMessage, modifiedFields }: SubmitData): void => {
if (data) {
putAttributeMutation.mutate(
{ data: data as JansAttribute },
Expand Down Expand Up @@ -112,16 +115,6 @@ function AttributeEditPage(): JSX.Element {
)
}

if (!extensibleItems) {
return (
<GluuLoader blocking={isLoading}>
<Card className="mb-3" style={applicationStyle.mainCard}>
<CardBody>{t('messages.loading_attribute')}</CardBody>
</Card>
</GluuLoader>
)
}

return (
<GluuLoader blocking={isLoading || putAttributeMutation.isPending}>
<Card className="mb-3" style={applicationStyle.mainCard}>
Expand Down
Loading
Loading