From 9cbe95860877e2f51d675641f7d0b764c7b3a6a7 Mon Sep 17 00:00:00 2001 From: Paul Pettit Date: Wed, 14 May 2025 12:20:07 +0100 Subject: [PATCH 1/2] make cancel buttons work for users/groups/access --- src/components/users/partials/modal/AclDetails.tsx | 1 + src/components/users/partials/modal/GroupDetails.tsx | 1 + src/components/users/partials/modal/UserDetails.tsx | 1 + 3 files changed, 3 insertions(+) diff --git a/src/components/users/partials/modal/AclDetails.tsx b/src/components/users/partials/modal/AclDetails.tsx index fd4964fbb4..87469485be 100644 --- a/src/components/users/partials/modal/AclDetails.tsx +++ b/src/components/users/partials/modal/AclDetails.tsx @@ -88,6 +88,7 @@ const AclDetails = ({ {/* Navigation buttons and validation */} close()} submitPage={ async () => { if (await dispatch(checkAcls(formik.values.acls))) { diff --git a/src/components/users/partials/modal/GroupDetails.tsx b/src/components/users/partials/modal/GroupDetails.tsx index 2ec489a830..f693764539 100644 --- a/src/components/users/partials/modal/GroupDetails.tsx +++ b/src/components/users/partials/modal/GroupDetails.tsx @@ -98,6 +98,7 @@ const GroupDetails: React.FC<{ {/* Navigation buttons and validation */} close()} createTranslationString="SUBMIT" cancelTranslationString="CANCEL" isLast diff --git a/src/components/users/partials/modal/UserDetails.tsx b/src/components/users/partials/modal/UserDetails.tsx index dcd4a49397..089aeda67f 100644 --- a/src/components/users/partials/modal/UserDetails.tsx +++ b/src/components/users/partials/modal/UserDetails.tsx @@ -84,6 +84,7 @@ const UserDetails: React.FC<{ {page !== 2 && ( close()} createTranslationString="SUBMIT" cancelTranslationString="CANCEL" isLast From e951182ec10dab420408ba549182725a8875f3ee Mon Sep 17 00:00:00 2001 From: Paul Pettit Date: Wed, 14 May 2025 13:02:07 +0100 Subject: [PATCH 2/2] simpified as requested --- src/components/users/partials/modal/AclDetails.tsx | 2 +- src/components/users/partials/modal/GroupDetails.tsx | 2 +- src/components/users/partials/modal/UserDetails.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/users/partials/modal/AclDetails.tsx b/src/components/users/partials/modal/AclDetails.tsx index 87469485be..b6b25eeda7 100644 --- a/src/components/users/partials/modal/AclDetails.tsx +++ b/src/components/users/partials/modal/AclDetails.tsx @@ -88,7 +88,7 @@ const AclDetails = ({ {/* Navigation buttons and validation */} close()} + previousPage={close} submitPage={ async () => { if (await dispatch(checkAcls(formik.values.acls))) { diff --git a/src/components/users/partials/modal/GroupDetails.tsx b/src/components/users/partials/modal/GroupDetails.tsx index f693764539..ab91daa365 100644 --- a/src/components/users/partials/modal/GroupDetails.tsx +++ b/src/components/users/partials/modal/GroupDetails.tsx @@ -98,7 +98,7 @@ const GroupDetails: React.FC<{ {/* Navigation buttons and validation */} close()} + previousPage={close} createTranslationString="SUBMIT" cancelTranslationString="CANCEL" isLast diff --git a/src/components/users/partials/modal/UserDetails.tsx b/src/components/users/partials/modal/UserDetails.tsx index 089aeda67f..0aa3de8e72 100644 --- a/src/components/users/partials/modal/UserDetails.tsx +++ b/src/components/users/partials/modal/UserDetails.tsx @@ -84,7 +84,7 @@ const UserDetails: React.FC<{ {page !== 2 && ( close()} + previousPage={close} createTranslationString="SUBMIT" cancelTranslationString="CANCEL" isLast