diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx index a46f0a1c924..c9d09f21195 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx @@ -35,7 +35,6 @@ graphql` export const query = graphql` query ActivityDetailsQuery($activityId: ID!) { viewer { - ...ActivityDetailsSidebar_viewer activityLibrarySearch preferredTeamId activity(activityId: $activityId) { @@ -138,7 +137,6 @@ const ActivityDetails = (props: Props) => { teamsRef={teams} type={activity.type} preferredTeamId={preferredTeamId} - viewerRef={viewer} /> @@ -148,7 +146,6 @@ const ActivityDetails = (props: Props) => { teamsRef={teams} type={activity.type} preferredTeamId={preferredTeamId} - viewerRef={viewer} /> diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx index 928416576a5..672be252b8c 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx @@ -8,7 +8,6 @@ import {useFragment} from 'react-relay' import {useHistory} from 'react-router' import {ActivityDetailsSidebar_teams$key} from '~/__generated__/ActivityDetailsSidebar_teams.graphql' import {ActivityDetailsSidebar_template$key} from '~/__generated__/ActivityDetailsSidebar_template.graphql' -import {ActivityDetailsSidebar_viewer$key} from '~/__generated__/ActivityDetailsSidebar_viewer.graphql' import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation' import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation' import UpdateReflectTemplateScopeMutation from '~/mutations/UpdateReflectTemplateScopeMutation' @@ -41,11 +40,10 @@ interface Props { teamsRef: ActivityDetailsSidebar_teams$key type: MeetingTypeEnum preferredTeamId: string | null - viewerRef: ActivityDetailsSidebar_viewer$key } const ActivityDetailsSidebar = (props: Props) => { - const {selectedTemplateRef, teamsRef, type, preferredTeamId, viewerRef} = props + const {selectedTemplateRef, teamsRef, type, preferredTeamId} = props const [isMinimized, setIsMinimized] = useState(false) const isMobile = !useBreakpoint(Breakpoint.INVOICE) const selectedTemplate = useFragment( @@ -61,22 +59,6 @@ const ActivityDetailsSidebar = (props: Props) => { selectedTemplateRef ) - const viewer = useFragment( - graphql` - fragment ActivityDetailsSidebar_viewer on User { - featureFlags { - adHocTeams - } - ...AdhocTeamMultiSelect_viewer - organizations { - id - name - } - } - `, - viewerRef - ) - const teams = useFragment( graphql` fragment ActivityDetailsSidebar_teams on Team @relay(plural: true) { @@ -278,7 +260,6 @@ const ActivityDetailsSidebar = (props: Props) => { selectedTeamRef={selectedTeam} teamsRef={availableTeams} customPortal={teamScopePopover} - allowAddTeam={viewer.featureFlags.adHocTeams} /> {type === 'retrospective' && ( <> diff --git a/packages/client/components/NewMeetingTeamPicker.tsx b/packages/client/components/NewMeetingTeamPicker.tsx index 2443f8067c9..199499dc2dc 100644 --- a/packages/client/components/NewMeetingTeamPicker.tsx +++ b/packages/client/components/NewMeetingTeamPicker.tsx @@ -3,8 +3,6 @@ import React from 'react' import {useFragment} from 'react-relay' import {NewMeetingTeamPicker_selectedTeam$key} from '~/__generated__/NewMeetingTeamPicker_selectedTeam.graphql' import {NewMeetingTeamPicker_teams$key} from '~/__generated__/NewMeetingTeamPicker_teams.graphql' -import AddTeamDialogRoot from '~/components/AddTeamDialogRoot' -import SendClientSideEvent from '~/utils/SendClientSideEvent' import useAtmosphere from '../hooks/useAtmosphere' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' @@ -28,12 +26,10 @@ interface Props { onSelectTeam: (teamId: string) => void positionOverride?: MenuPosition customPortal?: React.ReactNode - allowAddTeam?: boolean } const NewMeetingTeamPicker = (props: Props) => { - const {selectedTeamRef, teamsRef, onSelectTeam, positionOverride, customPortal, allowAddTeam} = - props + const {selectedTeamRef, teamsRef, onSelectTeam, positionOverride, customPortal} = props const {togglePortal, menuPortal, originRef, menuProps, portalStatus} = useMenu( positionOverride ?? MenuPosition.LOWER_RIGHT, { @@ -41,8 +37,6 @@ const NewMeetingTeamPicker = (props: Props) => { } ) - const [addTeamDialogOpen, setAddTeamDialogOpen] = React.useState(false) - const atmosphere = useAtmosphere() const handleSelectTeam = (teamId: string) => { @@ -50,11 +44,6 @@ const NewMeetingTeamPicker = (props: Props) => { onSelectTeam(teamId) } - const handleAddTeamClick = () => { - SendClientSideEvent(atmosphere, 'Add Team Clicked') - setAddTeamDialogOpen(true) - } - const selectedTeam = useFragment( graphql` fragment NewMeetingTeamPicker_selectedTeam on Team { @@ -97,21 +86,9 @@ const NewMeetingTeamPicker = (props: Props) => { menuProps={menuProps} teams={teams} teamHandleClick={handleSelectTeam} - onAddTeamClick={allowAddTeam ? handleAddTeamClick : undefined} /> ) )} - {addTeamDialogOpen && ( - { - setAddTeamDialogOpen(false) - handleSelectTeam(teamId) - }} - onClose={() => { - setAddTeamDialogOpen(false) - }} - /> - )} ) } diff --git a/packages/client/components/SelectTeamDropdown.tsx b/packages/client/components/SelectTeamDropdown.tsx index fee47048755..a345304a9f7 100644 --- a/packages/client/components/SelectTeamDropdown.tsx +++ b/packages/client/components/SelectTeamDropdown.tsx @@ -1,5 +1,4 @@ import styled from '@emotion/styled' -import {Add} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' @@ -14,7 +13,6 @@ interface Props { menuProps: MenuProps teamHandleClick: (teamId: string, e: React.MouseEvent) => void teams: SelectTeamDropdown_teams$key - onAddTeamClick?: () => void } const TeamMenu = styled(Menu)({ @@ -22,7 +20,7 @@ const TeamMenu = styled(Menu)({ }) const SelectTeamDropdown = (props: Props) => { - const {teams: teamsRef, menuProps, teamHandleClick, onAddTeamClick} = props + const {teams: teamsRef, menuProps, teamHandleClick} = props const teams = useFragment( graphql` fragment SelectTeamDropdown_teams on Team @relay(plural: true) { @@ -34,21 +32,7 @@ const SelectTeamDropdown = (props: Props) => { ) return ( - {onAddTeamClick ? ( - - - Add Team - - } - /> - ) : ( - Select Team: - )} + Select Team: {teams.map((team) => { return ( !!insights, noAISummary: ({noAISummary}) => !!noAISummary, noMeetingHistoryLimit: ({noMeetingHistoryLimit}) => !!noMeetingHistoryLimit, - adHocTeams: ({adHocTeams}) => !!adHocTeams, signUpDestinationTeam: ({signUpDestinationTeam}) => !!signUpDestinationTeam } diff --git a/packages/server/graphql/types/UserFlagEnum.ts b/packages/server/graphql/types/UserFlagEnum.ts index edc3752f565..e2ec40be8ea 100644 --- a/packages/server/graphql/types/UserFlagEnum.ts +++ b/packages/server/graphql/types/UserFlagEnum.ts @@ -7,7 +7,6 @@ const UserFlagEnum = new GraphQLEnumType({ azureDevOps: {}, noAISummary: {}, noMeetingHistoryLimit: {}, - adHocTeams: {}, signUpDestinationTeam: {} } })