diff --git a/packages/features/insights/context/InsightsOrgTeamsProvider.tsx b/packages/features/insights/context/InsightsOrgTeamsProvider.tsx index b0265b5df4..375e1dd859 100644 --- a/packages/features/insights/context/InsightsOrgTeamsProvider.tsx +++ b/packages/features/insights/context/InsightsOrgTeamsProvider.tsx @@ -3,6 +3,8 @@ import { useSession } from "next-auth/react"; import { createContext, useState } from "react"; +import { MembershipRole } from "@calcom/prisma/enums"; + import type { OrgTeamsType } from "../filters/OrgTeamsFilter"; export type InsightsOrgTeamsContextType = { @@ -17,7 +19,11 @@ export const InsightsOrgTeamsContext = createContext(currentOrgId ? "org" : "yours"); + const orgRole = session?.data?.user?.org?.role; + const isAdminOrOwner = orgRole === MembershipRole.OWNER || orgRole === MembershipRole.ADMIN; + const [orgTeamsType, setOrgTeamsType] = useState( + isAdminOrOwner && currentOrgId ? "org" : "yours" + ); const [selectedTeamId, setSelectedTeamId] = useState(); return ( diff --git a/packages/features/insights/filters/OrgTeamsFilter.tsx b/packages/features/insights/filters/OrgTeamsFilter.tsx index 4e33e066dd..07804d2a06 100644 --- a/packages/features/insights/filters/OrgTeamsFilter.tsx +++ b/packages/features/insights/filters/OrgTeamsFilter.tsx @@ -78,6 +78,10 @@ export const OrgTeamsFilter = () => { /> ) : null; + const teams = (data || []) + .filter((team) => !team.isOrg) + .filter((team) => team.name?.toLowerCase().includes(query.toLowerCase())); + return ( @@ -126,35 +130,32 @@ export const OrgTeamsFilter = () => { label={t("yours")} /> - - {(data || []) - .filter((team) => !team.isOrg) - .filter((team) => team.name?.toLowerCase().includes(query.toLowerCase())) - .map((team) => { - return ( - { - if (e.target.checked) { - onSelected({ type: "team", teamId: team.id }); - } else if (!e.target.checked) { - resetSelection(); - } - }} - icon={ - + {teams.length > 0 && } + {teams.map((team) => { + return ( + { + if (e.target.checked) { + onSelected({ type: "team", teamId: team.id }); + } else if (!e.target.checked) { + resetSelection(); } - /> - ); - })} + }} + icon={ + + } + /> + ); + })} );