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

* back button uniform implementation in User claims

* Code rabbit enhancements in User claims

* Code rabbit enhancements in User claims

* Code rabbit enhancements in User claims

* Code rabbit enhancements in User claims

* made user types optional as it was previously

Author: faisalsiddique4400

admin-ui/plugins/schema/components/Person/AttributeAddPage.tsx

@@ -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 {
@@ -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))
       },

admin-ui/plugins/schema/components/Person/AttributeEditPage.tsx

@@ -11,6 +11,8 @@ import type {
   AttributeItem,
   SubmitData,
 } from 'Plugins/schema/components/types/AttributeListPage.types'
+import { getDefaultAttributeItem } from '../../utils/formHelpers'
+import { DEFAULT_ATTRIBUTE_VALIDATION } from '../../helper/utils'
 import {
   JansAttribute,
   useGetAttributesByInum,
@@ -55,30 +57,28 @@ 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) {
-      cloned.attributeValidation = {
-        maxLength: undefined,
-        regexp: undefined,
-        minLength: undefined,
-      }
+      cloned.attributeValidation = { ...DEFAULT_ATTRIBUTE_VALIDATION }
     }
 
     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 },
@@ -112,16 +112,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}>