From e78fe2965d510f2346fa6bf8f6ae71ec69c389f6 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Wed, 20 Dec 2023 17:14:08 +0100
Subject: [PATCH] Fix admin check when dashboard app index is nonzero
---
frontend/src/components/UserModal/UserModal.tsx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/frontend/src/components/UserModal/UserModal.tsx b/frontend/src/components/UserModal/UserModal.tsx
index 2cca3787..702bc1cf 100644
--- a/frontend/src/components/UserModal/UserModal.tsx
+++ b/frontend/src/components/UserModal/UserModal.tsx
@@ -94,9 +94,15 @@ export const UserModal = ({ open, onClose, userId, setUserId, apps }: UserModalP
// };
}, [user, reset, open]);
+ let dashboardIndex = 0;
+ apps.forEach((app, index) => {
+ if (app.name === 'dashboard') {
+ dashboardIndex = index;
+ }
+ });
const dashboardRole = useWatch({
control,
- name: 'app_roles.0.role',
+ name: `app_roles.${dashboardIndex}.role`,
});
useEffect(() => {
--
GitLab