fix(web): member role cannot be changed

reearth · Oct 25, 2023 · c11aaef · c11aaef
1 parent 7fa4d50
commit c11aaef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/web/src/classic/components/molecules/Settings/Workspace/MemberListItem/index.tsx b/web/src/classic/components/molecules/Settings/Workspace/MemberListItem/index.tsx
@@ -9,7 +9,7 @@ import { styled } from "@reearth/services/theme";
 
 import EditableItem from "../../Project/EditableItem";
 
-export type Role = "READER" | "WRITER" | "OWNER";
+export type Role = "READER" | "WRITER" | "MAINTAINER" | "OWNER";
 
 type user = {
   id?: string;
@@ -20,13 +20,13 @@ export type Props = {
   user: user;
   role: Role;
   owner?: boolean;
-  isMyself?: boolean;
+  isMe?: boolean;
   personal?: boolean;
   onChangeRole: (role: Role) => void;
   onRemove: () => void;
 };
 
-const MemberListItem: React.FC<Props> = ({ user, role, owner, onChangeRole, onRemove }) => {
+const MemberListItem: React.FC<Props> = ({ user, role, owner, isMe, onChangeRole, onRemove }) => {
   const t = useT();
   const saveEdit = useCallback(
     (role?: string) => {
@@ -55,9 +55,9 @@ const MemberListItem: React.FC<Props> = ({ user, role, owner, onChangeRole, onRe
         currentItem={role}
         body={roles.find(r => r.key === role)?.label}
         onSubmit={saveEdit}
-        disabled={!(owner === true && role !== "OWNER")}
+        disabled={!owner}
       />
-      {owner === true && role !== "OWNER" && <StyledIcon icon="bin" size={20} onClick={onRemove} />}
+      {owner && !isMe && <StyledIcon icon="bin" size={20} onClick={onRemove} />}
     </Wrapper>
   );
 };

diff --git a/web/src/classic/components/molecules/Settings/Workspace/MembersSection/index.tsx b/web/src/classic/components/molecules/Settings/Workspace/MembersSection/index.tsx
@@ -80,7 +80,7 @@ const MembersSection: React.FC<Props> = ({
                 user={user}
                 role={role}
                 owner={owner}
-                isMyself={me?.id === user.id}
+                isMe={me?.id === user.id}
                 onChangeRole={role => updateMemberOfWorkspace(user.id, role)}
                 onRemove={() => removeMemberFromWorkspace(user.id)}
               />