fix(desktop):invite & modify role (labring#4005)

bxy4543 · Oct 13, 2023 · 0931d20 · 0931d20
1 parent a595d21
commit 0931d20
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/frontend/desktop/src/components/team/DissolveTeam.tsx b/frontend/desktop/src/components/team/DissolveTeam.tsx
@@ -53,7 +53,7 @@ export default function DissolveTeam({
   const session = useSessionStore((s) => s.session);
   const { t } = useTranslation();
   const submit = () => {
-    if (teamName !== nsid)
+    if (teamName.trim() !== nsid)
       return toast({
         title: t('Invaild Name of Team')
       });

diff --git a/frontend/desktop/src/components/team/InviteMember.tsx b/frontend/desktop/src/components/team/InviteMember.tsx
@@ -42,7 +42,7 @@ export default function InviteMember({
   const session = useSessionStore((s) => s.session);
   const { k8s_username } = session.user;
   const [userId, setUserId] = useState('');
-  const [role, setRole] = useState(1);
+  const [role, setRole] = useState(UserRole.Developer);
   const toast = useToast();
   const queryClient = useQueryClient();
   const mutation = useMutation({

diff --git a/frontend/desktop/src/components/team/ModifyRole.tsx b/frontend/desktop/src/components/team/ModifyRole.tsx
@@ -14,7 +14,8 @@ import {
   MenuItem,
   Text,
   Flex,
-  Spinner
+  Spinner,
+  ButtonProps
 } from '@chakra-ui/react';
 import { useState } from 'react';
 import { ROLE_LIST, UserRole } from '@/types/team';
@@ -30,7 +31,7 @@ export default function ModifyRole({
   userId,
   roles,
   ...props
-}: Parameters<typeof Button>[0] & {
+}: ButtonProps & {
   ns_uid: string;
   userId: string;
   currentRole: UserRole;
@@ -68,7 +69,7 @@ export default function ModifyRole({
           fontSize={'12px'}
           fontWeight={'500'}
           variant={'unstyled'}
-          {...(props as Parameters<typeof Button>[0])}
+          {...props}
         >
           {ROLE_LIST[currentRole]}
         </Button>

diff --git a/frontend/desktop/src/components/team/userTable.tsx b/frontend/desktop/src/components/team/userTable.tsx
@@ -93,8 +93,8 @@ export default function UserTable({
                   k8s_username={user.k8s_username}
                   isDisabled={
                     user.status === InvitedStatus.Inviting ||
-                    !canManage(user.role, userId) ||
-                    user.uid === userId
+                    user.uid === userId ||
+                    UserRole.Owner !== userSelf.role
                   }
                 />
               </Td>