chore: Remove adhoc teams (#9678)

ParabolInc · Apr 29, 2024 · b28ccc2 · b28ccc2
1 parent a1658d8
commit b28ccc2
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 69 deletions.
diff --git 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}
           />
         </div>
       </div>
@@ -148,7 +146,6 @@ const ActivityDetails = (props: Props) => {
           teamsRef={teams}
           type={activity.type}
           preferredTeamId={preferredTeamId}
-          viewerRef={viewer}
         />
       </div>
     </div>

diff --git 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
@@ -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,33 +26,24 @@ 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<HTMLDivElement>(
     positionOverride ?? MenuPosition.LOWER_RIGHT,
     {
       isDropdown: true
     }
   )
 
-  const [addTeamDialogOpen, setAddTeamDialogOpen] = React.useState(false)
-
   const atmosphere = useAtmosphere()
 
   const handleSelectTeam = (teamId: string) => {
     setPreferredTeamId(atmosphere, teamId)
     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 && (
-        <AddTeamDialogRoot
-          onAddTeam={(teamId) => {
-            setAddTeamDialogOpen(false)
-            handleSelectTeam(teamId)
-          }}
-          onClose={() => {
-            setAddTeamDialogOpen(false)
-          }}
-        />
-      )}
     </>
   )
 }

diff --git 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,15 +13,14 @@ interface Props {
   menuProps: MenuProps
   teamHandleClick: (teamId: string, e: React.MouseEvent) => void
   teams: SelectTeamDropdown_teams$key
-  onAddTeamClick?: () => void
 }
 
 const TeamMenu = styled(Menu)({
   maxWidth: 'none'
 })
 
 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 (
     <TeamMenu ariaLabel={'Select the team associated with the new task'} {...menuProps}>
-      {onAddTeamClick ? (
-        <MenuItem
-          label={
-            <div
-              className='text-md flex w-full items-center px-2 font-semibold leading-8 text-sky-500'
-              onClick={onAddTeamClick}
-            >
-              <Add className='mr-1' />
-              Add Team
-            </div>
-          }
-        />
-      ) : (
-        <DropdownMenuLabel>Select Team:</DropdownMenuLabel>
-      )}
+      <DropdownMenuLabel>Select Team:</DropdownMenuLabel>
       {teams.map((team) => {
         return (
           <MenuItem

diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
@@ -7,7 +7,6 @@ enum UserFlagEnum {
   recurrence
   noAISummary
   noMeetingHistoryLimit
-  adHocTeams
   signUpDestinationTeam
 }
 
@@ -20,7 +19,6 @@ type UserFeatureFlags {
   recurrence: Boolean!
   noAISummary: Boolean!
   noMeetingHistoryLimit: Boolean!
-  adHocTeams: Boolean!
   signUpDestinationTeam: Boolean!
 }
 

diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
@@ -4,7 +4,6 @@ const UserFeatureFlags: UserFeatureFlagsResolvers = {
   insights: ({insights}) => !!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
@@ -7,7 +7,6 @@ const UserFlagEnum = new GraphQLEnumType({
     azureDevOps: {},
     noAISummary: {},
     noMeetingHistoryLimit: {},
-    adHocTeams: {},
     signUpDestinationTeam: {}
   }
 })