mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix problem related to data types

Browse source
This commit is contained in:
Julián Sánchez 2022-04-28 10:51:10 -05:00 committed by Omar López
parent 0973d79c31
commit daf39a4095
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/web/components/team/MemberChangeRoleModal.tsx
View file

@ -5,7 +5,6 @@ import React, { SyntheticEvent, useEffect } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useLocale } from "@calcom/lib/hooks/useLocale";
import Button from "@calcom/ui/Button"; import Button from "@calcom/ui/Button";
import { TeamWithMembers } from "@lib/queries/teams";
import { trpc } from "@lib/trpc"; import { trpc } from "@lib/trpc";
import ModalContainer from "@components/ui/ModalContainer"; import ModalContainer from "@components/ui/ModalContainer";
@ -20,7 +19,7 @@ const options: MembershipRoleOption[] = [{ value: "MEMBER" }, { value: "ADMIN" }
export default function MemberChangeRoleModal(props: { export default function MemberChangeRoleModal(props: {
isOpen: boolean; isOpen: boolean;
team: TeamWithMembers; currentMember: MembershipRole;
memberId: number; memberId: number;
teamId: number; teamId: number;
initialRole: MembershipRole; initialRole: MembershipRole;
@ -50,8 +49,6 @@ export default function MemberChangeRoleModal(props: {
}, },
}); });
const memberRole = props.team?.membership.role;
function changeRole(e: SyntheticEvent) { function changeRole(e: SyntheticEvent) {
e.preventDefault(); e.preventDefault();
@ -79,7 +76,7 @@ export default function MemberChangeRoleModal(props: {
{/*<option value="OWNER">{t("owner")}</option> - needs dialog to confirm change of ownership */} {/*<option value="OWNER">{t("owner")}</option> - needs dialog to confirm change of ownership */}
<Select <Select
isSearchable={false} isSearchable={false}
options={memberRole !== MembershipRole.OWNER ? options.slice(0, 2) : options} options={props.currentMember !== MembershipRole.OWNER ? options.slice(0, 2) : options}
value={role} value={role}
onChange={(option) => option && setRole(option)} onChange={(option) => option && setRole(option)}
id="role" id="role"

5
apps/web/components/team/MemberInvitationModal.tsx
View file

@ -16,6 +16,7 @@ import Select from "@components/ui/form/Select";
type MemberInvitationModalProps = { type MemberInvitationModalProps = {
isOpen: boolean; isOpen: boolean;
team: TeamWithMembers | null; team: TeamWithMembers | null;
currentMember: MembershipRole;
onExit: () => void; onExit: () => void;
}; };
@ -48,8 +49,6 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
}, },
}); });
const memberRole = props.team?.membership.role;
function inviteMember(e: SyntheticEvent) { function inviteMember(e: SyntheticEvent) {
e.preventDefault(); e.preventDefault();
if (!props.team) return; if (!props.team) return;
@ -102,7 +101,7 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
</label> </label>
<Select <Select
defaultValue={options[0]} defaultValue={options[0]}
options={memberRole !== MembershipRole.OWNER ? options.slice(0, 2) : options} options={props.currentMember !== MembershipRole.OWNER ? options.slice(0, 2) : options}
id="role" id="role"
name="role" name="role"
className="mt-1 block w-full rounded-sm border-gray-300 shadow-sm sm:text-sm" className="mt-1 block w-full rounded-sm border-gray-300 shadow-sm sm:text-sm"

2
apps/web/components/team/MemberListItem.tsx
View file

@ -184,7 +184,7 @@ export default function MemberListItem(props: Props) {
{showChangeMemberRoleModal && ( {showChangeMemberRoleModal && (
<MemberChangeRoleModal <MemberChangeRoleModal
isOpen={showChangeMemberRoleModal} isOpen={showChangeMemberRoleModal}
team={props.team} currentMember={props.team.membership.role}
teamId={props.team?.id} teamId={props.team?.id}
memberId={props.member.id} memberId={props.member.id}
initialRole={props.member.role as MembershipRole} initialRole={props.member.role as MembershipRole}

1
apps/web/pages/settings/teams/[id]/index.tsx
View file

@ -145,6 +145,7 @@ export function TeamSettingsPage() {
<MemberInvitationModal <MemberInvitationModal
isOpen={showMemberInvitationModal} isOpen={showMemberInvitationModal}
team={team} team={team}
currentMember={team.membership.role}
onExit={() => setShowMemberInvitationModal(false)} onExit={() => setShowMemberInvitationModal(false)}
/> />
)} )}