diff --git a/src/main/resources/theme/rciam-group/account/messages/messages_en.properties b/src/main/resources/theme/rciam-group/account/messages/messages_en.properties index c5700139..32c8b174 100644 --- a/src/main/resources/theme/rciam-group/account/messages/messages_en.properties +++ b/src/main/resources/theme/rciam-group/account/messages/messages_en.properties @@ -5,7 +5,8 @@ joingroupsActivitySidebarTitle=Join group(s) enrollmentAccountsSidebarTitle=View enrollment progress groupsSidebarTitle=Groups groupLabel=My Groups -groupsIntroMessage=Manage everything related to advanced Group management (groups, enrollment flow etc) +adminGroupsIntroMessage=Manage everything related to advanced Group management (groups, enrollment flow etc) +groupsIntroMessage=Access information about your group memberships, explore group details, and conveniently track your enrollment requests adminGroupLabel=Manage Groups adminNoGroupsText=You are not an admin in any groups nameDatalistTitle=Name @@ -178,7 +179,8 @@ NO_APPROVAL=No approval makeDefault=Set this enrollment as default copyEnrollmentLink=Copy direct link to this enrollment deleteEnrollmentTooltip=Delete this enrollment configuration -deleteEnrollmentConfirmation=Are you sure you want to delete this enrollment +deleteEnrollmentConfirmationTitle=Are you sure you want to proceed with the deletion of this enrollment configuration? +deleteEnrollmentConfirmationMessage=Deleting this enrollment configuration will result in the removal of any pending enrollment requests and the historical records of completed enrollment requests associated with this configuration. approveRequestTooltip=Approve this Request copiedTooltip=Copied to clipboard copyTooltip=Copy direct link to this enrollment request @@ -208,5 +210,9 @@ EnrollmentRequestFilterTooltip=Filter Enrollment Requests EnrollmentRequestFilterCancel=View All Enrollment Requests ReviewEnrollmentTooltip=Review this enrollment request. ViewEnrollmentTooltip=View this enrollment request -DefaultEnrollmentTooltip=The default enrollment configuration will be preselected on the enrollment page. -copyGroupEnrollmentLink= Copy enrollment link to this group \ No newline at end of file +DefaultEnrollmentTooltip=The default enrollment that will be preselected on the enrollment page. +copyGroupEnrollmentLink=Copy enrollment link to this group +visibleEnrollmentTooltip=This enrollment will be discoverable on the enrollment page +groupMyEnrollmentsLabel=View My Enrollment Requests +viewMyGroupsLabel=View My Groups +UniqueIdentifier=Unique Identifier \ No newline at end of file diff --git a/src/main/resources/theme/rciam-group/account/resources/content.json b/src/main/resources/theme/rciam-group/account/resources/content.json index 2d2e99aa..c1fd6851 100644 --- a/src/main/resources/theme/rciam-group/account/resources/content.json +++ b/src/main/resources/theme/rciam-group/account/resources/content.json @@ -58,19 +58,12 @@ "hidden": "!features.isMyResourcesEnabled" }, { - "id": "groups", + "id": "managegroups", "icon": "pf-icon-applications", - "label": "groupsSidebarTitle", - "descriptionLabel": "groupsIntroMessage", + "label": "adminGroupLabel", + "descriptionLabel": "adminGroupsIntroMessage", "hidden": "!features.isViewGroupsEnabled", "content": [ - { - "id": "showgroups", - "path": "groups/showgroups", - "label": "groupLabel", - "modulePath": "/content/group-page/GroupsPage.js", - "componentName": "GroupsPage" - }, { "id": "admingroups", "path": "groups/admingroups", @@ -82,9 +75,33 @@ "id": "groupenrollments", "path": "groups/groupenrollments", "label": "groupManageEnrollmentsLabel", - "modulePath": "/content/group-management-pages/ManageEnrollmentRequests.js", - "componentName": "ManageEnrollmentRequests" + "modulePath": "/content/group-management-pages/EnrollmentRequests.js", + "componentName": "EnrollmentRequests" + } + ] + }, + { + "id": "groups", + "icon": "pf-icon-applications", + "label": "groupLabel", + "descriptionLabel": "groupsIntroMessage", + "hidden": "!features.isViewGroupsEnabled", + "content": [ + { + "id": "showgroups", + "path": "groups/showgroups", + "label": "viewMyGroupsLabel", + "modulePath": "/content/group-page/GroupsPage.js", + "componentName": "GroupsPage" + }, + { + "id": "mygroupenrollments", + "path": "groups/mygroupenrollments", + "label": "groupMyEnrollmentsLabel", + "modulePath": "/content/group-management-pages/EnrollmentRequests.js", + "componentName": "EnrollmentRequests" } + ] } ] \ No newline at end of file diff --git a/src/main/resources/theme/rciam-group/account/resources/static/css/account.css b/src/main/resources/theme/rciam-group/account/resources/static/css/account.css index 138d1426..e7916f2e 100644 --- a/src/main/resources/theme/rciam-group/account/resources/static/css/account.css +++ b/src/main/resources/theme/rciam-group/account/resources/static/css/account.css @@ -478,7 +478,10 @@ margin-bottom: -0.1rem; margin-left:0.1rem; } - +.gm_trash-icon { + font-size: 1.1rem; + margin-left: 0.5rem; +} .gm_view-groups-header .pf-c-data-list__cell { cursor:pointer; } @@ -745,4 +748,8 @@ .gm_search-input-double-controls .gm_cancel-icon-container{ margin-top: 0!important; height: 1.1rem!important; +} + +.gm_primary-color { + color: #0d6efd!important;; } \ No newline at end of file diff --git a/src/main/resources/theme/rciam-group/account/src/app/ContentPages.tsx b/src/main/resources/theme/rciam-group/account/src/app/ContentPages.tsx index e3e75a26..58c58fdb 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/ContentPages.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/ContentPages.tsx @@ -27,7 +27,7 @@ import {GroupPage} from './content/group-management-pages/GroupPage'; import {AdminGroupPage} from './content/group-management-pages/AdminGroupPage'; import { InvitationLandingPage } from './content/group-management-pages/InvitationLandingPage'; import { CreateEnrollment } from './group-widgets/GroupEnrollment/CreateEnrollment'; -import { EnrollmentRequests } from './content/group-management-pages/ManageEnrollmentRequests'; +import { EnrollmentRequests } from './content/group-management-pages/EnrollmentRequests'; export interface ContentItem { @@ -214,7 +214,8 @@ export function makeRoutes(): React.ReactNode { const customComponents = { GroupPage:GroupPage, AdminGroupPage:AdminGroupPage, - CreateEnrollment:CreateEnrollment + CreateEnrollment:CreateEnrollment, + EnrollmentRequests:EnrollmentRequests } const pageDefs: PageDef[] = flattenContent(content); @@ -229,7 +230,8 @@ export function makeRoutes(): React.ReactNode { }); return ( - + } /> + {routes} {customPages.map((item,index)=>{ return diff --git a/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/ManageEnrollmentRequest.tsx b/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/EnrollmentRequest.tsx similarity index 92% rename from src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/ManageEnrollmentRequest.tsx rename to src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/EnrollmentRequest.tsx index 53655ec9..fd56f986 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/ManageEnrollmentRequest.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/EnrollmentRequest.tsx @@ -1,21 +1,14 @@ import * as React from 'react'; import {FC,useState,useEffect} from 'react'; -import { DataList,DataListItem,DataListItemCells,DataListItemRow,DataListCell, Button, Tooltip, DataListAction, SelectVariant, Checkbox,Select,SelectOption, FormAlert, Alert, Form, FormGroup, TextInput, Modal, ModalVariant, Switch, FormFieldGroupHeader, FormFieldGroup, DatePicker, Popover, NumberInput, HelperTextItem, TextArea, Badge} from '@patternfly/react-core'; +import {Button, Tooltip, Alert, Form, FormGroup, Modal, ModalVariant, FormFieldGroupHeader, FormFieldGroup, TextArea, Badge} from '@patternfly/react-core'; // @ts-ignore import { HttpResponse, GroupsServiceClient } from '../../groups-mngnt-service/groups.service'; -// @ts-ignore -import { ConfirmationModal } from '../Modals'; -import {isIntegerOrNumericString,getCurrentDate} from '../../js/utils.js' import { Loading } from '../../group-widgets/LoadingModal'; import { Msg } from '../../widgets/Msg'; -import { CopyIcon, ExternalLinkSquareAltIcon, HelpIcon, ShareSquareIcon } from '@patternfly/react-icons'; - - -const reg_url = /^(https?|chrome):\/\/[^\s$.?#].[^\s]*$/ +import { CopyIcon, ExternalLinkSquareAltIcon } from '@patternfly/react-icons'; export const EnrollmentRequest: FC = (props) => { - const [modalInfo,setModalInfo] = useState({}); const [loading,setLoading] = useState(false); const [enrollmentRequest,setEnrollmentRequest] = useState({}); const [copyTooltip,setCopyTooltip] = useState(false); @@ -25,7 +18,6 @@ export const EnrollmentRequest: FC = (props) => { useEffect(()=>{ if(Object.keys(props.enrollmentRequest).length !== 0) { - setIsModalOpen(true); setEnrollmentRequest({...props.enrollmentRequest}); } @@ -39,12 +31,9 @@ export const EnrollmentRequest: FC = (props) => { setCopyTooltip(true); setTimeout(() => { setCopyTooltip(false); - }, 2000); - + }, 2000); } - - let reviewEnrollmentRequest = (action)=>{ setLoading(true); groupsService!.doPost("/group-admin/enroll-request/"+ enrollmentRequest.id +"/" + action,{},{params:{...(reviewerComment?{adminJustification:reviewerComment}:{})}}) @@ -54,19 +43,17 @@ export const EnrollmentRequest: FC = (props) => { props.close(); } }).catch((err)=>{console.log(err)}) - } return ( -

{enrollmentRequest?.status==='PENDING_APPROVAL'?:} - {copyTooltip?:} @@ -77,7 +64,7 @@ export const EnrollmentRequest: FC = (props) => { disapearingTooltip(); let link = groupsService.getBaseUrl() + '/account/#/groups/groupenrollments?id=' + encodeURI(enrollmentRequest?.id); navigator.clipboard.writeText(link)}} > - + }

@@ -85,7 +72,7 @@ export const EnrollmentRequest: FC = (props) => { isOpen={isModalOpen} onClose={()=>{props.close()}} actions={[ - ...(enrollmentRequest?.status==='PENDING_APPROVAL'? + ...(enrollmentRequest?.status==='PENDING_APPROVAL'&&props.managePage? [ @@ -124,7 +111,7 @@ export const EnrollmentRequest: FC = (props) => { -

{enrollmentRequest?.submittedDate}

+

{enrollmentRequest?.submittedDate}

{enrollmentRequest?.approvedDate&&

: {enrollmentRequest?.approvedDate}

} @@ -234,7 +221,7 @@ export const EnrollmentRequest: FC = (props) => { } - {enrollmentRequest?.status==='PENDING_APPROVAL'&& + {enrollmentRequest?.status==='PENDING_APPROVAL'&&props.managePage&& = (props) => { @@ -21,15 +22,14 @@ export const EnrollmentRequests: FC = (props) => { const [page, setPage] = useState(1); const [perPage, setPerPage] = useState(10); const [totalItems,setTotalItems] = useState(0); - const [statusSelection,setStatusSelection] = useState("PENDING_APPROVAL"); + const [statusSelection,setStatusSelection] = useState(""); const [initialRender, setInitialRender] = useState(true); const [orderBy,setOrderBy] = useState('submittedDate'); const [asc,setAsc] = useState(false); const [searchStringGroup,setSearchStringGroup] = useState(""); const [searchStringUser,setSearchStringUser] = useState(""); const [isExpanded, setIsExpanded] = useState(false); - - + const [requestId,setRequestId] = useState(0); const onSetPage = (_event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPage: number) => { setPage(newPage); @@ -44,6 +44,16 @@ export const EnrollmentRequests: FC = (props) => { setPage(newPage); }; + useEffect(()=>{ + let id; + setStatusSelection("PENDING_APPROVAL") + if(props.location.search){ + const query = new URLSearchParams(props.location.search); + id = decodeURI(query.get('id')||""); + id && setRequestId(id); + } + },[props.manage]); + useEffect(()=>{ if(initialRender){ setInitialRender(false); @@ -52,22 +62,11 @@ export const EnrollmentRequests: FC = (props) => { fetchEnrollmentRequests(); },[perPage,page,orderBy,asc]); - useEffect(()=>{ - let id; - - if(props.location.search){ - const query = new URLSearchParams(props.location.search); - id = decodeURI(query.get('id')||""); + if(requestId){ + fetchEnrollmentRequest(requestId); } - - if(id){ - fetchEnrollmentRequest(id); - } - - fetchEnrollmentRequests(); - - },[]) + },[requestId]) useEffect(()=>{ if(initialRender){ @@ -79,10 +78,10 @@ export const EnrollmentRequests: FC = (props) => { },[statusSelection]); - let fetchEnrollmentRequests = (searchStringUser = "",searchStringGroup= "") => { - groupsService!.doGet("/group-admin/enroll-requests",{params:{first:(perPage*(page-1)),max:perPage, + let fetchEnrollmentRequests = (searchStringUser = "",searchStringGroupOverwrite= "") => { + groupsService!.doGet(props.manage?"/group-admin/enroll-requests":"/user/enroll-requests",{params:{first:(perPage*(page-1)),max:perPage, ...(statusSelection?{status:statusSelection}:{}), - ...(searchStringGroup?{groupName:searchStringGroup}:{}), + ...((searchStringGroup||searchStringGroupOverwrite)?{groupName:(searchStringGroup||searchStringGroupOverwrite)}:{}), ...(searchStringUser?{userSearch:searchStringUser}:{}), ...(orderBy?{order:orderBy}:{}), asc:asc?"true":"false" @@ -103,7 +102,9 @@ export const EnrollmentRequests: FC = (props) => { let fetchEnrollmentRequest = (id) => { - groupsService!.doGet("/group-admin/enroll-request/"+id) + console.log(props.manage); + console.log('I fetch'); + groupsService!.doGet((props.manage?"/group-admin/enroll-request/":"/user/enroll-request/")+id) .then((response: HttpResponse) => { if(response.status===200&&response.data){ let count = 1; @@ -155,7 +156,7 @@ export const EnrollmentRequests: FC = (props) => { return ( - +
@@ -166,62 +167,72 @@ export const EnrollmentRequests: FC = (props) => { - -
- -
- -
-
-
- setSearchStringUser(e)} - placeholder={Msg.localize('UserSearchPlaceholder')} - aria-label="searchInputUser" - onKeyDown={(e) => e.key === 'Enter' && search()} - /> - setSearchStringGroup(e)} - placeholder={Msg.localize('GroupSearchPlaceholder')} - aria-label="searchInputGroup" - onKeyDown={(e) => e.key === 'Enter' && search()} - /> + + {props.manage? + +
+
-
-
}> - - -
}> - - +
+
+
+ setSearchStringUser(e)} + placeholder={Msg.localize('UserSearchPlaceholder')} + aria-label="searchInputUser" + onKeyDown={(e) => e.key === 'Enter' && search()} + /> + setSearchStringGroup(e)} + placeholder={Msg.localize('GroupSearchPlaceholder')} + aria-label="searchInputGroup" + onKeyDown={(e) => e.key === 'Enter' && search()} + /> +
+
+
}> + + +
}> + + +
+
-
- + + : + { + setPage(1); + fetchEnrollmentRequests("",searchString); + }} /> + } + + - {setSelectedRequest({}); fetchEnrollmentRequests();}}/> - + {setSelectedRequest({}); fetchEnrollmentRequests();}}/> + = (props) => { , - + ...(props.manage?[ - , + ]:[]), - {setStatusSelection(selection)}}/> + {setStatusSelection(selection)}}/> , @@ -272,10 +283,10 @@ export const EnrollmentRequests: FC = (props) => { {enrollment.groupEnrollmentConfiguration.name} , - + ...(props.manage?[ {enrollment?.user?.firstName && enrollment?.user?.lastName?enrollment?.user?.firstName + " " + enrollment?.user?.lastName:Msg.localize('notAvailable')} {enrollment?.user?.email} - , + ]:[]), {formatStatus(enrollment.status)} @@ -295,14 +306,14 @@ export const EnrollmentRequests: FC = (props) => { - {enrollment.status==='PENDING_APPROVAL'?:} + {(enrollment.status==='PENDING_APPROVAL'&&props.manage)?:} } > diff --git a/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/GroupPage.tsx b/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/GroupPage.tsx index 2b39401d..8652f506 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/GroupPage.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/content/group-management-pages/GroupPage.tsx @@ -102,7 +102,7 @@ export const GroupPage: FC = (props)=> { role="region" > } aria-label="Default content - users"> - + = (props) =>{ setPage(1); }} /> - + diff --git a/src/main/resources/theme/rciam-group/account/src/app/content/group-page/GroupsPage.tsx b/src/main/resources/theme/rciam-group/account/src/app/content/group-page/GroupsPage.tsx index c5d37baa..db9939b7 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/content/group-page/GroupsPage.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/content/group-page/GroupsPage.tsx @@ -141,7 +141,7 @@ export const GroupsPage: FC = (props) => { return ( - + = (props) => { - + - - , - + , - - + + , - + ]}> @@ -206,14 +203,12 @@ export const GroupAdmins: FC = (props) => { - {admin.user.id} - , - {admin.user.username} + {admin.user?.attributes?.voPersonID||admin.user.username} , - {admin.user.email} + {admin?.user?.firstName && admin?.user?.lastName?admin?.user?.firstName + " " + admin?.user?.lastName:Msg.localize('notAvailable')} + {admin?.user?.email} , {admin.direct?Msg.localize('adminGroupIsDirect'):Msg.localize('adminGroupIsNotDirect')}}> diff --git a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupAttributes.tsx b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupAttributes.tsx index 6da31dde..5f5656dc 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupAttributes.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupAttributes.tsx @@ -24,7 +24,7 @@ export const GroupAttributes: FC = (props) => { return ( - + = (props) => { - + = (props) => { { setEnrollmentModal({}); fetchGroupEnrollments();}} groupId={props.groupId}/> - + = (props) => { , - + , + + + ]}> = (props) => { const onCopyLink = ()=>{ disapearingTooltip(); - let link = groupsService.getBaseUrl() + '/account/#/enroll?groupPath=' + encodeURI(groupConfiguration.path) + '&id=' + encodeURI(enrollment.id); + let link = groupsService.getBaseUrl() + '/account/#/enroll?id=' + encodeURI(enrollment.id); navigator.clipboard.writeText(link) } @@ -279,8 +282,14 @@ export const GroupEnrollment: FC = (props) => { }> - - + , + + {enrollment?.visibleToNotMembers && + }> + + + } + ]} /> = (props) => { fetchGroupMembers(); setPage(1); }} /> - + - - , - - + , @@ -198,10 +195,7 @@ export const GroupMembers: FC = (props) => { - {member.user?.attributes?.voPersonID||Msg.localize('notAvailable')} - , - - {member.user.username} + {member.user?.attributes?.voPersonID||member.user.username} , {member.user.firstName && member.user.lastName?member.user.firstName + " " + member.user.lastName:Msg.localize('notAvailable')} diff --git a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupSubgroups.tsx b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupSubgroups.tsx index 04c1b870..4a56274f 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupSubgroups.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupSubgroups.tsx @@ -33,7 +33,7 @@ export const GroupSubGroups: FC = (props) => { { props.fetchGroupConfiguration();}} close={()=>{setCreateSubgroup(false);}}/> - + diff --git a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/InviteMemberModal.tsx b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/InviteMemberModal.tsx index a0e9d2d6..39cbbff9 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/InviteMemberModal.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/InviteMemberModal.tsx @@ -226,7 +226,7 @@ export const InviteMemberModal: React.FC = (props) => { {enrollment?.id&& - + = (props) => { let groupPath = decodeURI(query.get('groupPath')||""); let id = decodeURI(query.get('id')||""); - if(groupPath){ - fetchGroupEnrollments(groupPath,id); + if(id){ + fetchGroupEnrollment(id); + } + else if(groupPath){ + fetchGroupEnrollments(groupPath); } } @@ -56,8 +59,7 @@ export const CreateEnrollment: FC = (props) => { useEffect(()=>{ if(group.name){ fetchGroupEnrollmentRequests(); - } - + } },[group]) useEffect(()=>{ @@ -74,8 +76,18 @@ export const CreateEnrollment: FC = (props) => { },[enrollments,defaultId]) + let fetchGroupEnrollment = (id)=>{ + groupsService!.doGet("/user/configuration/"+id) + .then((response: HttpResponse) => { + if(response.status===200&&response.data){ + setGroup(response.data.group); + setEnrollments([response.data]); + } + }) + } + - let fetchGroupEnrollments = (groupPath,id)=>{ + let fetchGroupEnrollments = (groupPath)=>{ groupsService!.doGet("/user/groups/configurations",{params:{groupPath:groupPath}}) .then((response: HttpResponse) => { if(response.status===200&&response.data){ @@ -84,18 +96,8 @@ export const CreateEnrollment: FC = (props) => { setDefaultId(response.data[0].group?.attributes?.defaultConfiguration[0]); } setGroup(response.data[0].group); - } - if(id){ - response.data.forEach(enrollment=>{ - if(enrollment.id=id){ - setEnrollments([enrollment]); - } - - }) - } - else{ - setEnrollments(response.data); - } + } + setEnrollments(response.data); } }) } diff --git a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupEnrollment/CreateEnrollmentModal.tsx b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupEnrollment/CreateEnrollmentModal.tsx index e2f59a7a..a0ab135a 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupEnrollment/CreateEnrollmentModal.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/GroupEnrollment/CreateEnrollmentModal.tsx @@ -220,9 +220,11 @@ export const EnrollmentModal: FC = (props) => { } > - { + { setModalInfo({ - message:Msg.localize('deleteEnrollmentConfirmation'), + variant:'medium', + title:Msg.localize('deleteEnrollmentConfirmationTitle'), + message:Msg.localize('deleteEnrollmentConfirmationMessage'), accept_message: Msg.localize("yes"), cancel_message: Msg.localize("no"), accept: function(){ @@ -267,7 +269,7 @@ export const EnrollmentModal: FC = (props) => { } }}> - + diff --git a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/Modals.tsx b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/Modals.tsx index c2df657e..0253f0dc 100644 --- a/src/main/resources/theme/rciam-group/account/src/app/group-widgets/Modals.tsx +++ b/src/main/resources/theme/rciam-group/account/src/app/group-widgets/Modals.tsx @@ -19,7 +19,7 @@ export const ConfirmationModal: React.FC = (props) =>{ },[props.modalInfo]) const [isModalOpen, setIsModalOpen] = useState(false); - + const [type,setType] = useState('small'); const handleModalToggle = () => { props?.modalInfo?.cancel(); }; @@ -27,7 +27,7 @@ export const ConfirmationModal: React.FC = (props) =>{ return (