Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 26 additions & 29 deletions apps/web/modules/ee/teams/views/team-members-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import { useState } from "react";

import LicenseRequired from "~/ee/common/components/LicenseRequired";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import type { MemberPermissions } from "@calcom/features/pbac/lib/team-member-permissions";
Expand Down Expand Up @@ -43,34 +42,32 @@ export const TeamMembersView = ({ team, facetedTeamValues, permissions }: TeamMe
const canLoggedInUserSeeMembers = permissions?.canListMembers ?? false;

return (
<LicenseRequired>
<div>
{canLoggedInUserSeeMembers && (
<div className="mb-6">
<MemberList
team={team}
isOrgAdminOrOwner={false}
setShowMemberInvitationModal={setShowMemberInvitationModal}
facetedTeamValues={facetedTeamValues}
permissions={permissions}
/>
</div>
)}
{!canLoggedInUserSeeMembers && (
<div className="border-subtle rounded-xl border p-6" data-testid="members-privacy-warning">
<h2 className="text-default">{t("only_admin_can_see_members_of_team")}</h2>
</div>
)}
{showMemberInvitationModal && team && team.id && (
<MemberInvitationModalWithoutMembers
hideInvitationModal={() => setShowMemberInvitationModal(false)}
showMemberInvitationModal={showMemberInvitationModal}
teamId={team.id}
token={team.inviteToken?.token}
onSettingsOpen={() => setShowInviteLinkSettingsModal(true)}
<div>
{canLoggedInUserSeeMembers && (
<div className="mb-6">
<MemberList
team={team}
isOrgAdminOrOwner={false}
setShowMemberInvitationModal={setShowMemberInvitationModal}
facetedTeamValues={facetedTeamValues}
permissions={permissions}
/>
)}
</div>
</LicenseRequired>
</div>
)}
{!canLoggedInUserSeeMembers && (
<div className="border-subtle rounded-xl border p-6" data-testid="members-privacy-warning">
<h2 className="text-default">{t("only_admin_can_see_members_of_team")}</h2>
</div>
)}
{showMemberInvitationModal && team && team.id && (
<MemberInvitationModalWithoutMembers
hideInvitationModal={() => setShowMemberInvitationModal(false)}
showMemberInvitationModal={showMemberInvitationModal}
teamId={team.id}
token={team.inviteToken?.token}
onSettingsOpen={() => setShowInviteLinkSettingsModal(true)}
/>
)}
</div>
);
};
12 changes: 6 additions & 6 deletions packages/ui/components/list/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,21 @@ export function ListLinkItem(props: ListLinkItemProps) {
<li
data-testid="list-link-item"
className={classNames(
"group flex w-full items-center justify-between p-5 pb-4",
"group flex w-full flex-col gap-3 p-5 pb-4 sm:flex-row sm:items-center sm:justify-between",
className,
disabled ? "hover:bg-cal-muted" : ""
)}>
<Link
passHref
href={href}
className={classNames(
"text-default grow truncate text-sm",
"text-default min-w-0 grow text-sm",
disabled ? "pointer-events-none cursor-not-allowed opacity-30" : ""
)}>
<div className="flex items-center">
<h1 className="text-sm font-semibold leading-none">{heading}</h1>
<div className="flex flex-wrap items-center gap-1">
<h1 className="truncate text-sm font-semibold leading-none">{heading}</h1>
{readOnly && (
<Badge data-testid="badge" variant="gray" className="ml-2">
<Badge data-testid="badge" variant="gray">
{t("readonly")}
</Badge>
)}
Expand All @@ -118,7 +118,7 @@ export function ListLinkItem(props: ListLinkItemProps) {
</h2>
<div className="mt-2">{children}</div>
</Link>
{actions}
<div className="flex shrink-0 items-center">{actions}</div>
</li>
);
}
Expand Down
Loading